diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-24 22:11:55 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-24 22:11:55 +0000 |
| commit | 5a3abb7242051a7a28bd36c1c65ba82d118402ee (patch) | |
| tree | 00267f06433b977c183b5bf5804d2c5ae79eb5f9 | |
| parent | f731a8d5ade41ef9d1fec64b902bc5ed087de53c (diff) | |
| parent | f187160f1c51a308d9e4007aa4237f88df6813e5 (diff) | |
| download | gyp-5a3abb7242051a7a28bd36c1c65ba82d118402ee.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at f187160f1c51a308d9e4007aa4237f88df6813e5
This commit was generated by merge_from_chromium.py.
Change-Id: Ibdf3fde746460ab836c0bd2605b1cee7fa368843
| -rw-r--r-- | skia_for_chromium_defines.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index affd807..eeac1f6 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -15,12 +15,12 @@ 'skia_for_chromium_defines': [ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', - 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', - 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', - 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 'SK_SUPPORT_LEGACY_N32_NAME', 'SK_SUPPORT_LEGACY_PROCXFERMODE', + 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', + 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', + 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', ], }, } |