diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 18:31:31 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 18:31:31 +0000 |
| commit | 06c756181e0a5fb64b42fa5e69eaa3721fd434ae (patch) | |
| tree | 8c7f2ffc06071945c753e1be209fa2b8aca30ca4 /build | |
| parent | 594b8f5fbe9c4838ea6e3f46814986357fbbbea2 (diff) | |
| download | chromium_src-06c756181e0a5fb64b42fa5e69eaa3721fd434ae.zip chromium_src-06c756181e0a5fb64b42fa5e69eaa3721fd434ae.tar.gz chromium_src-06c756181e0a5fb64b42fa5e69eaa3721fd434ae.tar.bz2 | |
gyp: unify toolkit_views usage
Now that we can rely on toolkit_views to be set when appropriate,
we can simplify a bunch of logic in gyp.
TEST=compiles
Review URL: http://codereview.chromium.org/1741010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/common.gypi | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index d97b2ce..b4fc1bf 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -107,7 +107,7 @@ '../third_party/libevent/libevent.gyp:*', ], }], - ['OS=="win" or (OS=="linux" and toolkit_views==1)', { + ['toolkit_views==1', { 'dependencies': [ '../views/views.gyp:*', ], diff --git a/build/common.gypi b/build/common.gypi index 163cf9ba..3739059 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -268,7 +268,7 @@ }, { 'linux_dump_symbols%': 0, }], - ['toolkit_views==0 and chromeos==0', { + ['toolkit_views==0', { # GTK wants Title Case strings 'use_titlecase_in_grd_files%': 1, }], @@ -388,7 +388,7 @@ }, { # else: branding!="Chrome" 'defines': ['CHROMIUM_BUILD'], }], - ['toolkit_views==1 or chromeos==1', { + ['toolkit_views==1', { 'defines': ['TOOLKIT_VIEWS=1'], }], ['chromeos==1', { @@ -545,7 +545,7 @@ ['chromeos!=1', { 'sources/': [ ['exclude', '_chromeos\\.cc$'] ] }], - ['OS!="win" and (toolkit_views==0 and chromeos==0)', { + ['toolkit_views==0', { 'sources/': [ ['exclude', '_views\\.cc$'] ] }], ], @@ -923,7 +923,7 @@ '-mfpmath=sse', ], }], - # ChromeOS targets Pinetrail, which is ssse3, but most of the + # ChromeOS targets Pinetrail, which is sse3, but most of the # benefit comes from sse2 so this setting allows ChromeOS # to build on other CPUs. In the future -march=atom would help # but requires a newer compiler. |