gyp/gm.gyp - Issue 346453002: Refactor how we handle resources path in Tests.

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 346453002: Refactor how we handle resources path in Tests. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fix rebase conflict 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/gm.gyp

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

index fd8f74d621c7cc33cd5ab83bf1cf1697bacce29d..0b0054b7018072eb41c59808809c04fd05bce0da 100644

--- a/gyp/gm.gyp

+++ b/gyp/gm.gyp

@@ -31,11 +31,10 @@

'type': 'executable',

'include_dirs' : [

'../src/core',

- '../src/images',

'../src/effects',

- '../src/pipe/utils/',

- '../src/utils/',

- '../tools',

+ '../src/images',

+ '../src/pipe/utils',

+ '../src/utils',

'includes': [

'gmslides.gypi',

@@ -48,12 +47,13 @@

'../src/pipe/utils/SamplePipeControllers.cpp',

'dependencies': [

- 'skia_lib.gyp:skia_lib',

+ 'etc1.gyp:libetc1',

'flags.gyp:flags',

'gm.gyp:gm_expectations',

'jsoncpp.gyp:jsoncpp',

'pdf.gyp:pdf',

- 'etc1.gyp:libetc1',

+ 'resources.gyp:resources',

+ 'skia_lib.gyp:skia_lib',

'conditions': [

['skia_android_framework', {

« no previous file with comments | « gyp/bench.gyp ('k') | gyp/resources.gyp » ('j') | no next file with comments »