diff options
| author |  borenet <borenet@google.com> | 2015-07-22 13:29:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-22 13:29:25 -0700 |
| commit | 243406e5800ad4ff296da8d4cb30d0a33d6f7b2a (patch) | |
| tree | aa4f57a99b3a710d21cd42dae601bd8e3010ad3f /gyp | |
| parent | ff0ca5ed825d9106edc2df6ab3865e1c17c326bf (diff) | |
Add skia_use_android_framework_defines GYP_DEFINE
BUG=skia:4082
Review URL: https://codereview.chromium.org/1243383002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 16 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 3 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index ba4337403d..2c88a973f9 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -331,9 +331,6 @@ ], ['skia_android_framework', { - 'includes' : [ - 'skia_for_android_framework_defines.gypi', - ], 'cflags': [ # Skia does not enforce this usage pattern so we disable it here to avoid # unecessary log spew when building @@ -396,7 +393,18 @@ # this define globally and the the implemention define as a cflag. 'SKIA_DLL', 'SK_PRINT_CODEC_MESSAGES', - # Defines from skia_for_android_framework_defines.gypi + ], + }], + + ['skia_use_android_framework_defines', { + # Add these defines when building for the Android framework, or when + # specifically requested. These should be temporary staging defines. Any + # permanent defines should be moved into the skia_android_framework block + # above. + 'includes' : [ + 'skia_for_android_framework_defines.gypi', + ], + 'defines': [ '<@(skia_for_android_framework_defines)', ], }], diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 10b465ac8e..911a3a5e89 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -76,10 +76,12 @@ [ 'skia_android_framework == 1', { 'skia_os%': 'android', 'skia_chrome_utils%': 0, + 'skia_use_android_framework_defines%': 1, 'skia_use_system_json%': 1, }, { 'skia_os%': '<(skia_os)', 'skia_chrome_utils%': 1, + 'skia_use_android_framework_defines%': 0, 'skia_use_system_json%': 0, }], [ 'skia_os == "win"', { @@ -197,6 +199,7 @@ 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)', 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 'skia_android_framework%': '<(skia_android_framework)', + 'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines)', 'skia_use_system_json%': '<(skia_use_system_json)', 'skia_android_path_rendering%': '<(skia_android_path_rendering)', 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)', |