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

Unified Diff: gyp/most.gyp

Issue 886413004: move HelloWorld to be a peer of SampleApp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: exclude android as well Created 5 years, 11 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 | « gyp/example.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/most.gyp
diff --git a/gyp/most.gyp b/gyp/most.gyp
index b94bda4e82eeb55e82124e8956b22a12c78913a8..c5479015cd0c9b45cf749db249445918e0dde2a9 100644
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -16,6 +16,7 @@
'skia_lib.gyp:skia_lib',
'bench.gyp:*',
+ 'example.gyp:HelloWorld',
'SampleApp.gyp:SampleApp',
'tools.gyp:tools',
'pathops_unittest.gyp:*',
@@ -24,11 +25,19 @@
'dm.gyp:dm',
],
'conditions': [
+ [ 'skia_gpu == 0 or skia_os == "android"', {
+ 'dependencies!': [
+ 'example.gyp:HelloWorld',
+ ],
+ }],
['skia_os == "android"', {
'dependencies': [ 'android_system.gyp:SampleApp_APK' ],
}],
['skia_os == "ios"', {
- 'dependencies!': [ 'SampleApp.gyp:SampleApp' ],
+ 'dependencies!': [
+ 'example.gyp:HelloWorld',
+ 'SampleApp.gyp:SampleApp',
+ ],
'dependencies': ['iOSShell.gyp:iOSShell' ],
}],
['skia_os == "mac" or skia_os == "linux"', {
@@ -37,6 +46,7 @@
[ 'skia_skip_gui',
{
'dependencies!': [
+ 'example.gyp:HelloWorld',
'SampleApp.gyp:SampleApp',
]
}
« no previous file with comments | « gyp/example.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698