New file for simpler updating of Android defines.

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
     'SK_SUPPORT_GPU=<(skia_gpu)',
     'SK_SUPPORT_OPENCL=<(skia_opencl)',
     'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
   ],
   'conditions' : [
@@ skipping 231 matching lines @@
                   '-mfloat-abi=softfp',
                 ],
               }],
             ],
           }],
         ],
       },
     ],
 
     ['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 50 matching lines @@
         'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
         'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
         'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
         'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
         'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
         # Needed until we fix skbug.com/2440.
         'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
         # Transitional, for deprecated SkCanvas::SaveFlags methods.
         'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
         'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
         'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',

[scroggo, 2014/05/30 17:35:12]

For simplicity, I've left all of the existing flags here. It appears the
analogous file for chrome is only for temporary flags. Should the android
framework one be used in the same way? (Or for all flags?) Should I move the
appropriate flags to skia_for_android_framework_defines.gypi?

[reed1, 2014/05/30 17:39:40]

if the chrome idea is sound (who knows), then the new file is for defines that
are just being staged (i.e. marked deprecated). 

Thus we could move any of the SUPPORT_LEGACY flags (at least) into the new file.

[scroggo, 2014/05/30 21:03:42]

Done. I left the picture ones, so as not to step on Robert:
https://codereview.chromium.org/304333002/

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