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 /chrome/chrome_browser.gypi | |
| 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 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 86a6903..642af1b 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2785,7 +2785,7 @@ ['exclude', '^browser/views/'], ], 'conditions': [ - ['OS=="linux" and (toolkit_views==1 or chromeos==1)',{ + ['OS=="linux" and toolkit_views==1',{ 'dependencies': [ '../views/views.gyp:views', ], @@ -3077,7 +3077,7 @@ # These GTK files haven't been ported to views, while ChromeOS has # its own separate implementation below. So re-include them only on # non-ChromeOS views Linux builds. - ['OS=="linux" and chromeos==0 and toolkit_views==1', { + ['OS=="linux" and toolkit_views==1 and chromeos==0', { 'sources/': [ ['include', '^browser/gtk/dialogs_gtk.cc'], ['include', '^browser/gtk/external_protocol_dialog_gtk.cc'], @@ -3089,7 +3089,7 @@ ], }], # GTK build only - ['OS=="linux" and chromeos==0 and toolkit_views==0', { + ['OS=="linux" and toolkit_views==0', { 'sources/': [ ['include', '^browser/printing/print_dialog_gtk.cc'], ['include', '^browser/printing/print_dialog_gtk.h'], |