gyp/jsoncpp.gyp - 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/jsoncpp.gyp

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/jsoncpp.gyp

diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp

index 0507ed06a1629332da5eb020b51b1b771f4fd6b9..337f716a180e521e1932d268748321b3b203725b 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',

« no previous file with comments | « gyp/common_variables.gypi ('k') | include/utils/SkJSONCPP.h » ('j') | no next file with comments »