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

Unified Diff: build/filename_rules.gypi

Issue 118583003: gyps! and builds! Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | « build/common.gypi ('k') | build/gyp_chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/filename_rules.gypi
diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi
index 1bef75fe0a7ce03c3804e29b9cd103846fd1711a..7330507f969cad3e682fddb8284ab899f39a0857 100644
--- a/build/filename_rules.gypi
+++ b/build/filename_rules.gypi
@@ -13,7 +13,7 @@
['exclude', '(^|/)win/'],
['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ],
}],
- ['OS!="mac" or >(nacl_untrusted_build)==1', {
+ ['(OS!="mac" or >(nacl_untrusted_build)==1) and not (OS=="android" and _toolset=="host" and host_os=="mac")', {
'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'],
['exclude', '(^|/)(cocoa|mac)/'] ],
}],
@@ -21,7 +21,7 @@
'sources/': [ ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'],
['exclude', '(^|/)ios/'] ],
}],
- ['(OS!="mac" and OS!="ios") or >(nacl_untrusted_build)==1', {
+ ['((OS!="mac" and OS!="ios") or >(nacl_untrusted_build)==1) and not (OS=="android" and _toolset=="host" and host_os=="mac")', {
'sources/': [ ['exclude', '\\.mm?$' ] ],
}],
# Do not exclude the linux files on *BSD since most of them can be
« no previous file with comments | « build/common.gypi ('k') | build/gyp_chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698