diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 22:55:28 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 22:55:28 +0000 |
| commit | e5b307fe287acee54d60852addea15441243a4c7 (patch) | |
| tree | c35a43d270d83f098645de8a73ee9b417efc813c /build | |
| parent | ef402c3ba1147c39ab8b1f803b7bf8ebf1bbdefe (diff) | |
| download | chromium_src-e5b307fe287acee54d60852addea15441243a4c7.zip chromium_src-e5b307fe287acee54d60852addea15441243a4c7.tar.gz chromium_src-e5b307fe287acee54d60852addea15441243a4c7.tar.bz2 | |
Get Chrome to build & link with USE_AURA on Windows again.BUG=noneTEST=none
Review URL: http://codereview.chromium.org/8174005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index a4cda52..9963f45 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -309,6 +309,11 @@ 'file_manager_extension%': 0, }], + # ... except on Windows even with Aura. + ['use_aura==1 and OS=="win"', { + 'file_manager_extension%': 0, + }], + # Enable WebUI TaskManager only on Chrome OS, Touch or PureView. ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 'webui_task_manager%': 1, |