diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 6 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 8 | ||||
| -rw-r--r-- | gyp/jsoncpp.gyp | 11 |
3 files changed, 12 insertions, 13 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index b908903f80..b1317661c2 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -680,12 +680,6 @@ ], }], - [ 'skia_build_json_writer', { - 'defines': [ - 'SK_BUILD_JSON_WRITER', - ] - }], - ], # end 'conditions' # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 'xcode_settings': { diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index f0c065f79b..c414c75e63 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -64,13 +64,11 @@ [ 'skia_android_framework == 1', { 'skia_os%': 'android', 'skia_chrome_utils%': 0, - # FIXME (scroggo): JSON is disabled in Android framework until we - # solve skbug.com/2448 - 'skia_build_json_writer%': 0, + 'skia_use_system_json%': 1, }, { 'skia_os%': '<(skia_os)', 'skia_chrome_utils%': 1, - 'skia_build_json_writer%': 1, + 'skia_use_system_json%': 0, }], [ 'skia_os == "win"', { 'os_posix%': 0, @@ -204,7 +202,7 @@ 'skia_mesa%': '<(skia_mesa)', 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 'skia_android_framework%': '<(skia_android_framework)', - 'skia_build_json_writer%': '<(skia_build_json_writer)', + '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)', 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)', diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp index 0507ed06a1..337f716a18 100644 --- a/gyp/jsoncpp.gyp +++ b/gyp/jsoncpp.gyp @@ -18,9 +18,16 @@ 'targets': [ { 'target_name': 'jsoncpp', - 'type': 'static_library', 'conditions': [ - ['skia_build_json_writer', { + ['skia_use_system_json', { + 'type': 'none', + 'direct_dependent_settings': { + 'libraries': [ + 'jsoncpp.a', + ], + }, + }, { + 'type': 'static_library', 'defines': [ 'JSON_USE_EXCEPTION=0', ], |