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:*', |
], |