diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 04:28:01 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 04:28:01 +0000 |
| commit | 978a2ae248b9c2bc74369e685628542457660198 (patch) | |
| tree | e51cd74de1e438a8db628c4049a7d2ab54b70043 /build | |
| parent | fd85fabc56ef116eb64074a660e0ab6dbab395e4 (diff) | |
| download | chromium_src-978a2ae248b9c2bc74369e685628542457660198.zip chromium_src-978a2ae248b9c2bc74369e685628542457660198.tar.gz chromium_src-978a2ae248b9c2bc74369e685628542457660198.tar.bz2 | |
Revert 222971 "Switch all windows bots to Aura"
> Switch all windows bots to Aura
>
> This is a reland of https://codereview.chromium.org/23816007/
> See the comments there.
>
> Hopefully all pesky tests failures have been addressed
>
> BUG=259185
> TEST=none
> TBR=scottmg
>
> Review URL: https://codereview.chromium.org/23803010
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/23796008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index 446e6dcf..e664730 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -69,15 +69,10 @@ 'branding%': 'Chromium', 'conditions': [ - # ChromeOS implies ash and Windows implies Ash and Aura. - # However, we only default use_ash to 1 on Windows if - # use_aura==1, so that disabling Aura automatically - # disables Ash. See comments below, as well. - ['chromeos==1 or OS=="win"', { - 'use_aura%': 1, - }], + # ChromeOS implies ash. ['chromeos==1', { 'use_ash%': 1, + 'use_aura%': 1, }], # For now, Windows builds that |use_aura| should also imply using |