diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-04 21:19:53 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-04 21:19:53 +0000 |
| commit | 848fdb06d473e0d97791def0b0f7fcd050ba67fd (patch) | |
| tree | d0bd9e96cb8135e55ce696b5f9c104bb0b08003c | |
| parent | 1f2d357436c7d133873b8f7d497c01afa70a6f32 (diff) | |
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
| -rw-r--r-- | gyp/common_conditions.gypi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index ea293d5599..93788a1153 100644 --- 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', ], }], |