Adjust the all.gyp:All target for iOS

The initial iOS version was over-ambitious, and doesn't yet build. To
get the build working, this:
- only builds base:base on iOS, not base:*, and
- disables warnings-as-errors in third-party code for iOS, since
  at least NSS and ICU have warnings for iOS.

This also adds nss.gyp to the iOS build, now that its gyp support
has landed

BUG=None
TEST=None


Review URL: https://chromiumcodereview.appspot.com/10704153

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146120 0039d316-1c4b-4281-b951-d872f2087c98
parent 4bfc2dc9
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
'xcode_create_dependents_test_runner': 1, 'xcode_create_dependents_test_runner': 1,
'dependencies': [ 'dependencies': [
'some.gyp:*', 'some.gyp:*',
'../base/base.gyp:*',
# Add new dependencies to the !ios section just below, not here (see # Add new dependencies to the !ios section just below, not here (see
# the comment there). # the comment there).
], ],
...@@ -20,6 +19,7 @@ ...@@ -20,6 +19,7 @@
# as gyp files come online. # as gyp files come online.
['OS!="ios"', { ['OS!="ios"', {
'dependencies': [ 'dependencies': [
'../base/base.gyp:*',
'../chrome/chrome.gyp:*', '../chrome/chrome.gyp:*',
'../content/content.gyp:*', '../content/content.gyp:*',
'../crypto/crypto.gyp:*', '../crypto/crypto.gyp:*',
...@@ -67,13 +67,17 @@ ...@@ -67,13 +67,17 @@
'temp_gyp/googleurl.gyp:*', 'temp_gyp/googleurl.gyp:*',
'<(libjpeg_gyp_path):*', '<(libjpeg_gyp_path):*',
], ],
}, {
'dependencies': [
'../base/base.gyp:base',
],
}], }],
['os_posix==1 and OS!="android" and OS!="ios"', { ['os_posix==1 and OS!="android" and OS!="ios"', {
'dependencies': [ 'dependencies': [
'../third_party/yasm/yasm.gyp:*#host', '../third_party/yasm/yasm.gyp:*#host',
], ],
}], }],
['OS=="mac" or OS=="win"', { ['OS=="mac" or OS=="ios" or OS=="win"', {
'dependencies': [ 'dependencies': [
'../third_party/nss/nss.gyp:*', '../third_party/nss/nss.gyp:*',
], ],
......
...@@ -1650,6 +1650,10 @@ ...@@ -1650,6 +1650,10 @@
}], }],
[ 'OS=="ios"', { [ 'OS=="ios"', {
'xcode_settings': { 'xcode_settings': {
# TODO(ios): Fix remaining warnings in third-party code, then
# remove this; the Mac cleanup didn't get everything that's
# flagged in an iOS build.
'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
'RUN_CLANG_STATIC_ANALYZER': 'NO', 'RUN_CLANG_STATIC_ANALYZER': 'NO',
}, },
}], }],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment