diff options
author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 05:37:03 +0000 |
---|---|---|
committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 05:37:03 +0000 |
commit | 2f0ac0da9184b8c79da8258fd741f08b6b608ed5 (patch) | |
tree | ad062fa9a97fb4228f7bab8efae11e10c4f1f389 /build | |
parent | 4b6d916eb655addd9b2682333a649615dd45f6ec (diff) | |
download | chromium_src-2f0ac0da9184b8c79da8258fd741f08b6b608ed5.zip chromium_src-2f0ac0da9184b8c79da8258fd741f08b6b608ed5.tar.gz chromium_src-2f0ac0da9184b8c79da8258fd741f08b6b608ed5.tar.bz2 |
Revert 204698 "Run aura on the bots for a bit (take 2)"
> Run aura on the bots for a bit (take 2)
>
> So we can see the perfbots for Aura.
>
> BUG=none
> TEST=see the waterfall red
>
> Review URL: https://codereview.chromium.org/16049016
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/16179003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 433fe46..75b37c2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -65,12 +65,12 @@ 'branding%': 'Chromium', 'conditions': [ - # ChromeOS implies ash and for a limited time Windows. Call now!. - ['chromeos==1 or OS=="win"', { + # ChromeOS implies ash. + ['chromeos==1', { 'use_ash%': 1, 'use_aura%': 1, }], - + # For now, Windows builds that |use_aura| should also imply using # ash. This rule should be removed for the future when Windows is # using the aura windows without the ash interface. |