Enable debugging code for non-official Android builds.

skia/skia.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 1054 matching lines @@
           '../third_party/skia/include/utils',
           'ext',
         ],
         'defines': [
           'SK_BUILD_NO_IMAGE_ENCODE',
           'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
           'GR_AGGRESSIVE_SHADER_OPTS=1',
         ],
         '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': [
+                  'SK_BUILD_FOR_ANDROID_NDK',  # Don't use non-NDK available stuff.

[Mark Mentovai, 2012/07/04 01:59:51]

I’d put this comment on its own line to keep this within 80 characters.

[newt (away), 2012/07/09 22:20:12]

Done.

+                 ],
               }],
               [ '_toolset == "target" and android_build_type == 0', {
                 'defines': [
                   'HAVE_ENDIAN_H',
                 ],
               }],
             ],
           }],
           ['OS=="mac"', {
             'include_dirs': [
@@ skipping 197 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }