diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 16:51:04 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 16:51:04 +0000 |
| commit | 90f189171992a626ee8f1f99e1ce418513bf18db (patch) | |
| tree | df292d86f718c952c532f6f010af2379d368b356 /base | |
| parent | 1d414b8789fd4fd81778505b0cadc1d44fb059ba (diff) | |
| download | chromium_src-90f189171992a626ee8f1f99e1ce418513bf18db.zip chromium_src-90f189171992a626ee8f1f99e1ce418513bf18db.tar.gz chromium_src-90f189171992a626ee8f1f99e1ce418513bf18db.tar.bz2 | |
Move the sources/ exclude and sources! rules that apply only to
base_extra_target to the base_extra_target block.
Test base_extra_target==1 for consistency with the base_target==1
conditional in the same file (just a style nit).
R=jam,mark
BUG=none
TEST=no build errors on any platforms
Review URL: http://codereview.chromium.org/2878027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/base/base.gypi b/base/base.gypi index d32d694..6d9ce63 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -305,9 +305,7 @@ 'conditions': [ [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { 'sources/': [ - ['exclude', '/xdg_user_dirs/'], ['exclude', '/xdg_[^/]*\\.cc$'], - ['exclude', '_nss\.cc$'], ], 'sources!': [ 'atomicops_internals_x86_gcc.cc', @@ -337,12 +335,6 @@ 'sources/': [ ['exclude', '_openbsd\\.cc$'] ], }, ], - [ 'OS != "mac"', { - 'sources!': [ - 'crypto/cssm_init.cc', - 'crypto/cssm_init.h', - ], - },], [ 'OS == "win"', { 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -360,7 +352,7 @@ },], ], }], - ['base_extra_target', { + ['base_extra_target==1', { 'sources': [ 'crypto/capi_util.cc', 'crypto/capi_util.h', @@ -473,6 +465,21 @@ '-Wno-write-strings', ], },], + # TODO(wtc): can this become the 'else' clause of the conditional + # above? Can we define USE_SYMBOLIZE and use -Wno-write-strings on + # Solaris? + [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { + 'sources/': [ + ['exclude', '/xdg_user_dirs/'], + ['exclude', '_nss\.cc$'], + ], + }], + [ 'OS != "mac"', { + 'sources!': [ + 'crypto/cssm_init.cc', + 'crypto/cssm_init.h', + ], + },], [ 'OS != "win"', { 'sources!': [ 'third_party/purify/pure_api.c', |