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

Unified Diff: build/all.gyp

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 | « base/win/windows_version.cc ('k') | build/android/PRESUBMIT.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 0888d8cfb4ec1ca472206917ecf808cd0d1397b9..90c01205f8f9b2b58cdc07e1c6f216698c12554e 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -5,7 +5,9 @@
{
'variables': {
# A hook that can be overridden in other repositories to add additional
- # compilation targets to 'All'. Only used on Android.
+ # compilation targets to 'All'.
+ 'app_targets%': [],
+ # For Android-specific targets.
'android_app_targets%': [],
},
'targets': [
@@ -14,6 +16,7 @@
'type': 'none',
'xcode_create_dependents_test_runner': 1,
'dependencies': [
+ '<@(app_targets)',
'some.gyp:*',
'../base/base.gyp:*',
'../components/components.gyp:*',
@@ -236,7 +239,7 @@
}],
['remoting==1', {
'dependencies': [
- '../remoting/remoting.gyp:*',
+ '../remoting/remoting_all.gyp:remoting_all',
],
}],
['use_openssl==0', {
« no previous file with comments | « base/win/windows_version.cc ('k') | build/android/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698