Enable debugging code for non-official Android builds.

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index aedee811032a23a4b7875e4dcdc75d2c95cdf2fb..41537f2fc4319970359c7adcd0436abf92ea85cd 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -1072,18 +1072,26 @@
         ],
         'conditions': [
           ['OS=="android"', {
-            'defines': [
-              'SK_BUILD_FOR_ANDROID_NDK',
+            'dependencies!': [
+              'skia_opts',
+              '../third_party/zlib/zlib.gyp:zlib',
             ],
             'conditions': [
-              [ '_toolset == "target"', {
+              ['use_system_skia==1', {
                 'defines': [
                   'SK_RELEASE',  # Assume platform has a release build.
                 ],
-                'dependencies!': [
-                  'skia_opts',
-                  '../third_party/zlib/zlib.gyp:zlib',
+                'include_dirs!': [
+                  'config',  # Avoid including Chromium skia config.
+                ],
+                'libraries': [
+                  '-lskia',
                 ],
+              }, {  # !use_system_skia
+                'defines': [
+                  # Don't use non-NDK available stuff.
+                  'SK_BUILD_FOR_ANDROID_NDK',
+                 ],
               }],
               [ '_toolset == "target" and android_build_type == 0', {
                 'defines': [