Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index e6906fcd1c57c167390b9aa6e627fe121f9bd641..41dd4a4f031fba48d9b319caff698d962996c2f3 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -908,7 +908,7 @@ |
| }, |
| }], |
| ['chromium_code==0', { |
| - # This section must follow the other conditon sections above because |
| + # This section must follow the other condition sections above because |
| # external_code.gypi expects to be merged into those settings. |
| 'includes': [ |
| 'external_code.gypi', |
| @@ -920,6 +920,38 @@ |
| 'defines': [ |
| '__STDC_FORMAT_MACROS', |
| ], |
| + 'conditions': [ |
| + ['OS!="win"', { |
| + 'sources/': [ ['exclude', '_win\\.cc$'], |
| + ['exclude', '/win/'], |
| + ['exclude', '/win_[^/]*\\.cc$'] ], |
|
Mark Mentovai
2009/11/26 05:54:07
I would have turned the * into a + here and on lin
|
| + }], |
| + ['OS!="mac"', { |
| + 'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.cc$'], |
|
Mark Mentovai
2009/11/26 05:54:07
I'm surprised the exclude for '/cocoa/' (directori
|
| + ['exclude', '\.mm$' ] ], |
| + }], |
| + ['OS!="linux"', { |
| + 'sources/': [ |
| + ['exclude', '_(chromeos|gtk|linux|x|x11)(_unittest)?\\.cc$'], |
| + ['exclude', '/gtk/'], |
| + ['exclude', '/(gtk|x11)_[^/]*\\.cc$'] ], |
| + }], |
| + # We use "POSIX" to refer to all non-Windows operating systems. |
| + ['OS=="win"', { |
| + 'sources/': [ ['exclude', '_posix\\.cc$'] ], |
| + }], |
| + # Though Skia is conceptually shared by Linux and Windows, |
| + # the only _skia files in our tree are Linux-specific. |
| + ['OS!="linux"', { |
| + 'sources/': [ ['exclude', '_skia\\.cc$'] ], |
| + }], |
| + ['chromeos!=1', { |
| + 'sources/': [ ['exclude', '_chromeos\\.cc$'] ] |
| + }], |
| + ['OS!="win" and toolkit_views!=1', { |
| + 'sources/': [ ['exclude', '_views\\.cc$'] ] |
| + }], |
| + ], |
| }, |
| }], |
| ['disable_nacl==1', { |