New file for simpler updating of Android defines.

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 75b89b7bf235a58244b14e660420fb08801645fc..6ca6632d2e2c7e928098ed1ad0cb48bf8cd3e7eb 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -249,6 +249,9 @@
     ],
 
     ['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
@@ -320,6 +323,8 @@
         '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)',
       ],
     }],