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 /app | |
| 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 'app')
| -rw-r--r-- | app/app_base.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index f046e2c..0c68721 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -209,7 +209,7 @@ '../build/linux/system.gyp:x11', ], 'conditions': [ - ['toolkit_views==0 and chromeos==0', { + ['toolkit_views==0', { # Note: because of gyp predence rules this has to be defined as # 'sources/' rather than 'sources!'. 'sources/': [ @@ -220,7 +220,7 @@ ['exclude', '^drag_drop_types_gtk.cc'], ], }], - ['toolkit_views==1 or chromeos==1', { + ['toolkit_views==1', { # Note: because of gyp predence rules this has to be defined as # 'sources/' rather than 'sources!'. 'sources/': [ |