commit bbe17a66705aff6f34a22adc0c12883dcb6161b3
author Greg Daniel <egdaniel@google.com> Tue Oct 18 20:48:18 2016 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 18 20:48:28 2016 +0000
tree e17fe7bdb106f668c38b6543392cf9082c49c31b
parent 13b4bc1a429a7250cc4303963ccd62b382245686

Revert "remove unneeded flags for android"

This reverts commit f00decf64422fce118703f046b135a542c013857.

Reason for revert: Breaking master-skia cause of SK_SUPPORT_LEGACY_PICTURE_PTR


TBR=rmistry@google.com,scroggo@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: Ib33b8fafeee847e0ef92e5865e50c2070ba3939c
Reviewed-on: https://skia-review.googlesource.com/3624
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

gyp/skia_for_android_framework_defines.gypi

diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi
index b7d1dc6..2c24e75 100644
--- a/gyp/skia_for_android_framework_defines.gypi
+++ b/gyp/skia_for_android_framework_defines.gypi
@@ -16,16 +16,24 @@
       'SK_SUPPORT_LEGACY_UNBALANCED_PIXELREF_LOCKCOUNT',
       # Needed until we fix https://bug.skia.org/2440 .
       'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
+      'SK_SUPPORT_LEGACY_COLORFILTER_PTR',
       'SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS',
+      'SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR',
       'SK_SUPPORT_LEGACY_GRADIENT_DITHERING',
       'SK_SUPPORT_LEGACY_DRAWFILTER',
+      'SK_SUPPORT_LEGACY_CREATESHADER_PTR',
+      'SK_SUPPORT_LEGACY_PATHEFFECT_PTR',
       'SK_SUPPORT_LEGACY_NEW_SURFACE_API',
+      'SK_SUPPORT_LEGACY_PICTURE_PTR',
+      'SK_SUPPORT_LEGACY_MASKFILTER_PTR',
       'SK_SUPPORT_LEGACY_IMAGEFACTORY',
+      'SK_SUPPORT_LEGACY_XFERMODE_PTR',
       'SK_IGNORE_GPU_DITHER',
       'SK_SUPPORT_LEGACY_PICTUREINSTALLPIXELREF',
       'SK_SUPPORT_LEGACY_STREAM_DATA',
       'SK_SUPPORT_LEGACY_CLIP_REGIONOPS',
       'SK_SUPPORT_LEGACY_SHADER_ISABITMAP',
+      'SK_SUPPORT_LEGACY_XFERMODE_OBJECT',
     ],
   },
 }