Add skia_use_android_framework_defines GYP_DEFINE

gyp/common_conditions.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
@@ skipping 379 matching lines @@
         'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
         'IGNORE_ROT_AA_RECT_OPT',
         'SK_DEFAULT_FONT_CACHE_LIMIT   (768 * 1024)',
         'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
         'SK_IGNORE_ETC1_SUPPORT',
         # We can't use the skia_shared_library gyp setting because we need expose
         # this define globally and the the implemention define as a cflag.
         'SKIA_DLL',
         'SK_PRINT_CODEC_MESSAGES',
         # Defines from skia_for_android_framework_defines.gypi
         '<@(skia_for_android_framework_defines)',

[scroggo, 2015/07/22 13:02:43]

Should we instead set skia_use_android_framework_defines to true, and then let
the below code include the defines?

[borenet, 2015/07/22 13:32:35]

Good idea. Done.

       ],
     }],
 
+    ['skia_use_android_framework_defines', {

[scroggo, 2015/07/22 13:02:43]

Could you add a comment why this is necessary, here and/or in
common_variables.gypi?

[borenet, 2015/07/22 13:32:35]

Done.

+      'includes' : [
+        'skia_for_android_framework_defines.gypi',
+      ],
+      'defines': [
+        '<@(skia_for_android_framework_defines)',
+      ],
+    }],
+
     [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
       {
         'defines': [
           'SK_SAMPLES_FOR_X',
           'SK_BUILD_FOR_UNIX',
         ],
         'configurations': {
           'Coverage': {
             'conditions': [
               [ 'skia_clang_build', {
@@ skipping 218 matching lines @@
     [ 'sknx_no_simd', {
       'defines': [ 'SKNX_NO_SIMD' ],
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }