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: http://src.chromium.org/svn/trunk/src/build@146120 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
stuartmorgan@chromium.org 2012-07-11 15:11:22 +00:00
Родитель 7b8712ea0f
Коммит fbf7bc3060
2 изменённых файлов: 10 добавлений и 2 удалений

Просмотреть файл

@ -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):*',
],
}, {
'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:*',
],

Просмотреть файл

@ -1650,6 +1650,10 @@
}],
[ 'OS=="ios"', {
'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',
},
}],