diff options
| author | sque@chromium.org <sque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 20:20:31 +0000 |
|---|---|---|
| committer | sque@chromium.org <sque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 20:20:31 +0000 |
| commit | 9f9b3bdb5e877770612abfad2176ffbf3f1ad10d (patch) | |
| tree | a429c3ac28dcbd5e4fc6f72bda6e691bee9bc810 /build/filename_rules.gypi | |
| parent | f3f3e829b91831fe4282a89589cdf098dab68d9f (diff) | |
| download | chromium_src-9f9b3bdb5e877770612abfad2176ffbf3f1ad10d.zip chromium_src-9f9b3bdb5e877770612abfad2176ffbf3f1ad10d.tar.gz chromium_src-9f9b3bdb5e877770612abfad2176ffbf3f1ad10d.tar.bz2 | |
filename_rules: Separate chromeos from x11 rule
The x11 exclusion rule should not be excluding chromeos files. There is
a separate chromeos exclusion rule for that.
Also adding unit test exclusion to the chromeos rule.
BUG=chromium:134081
TEST=build w/ tests successfully
Signed-off-by: Simon Que <sque@chromium.org>
Change-Id: I2e462dcbda6ffc3636886a1f877a5554b7f6a1a9
Review URL: https://chromiumcodereview.appspot.com/10632015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/filename_rules.gypi')
| -rw-r--r-- | build/filename_rules.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi index 2f043e2..5941f7a 100644 --- a/build/filename_rules.gypi +++ b/build/filename_rules.gypi @@ -48,7 +48,7 @@ ], }], ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '_chromeos\\.(h|cc)$'] ] + 'sources/': [ ['exclude', '_chromeos(_unittest)?\\.(h|cc)$'] ] }], ['>(nacl_untrusted_build)==0', { 'sources/': [ @@ -62,7 +62,7 @@ }], ['<(use_x11)!=1 or >(nacl_untrusted_build)==1', { 'sources/': [ - ['exclude', '_(chromeos|x|x11)(_unittest)?\\.(h|cc)$'], + ['exclude', '_(x|x11)(_unittest)?\\.(h|cc)$'], ['exclude', '(^|/)x11_[^/]*\\.(h|cc)$'], ], }], |