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 72711f71e226024307d464917194e3311f8c5f4f..2e607e31d4af31bbd77d8a8cb0ff8d7b7298ba66 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
@@ -313,14 +316,9 @@
         'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
         'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
         'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
-        'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
-        'SK_SUPPORT_LEGACY_SETCONFIG_INFO',
-        # 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)',
+        # Defines from skia_for_android_framework_defines.gypi
+        '<@(skia_for_android_framework_defines)',
       ],
     }],