diff options
| author | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-04 18:24:33 +0000 |
|---|---|---|
| committer | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-04 18:24:33 +0000 |
| commit | ef9f5ffe4b00cfc6787d9ebfb37f4dcb238571c1 (patch) | |
| tree | c7154efba81a7e1c12a1a24b89e2f23de63fa2a4 /third_party | |
| parent | 462b56306d18777b24faf807e71701df8e174f7f (diff) | |
| download | chromium_src-ef9f5ffe4b00cfc6787d9ebfb37f4dcb238571c1.zip chromium_src-ef9f5ffe4b00cfc6787d9ebfb37f4dcb238571c1.tar.gz chromium_src-ef9f5ffe4b00cfc6787d9ebfb37f4dcb238571c1.tar.bz2 | |
leveldatabase.gyp cleanup
Followup for some style issues identified in https://codereview.chromium.org/432083003/
* move windows source files into the main list
(and filter *_win.{cc,h} on non-windows platforms for all targets)
* remove exclusions of files that don't exist (*_android.cc & *_portable.cc)
* exclude header files corresponding to excluded .cc files
BUG=381456
Review URL: https://codereview.chromium.org/433203002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/leveldatabase/leveldatabase.gyp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp index 71931d9..1696f45 100644 --- a/third_party/leveldatabase/leveldatabase.gyp +++ b/third_party/leveldatabase/leveldatabase.gyp @@ -39,6 +39,9 @@ 'src/include/', ], 'conditions': [ + ['OS!="win"', { + 'sources/': [ ['exclude', '_win.(h|cc)$'], ], + }], ['use_snappy', { 'defines': [ 'USE_SNAPPY=1', @@ -63,12 +66,6 @@ '../../third_party/snappy/snappy.gyp:snappy', ], }], - ['OS=="win"', { - 'sources': [ - 'env_chromium_win.cc', - 'env_chromium_win.h', - ], - }], ], 'direct_dependent_settings': { 'include_dirs': [ @@ -95,6 +92,8 @@ 'env_chromium.h', 'env_chromium_stdio.cc', 'env_chromium_stdio.h', + 'env_chromium_win.cc', + 'env_chromium_win.h', 'env_idb.h', 'port/port_chromium.cc', 'port/port_chromium.h', @@ -181,7 +180,7 @@ 'src/util/status.cc', ], 'sources/': [ - ['exclude', '_(android|example|portable|posix)\\.cc$'], + ['exclude', '_(example|posix)\\.(h|cc)$'], ], }, { |