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 313 matching lines @@
                   }],
                 ],
               }],
             ],
           }],
         ],
       },
     ],
 
     ['skia_android_framework', {
-      'includes' : [
-        'skia_for_android_framework_defines.gypi',
-      ],
       'cflags': [
         # Skia does not enforce this usage pattern so we disable it here to avoid
         # unecessary log spew when building
         '-Wno-unused-parameter',
 
         # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkString.
         # Revert to -D_FORTIFY_SOURCE=1
         '-U_FORTIFY_SOURCE',
         '-D_FORTIFY_SOURCE=1',
 
@@ skipping 42 matching lines @@
         # Optimizations for chromium (m30)
         '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_use_android_framework_defines', {
+      # Add these defines when building for the Android framework, or when
+      # specifically requested. These should be temporary staging defines. Any
+      # permanent defines should be moved into the skia_android_framework block
+      # above.
+      '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',
         ],
@@ skipping 222 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',
   },
 }