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

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

Patch Set: Rebase, cleanups. 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/dm.gyp

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

index 26d14db1aca71802d4f0cc240650e949b041daae..334cf7ade56c6dcbf7c1f18a3060ef6adaff47f6 100644

--- a/gyp/dm.gyp

+++ b/gyp/dm.gyp

@@ -64,7 +64,7 @@

'conditions': [

['skia_android_framework', {

- 'libraries': [ '-lskia' ],

+ 'libraries': [ '-lskia' , 'jsoncpp.a' ],

}],

['skia_poppler_enabled', {

'sources': [ '../src/utils/SkPDFRasterizer.cpp' ],

« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/gm.gyp » ('j') | gyp/gm.gyp » ('J')