Updates to Android.mk generation.

These defines were manually added to the last merge.

BUG=skia:1975
R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/226663002

git-svn-id: http://skia.googlecode.com/svn/trunk@14067 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index ea293d5599cf01eb5d9bc85e48c1149979a3cadf..93788a1153ef13e0bc51a6cdcc6149636d78df58 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -296,6 +296,14 @@
         'SK_DEFAULT_FONT_CACHE_LIMIT   (768 * 1024)',
         'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"',
         'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
+        # FIXME: b/13729784: Need to rework LayerRasterizer.cpp
+        'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API',
+        # Temporary until https:#googleplex-android-review.git.corp.google.com/#/c/442220/
+        # lands.
+        'SK_SUPPORT_LEGACY_GETTOTALCLIP',
+        # Use a better name for kPMColor_SkColorType until
+        # https://code.google.com/p/skia/issues/detail?id=2384 is fixed.
+        'kNative_8888_SkColorType kPMColor_SkColorType',
       ],
     }],