gyp/gm.gyp - Issue 281303003: Generate gm/Android.mk, minus JSON.

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

Issue 281303003: Generate gm/Android.mk, minus JSON. (Closed) Base URL: https://skia.googlesource.com/skia.git@baseline_gm

Patch Set: Created 6 years, 7 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/gm.gyp

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

index 3533aa5ce9121ff043dd9be4408bfc22f94a1212..d5f3082c27e0c9d2b5e7ba52d9d748c845783320 100644

--- a/gyp/gm.gyp

+++ b/gyp/gm.gyp

@@ -23,6 +23,13 @@

'../gm/',

+ 'conditions': [

+ ['skia_android_framework', {

+ 'dependencies!': [

+ 'jsoncpp.gyp:jsoncpp',

+ ],

+ }],

+ ],

{

'target_name': 'gm',

@@ -52,6 +59,15 @@

'pdf.gyp:pdf',

'conditions': [

+ ['skia_android_framework', {

+ 'libraries': [

+ '-lskia',

+ '-lcutils',

+ ],

+ 'dependencies!': [

+ 'jsoncpp.gyp:jsoncpp',

+ ],

+ }],

['skia_run_pdfviewer_in_gm or skia_poppler_enabled', {

'sources': [

'../src/utils/SkPDFRasterizer.cpp',