AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add skia_use_android_framework_defines GYP_DEFINE

Browse Source 
BUG=skia:4082

Review URL: https://codereview.chromium.org/1243383002
This commit is contained in:
borenet 2015-07-22 13:29:25 -07:00 committed by Commit bot
parent ff0ca5ed82
commit 243406e580
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gyp/common_conditions.gypi
View File

@ -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)',
],
}],

3
gyp/common_variables.gypi
View File

@ -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)',