diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 14:08:16 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 14:08:16 +0000 |
| commit | a316ca53007530f6724c32c01bbc1a32c1e1b326 (patch) | |
| tree | 471e0ef5f59b0da6d7e0f9fb95d2c1f7ca3d588f | |
| parent | a77fa2dc9cb9a10a31688a1bb24a9101194d51af (diff) | |
| download | chromium_src-a316ca53007530f6724c32c01bbc1a32c1e1b326.zip chromium_src-a316ca53007530f6724c32c01bbc1a32c1e1b326.tar.gz chromium_src-a316ca53007530f6724c32c01bbc1a32c1e1b326.tar.bz2 | |
Fix up the excludes so they properly handle paths where the platform subdir is
the *first* element in the pathname (ie- mac/foo.mm). But luckily, the
other rules have caught the places where this bug would have hit, but
nothing says that will always be true.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4915001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66118 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index c9f219e..02b99c7 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -616,25 +616,25 @@ 'conditions': [ ['OS!="win"', { 'sources/': [ ['exclude', '_win(_unittest)?\\.cc$'], - ['exclude', '/win/'], - ['exclude', '/win_[^/]*\\.cc$'] ], + ['exclude', '(^|/)win/'], + ['exclude', '(^|/)win_[^/]*\\.cc$'] ], }], ['OS!="mac"', { 'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.cc$'], - ['exclude', '/(cocoa|mac)/'], - ['exclude', '\.mm?$' ] ], + ['exclude', '(^|/)(cocoa|mac)/'], + ['exclude', '\\.mm?$' ] ], }], ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', { 'sources/': [ ['exclude', '_(chromeos|gtk|x|x11|xdg)(_unittest)?\\.cc$'], - ['exclude', '/gtk/'], - ['exclude', '/(gtk|x11)_[^/]*\\.cc$'], + ['exclude', '(^|/)gtk/'], + ['exclude', '(^|/)(gtk|x11)_[^/]*\\.cc$'], ], }], ['OS!="linux"', { 'sources/': [ ['exclude', '_linux(_unittest)?\\.cc$'], - ['exclude', '/linux/'], + ['exclude', '(^|/)linux/'], ], }], # We use "POSIX" to refer to all non-Windows operating systems. |