diff options
| author | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 21:29:47 +0000 |
|---|---|---|
| committer | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 21:29:47 +0000 |
| commit | 296bc450e8c62ba8bddd4a67e4cb3e89648f99a2 (patch) | |
| tree | c63ce9762f156e999a18a013bd4d07c265eab68f /base/base.gypi | |
| parent | 5f745718ff8052fb22fd411cd9202d04d9afdb06 (diff) | |
| download | chromium_src-296bc450e8c62ba8bddd4a67e4cb3e89648f99a2.zip chromium_src-296bc450e8c62ba8bddd4a67e4cb3e89648f99a2.tar.gz chromium_src-296bc450e8c62ba8bddd4a67e4cb3e89648f99a2.tar.bz2 | |
Support target/host architecture with ninja iOS builds
When iOS builds support ninja and enable GYP_CROSSCOMPILE=1, ninja
will build breakpad, protoc and iossim using host arch instead
of the sub-out-ninja workaround.
TBR=mark@chromium.org
BUG=236517
Review URL: https://chromiumcodereview.appspot.com/14597007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/base/base.gypi b/base/base.gypi index bdade59..d88824a 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -672,7 +672,7 @@ ['include', '^worker_pool_linux\\.cc$'], ], }], - ['OS == "ios"', { + ['OS == "ios" and _toolset != "host"', { 'sources/': [ # Pull in specific Mac files for iOS (which have been filtered out # by file name rules). @@ -701,6 +701,15 @@ 'message_pump_libevent.cc' ], }], + ['OS == "ios" and _toolset == "host"', { + 'sources/': [ + # Copied filename_rules to switch from iOS to Mac inclusions. + ['include', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'], + ['include', '(^|/)(cocoa|mac)/'], + ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'], + ['exclude', '(^|/)ios/'], + ] + }], ['OS != "mac" or >(nacl_untrusted_build)==1', { 'sources!': [ 'mac/scoped_aedesc.h' |