Index: gyp/common_variables.gypi |
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi |
index f0c065f79b9414bdb0d9f3b454621a32f8a935aa..c414c75e63d141c83eae475220a55bea477a27d5 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)', |