diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 04:09:17 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 04:09:17 +0000 |
| commit | 4fd1b2b73a3cc79f0b70472146e78ff7f3798a1c (patch) | |
| tree | ca8efbe6325b6766df188087e5b5f884b236efa8 | |
| parent | 737d53d45632c93445d328c7cea9e9b244a69f7b (diff) | |
| download | chromium_src-4fd1b2b73a3cc79f0b70472146e78ff7f3798a1c.zip chromium_src-4fd1b2b73a3cc79f0b70472146e78ff7f3798a1c.tar.gz chromium_src-4fd1b2b73a3cc79f0b70472146e78ff7f3798a1c.tar.bz2 | |
Revert 223293 "Because we've been shipping Aura to canary for a ..."
> Because we've been shipping Aura to canary for a while. And because force compositor landed 40 hours ago and things seem ok. See https://codereview.chromium.org/23874016/
>
> This also allows to see perf numbers for Aura.
>
> This has happened before see for example r204698, r211007 and 214056 as an experiment but this time it might stick.
>
> BUG=259185
> TEST=none
> TBR=scottmg
>
> Review URL: https://codereview.chromium.org/24164002
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/24294006
git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@224886 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index f779a28..02d140e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -69,8 +69,8 @@ 'branding%': 'Chromium', 'conditions': [ - # ChromeOS and Windows use Aura and Ash. - ['chromeos==1 or OS=="win"', { + # ChromeOS implies ash. + ['chromeos==1', { 'use_ash%': 1, 'use_aura%': 1, }], |