diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
| commit | 149e9a107c356b0151433fb23c2b1c8d0634947c (patch) | |
| tree | 7db3bbc9bba71665f1d0c2720c98682afcda2bda /gyp | |
| parent | 2a6f221bf8cea98bd7b44b02ce5c13a6b334a70d (diff) | |
Rename kPMColor_SkColorType to kN32_SkColorType.
The new name better represents what this flag means.
BUG=skia:2384
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/227433009
git-svn-id: http://skia.googlecode.com/svn/trunk@14117 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 5 | ||||
| -rw-r--r-- | gyp/skia_for_chromium_defines.gypi | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 3743b60d3c..92fb819f08 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -301,9 +301,8 @@ # 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', + # Still need to switch Android to the new name for N32. + 'kNative_8888_SkColorType kN32_SkColorType', ], }], diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index 6eaa5945f4..1bbd0c3054 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -15,6 +15,7 @@ 'skia_for_chromium_defines': [ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', + 'SK_SUPPORT_LEGACY_N32_NAME', ], }, } |