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

Unified Diff: base/base.gypi

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 7 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 | « base/base.gyp ('k') | breakpad/breakpad.gyp » ('j') | breakpad/breakpad.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index bdade596afd3d0369ba3796fe3e9e70d65887b4a..d88824ad001f43bc79d51c68b99831a00ad95ac7 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'
« no previous file with comments | « base/base.gyp ('k') | breakpad/breakpad.gyp » ('j') | breakpad/breakpad.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698