Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Unified Diff: gyp/SampleApp.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/gmmain.cpp ('k') | gyp/bench.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/SampleApp.gyp
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index d4dda700495983552d5ec9e4ff8baf32e72d2dbb..abfc8b77f9ac26ffaa207584bdf75c18adfe00f7 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -19,7 +19,6 @@
'../samplecode', # To pull SampleApp.h and SampleCode.h
'../src/pipe/utils', # For TiledPipeController
'../src/utils/debugger',
- '../tools',
],
'includes': [
'gmslides.gypi',
@@ -135,7 +134,7 @@
# Lua
'../src/utils/SkLuaCanvas.cpp',
'../src/utils/SkLua.cpp',
-
+
# tools
'../tools/sk_tool_utils.cpp',
],
@@ -145,15 +144,17 @@
'../samplecode/SampleFontCache.cpp',
],
'dependencies': [
- 'skia_lib.gyp:skia_lib',
- 'views.gyp:views',
'animator.gyp:animator',
- 'xml.gyp:xml',
+ 'etc1.gyp:libetc1',
'experimental.gyp:experimental',
+ 'flags.gyp:flags',
+ 'lua.gyp:lua',
'pdf.gyp:pdf',
+ 'resources.gyp:resources',
+ 'skia_lib.gyp:skia_lib',
+ 'views.gyp:views',
'views_animated.gyp:views_animated',
- 'lua.gyp:lua',
- 'etc1.gyp:libetc1',
+ 'xml.gyp:xml',
],
'conditions' : [
[ 'sample_pdf_file_viewer == 1', {
« no previous file with comments | « gm/gmmain.cpp ('k') | gyp/bench.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698