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

Unified Diff: build/all.gyp

Issue 10704153: Adjust the all.gyp:All target for iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 | « no previous file | build/common.gypi » ('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 0c9bfaa45f3513c5f2294ef81e0478fc59a0e5f8..6e292a306e24b9061dbaa991aac1440576712882 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -10,7 +10,6 @@
'xcode_create_dependents_test_runner': 1,
'dependencies': [
'some.gyp:*',
- '../base/base.gyp:*',
# Add new dependencies to the !ios section just below, not here (see
# the comment there).
],
@@ -20,6 +19,7 @@
# as gyp files come online.
['OS!="ios"', {
'dependencies': [
+ '../base/base.gyp:*',
'../chrome/chrome.gyp:*',
'../content/content.gyp:*',
'../crypto/crypto.gyp:*',
@@ -67,13 +67,17 @@
'temp_gyp/googleurl.gyp:*',
'<(libjpeg_gyp_path):*',
],
+ }, {
rohitrao (ping after 24h) 2012/07/11 11:52:31 I'm having trouble parsing this gyp file. Is the
stuartmorgan 2012/07/11 13:49:51 This is gyp-ese for if/else. 'conditions': [ [<
rohitrao (ping after 24h) 2012/07/11 14:01:58 Oh, I see. So this is the else-clause, OS==ios.
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
}],
['os_posix==1 and OS!="android" and OS!="ios"', {
'dependencies': [
'../third_party/yasm/yasm.gyp:*#host',
],
}],
- ['OS=="mac" or OS=="win"', {
+ ['OS=="mac" or OS=="ios" or OS=="win"', {
'dependencies': [
'../third_party/nss/nss.gyp:*',
],
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698