gyp/common_variables.gypi - Issue 303913002: In Android framework, make tools depend on jsoncpp

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gyp/common_variables.gypi

Issue 303913002: In Android framework, make tools depend on jsoncpp (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Do as Thoreau would do. Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

« no previous file with comments | « gyp/common_conditions.gypi ('k') | gyp/jsoncpp.gyp » ('j') | no next file with comments »