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

Unified Diff: build/filename_rules.gypi

Issue 10690037: Add iOS handling to filename_rules.gypi (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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 | « no previous file | no next file » | 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 cb97498c9de6791d221a4389ee5a8cb5262b8139..637805d24fd4aa4e9f4c726c8d7a82ba78d5a916 100644
--- a/build/filename_rules.gypi
+++ b/build/filename_rules.gypi
@@ -14,9 +14,15 @@
['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ],
}],
['OS!="mac" or >(nacl_untrusted_build)==1', {
- 'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.(h|cc)$'],
- ['exclude', '(^|/)(cocoa|mac)/'],
- ['exclude', '\\.mm?$' ] ],
+ 'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.(cc|m|mm)$'],
Mark Mentovai 2012/06/29 13:17:28 Don’t lose the h here or on line 21.
Mark Mentovai 2012/06/29 13:17:28 I usually write 'm|mm' as 'mm?', as on line 25.
stuartmorgan 2012/06/29 13:26:21 Done.
stuartmorgan 2012/06/29 13:26:21 Done.
+ ['exclude', '(^|/)(cocoa|mac)/'] ],
+ }],
+ ['OS!="ios" or >(nacl_untrusted_build)==1', {
+ 'sources/': [ ['exclude', '_ios(_unittest)?\\.(cc|m|mm)$'],
+ ['exclude', '(^|/)ios/'] ],
+ }],
+ ['(OS!="mac" and OS!="ios") or >(nacl_untrusted_build)==1', {
+ 'sources/': [ ['exclude', '\\.mm?$' ] ],
}],
# Do not exclude the linux files on *BSD since most of them can be
# shared at this point.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698