Commit ef9f5ffe authored by mostynb@opera.com's avatar mostynb@opera.com

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
parent 462b5630
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
'src/include/', 'src/include/',
], ],
'conditions': [ 'conditions': [
['OS!="win"', {
'sources/': [ ['exclude', '_win.(h|cc)$'], ],
}],
['use_snappy', { ['use_snappy', {
'defines': [ 'defines': [
'USE_SNAPPY=1', 'USE_SNAPPY=1',
...@@ -63,12 +66,6 @@ ...@@ -63,12 +66,6 @@
'../../third_party/snappy/snappy.gyp:snappy', '../../third_party/snappy/snappy.gyp:snappy',
], ],
}], }],
['OS=="win"', {
'sources': [
'env_chromium_win.cc',
'env_chromium_win.h',
],
}],
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
...@@ -95,6 +92,8 @@ ...@@ -95,6 +92,8 @@
'env_chromium.h', 'env_chromium.h',
'env_chromium_stdio.cc', 'env_chromium_stdio.cc',
'env_chromium_stdio.h', 'env_chromium_stdio.h',
'env_chromium_win.cc',
'env_chromium_win.h',
'env_idb.h', 'env_idb.h',
'port/port_chromium.cc', 'port/port_chromium.cc',
'port/port_chromium.h', 'port/port_chromium.h',
...@@ -181,7 +180,7 @@ ...@@ -181,7 +180,7 @@
'src/util/status.cc', 'src/util/status.cc',
], ],
'sources/': [ 'sources/': [
['exclude', '_(android|example|portable|posix)\\.cc$'], ['exclude', '_(example|posix)\\.(h|cc)$'],
], ],
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment