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 |