diff options
Diffstat (limited to 'chromium/third_party/skia/gyp/common.gypi')
| -rw-r--r-- | chromium/third_party/skia/gyp/common.gypi | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/chromium/third_party/skia/gyp/common.gypi b/chromium/third_party/skia/gyp/common.gypi index 48b9a6d2ef0..0846fef7b3a 100644 --- a/chromium/third_party/skia/gyp/common.gypi +++ b/chromium/third_party/skia/gyp/common.gypi @@ -12,6 +12,7 @@ 'target_defaults': { 'defines': [ + 'SK_INTERNAL', 'SK_GAMMA_SRGB', 'SK_GAMMA_APPLY_TO_A8', 'SK_SCALAR_TO_FLOAT_EXCLUDED', # temporary to allow Chrome to call SkFloatToScalar @@ -88,25 +89,30 @@ ], }, ], + [ 'skia_android_framework==0', { + # These defines are not used for skia_android_framework, where we build + # one makefile and allow someone to add SK_DEBUG etc for their own + # debugging purposes. + 'configurations': { + 'Debug': { + 'defines': [ + 'SK_DEBUG', + 'SK_DEVELOPER=1', + ], + }, + 'Release': { + 'defines': [ + 'SK_RELEASE', + ], + }, + 'Release_Developer': { + 'inherit_from': ['Release'], + 'defines': [ + 'SK_DEVELOPER=1', + ], + }, + }, + }], ], - 'configurations': { - 'Debug': { - 'defines': [ - 'SK_DEBUG', - 'SK_DEVELOPER=1', - ], - }, - 'Release': { - 'defines': [ - 'SK_RELEASE', - ], - }, - 'Release_Developer': { - 'inherit_from': ['Release'], - 'defines': [ - 'SK_DEVELOPER=1', - ], - }, - }, }, # end 'target_defaults' } |