diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 12:00:45 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 12:00:45 +0000 |
| commit | 99dbb184ea5182e07a738a9c901494ccb970d01f (patch) | |
| tree | 0fee40810bfeb8cc17fbe3cfb8f1a27ca9af1777 /build | |
| parent | b6572231bcf8d1cac040802cd14a4b670e94ad94 (diff) | |
| download | chromium_src-99dbb184ea5182e07a738a9c901494ccb970d01f.zip chromium_src-99dbb184ea5182e07a738a9c901494ccb970d01f.tar.gz chromium_src-99dbb184ea5182e07a738a9c901494ccb970d01f.tar.bz2 | |
Revert 204716
This causes Aura to run on all windows bots some redness might
ensure in chromeframe and some nacl tests.
Currently this is the only way to get perf data
"Revert 204698 "Run aura on the bots for a bit (ta..."
> 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
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/16135006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205054 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 40f1383..87b77eb 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -65,12 +65,12 @@ 'branding%': 'Chromium', 'conditions': [ - # ChromeOS implies ash. - ['chromeos==1', { + # ChromeOS implies ash and for a limited time Windows. Call now!. + ['chromeos==1 or OS=="win"', { '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. |