diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 05:27:55 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 05:27:55 +0000 |
| commit | ecc87c893aa197f737b1d365d32093b51c2f0873 (patch) | |
| tree | 35dee950bdc8f7e8bbdb073e535c1dd248bf3d18 /ui/ui.gyp | |
| parent | fe1e2e97f78bb34ad3e29ec26fbb5f6f7ed52a90 (diff) | |
| download | chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.zip chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.tar.gz chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.tar.bz2 | |
Revert 229507 "aura: Allow creating content_shell without views."
Speculative. All windows bots on the main waterfall except for the clobber
builder started timing out during compile during a window that had only this
change and two test-only changes in the range.
> aura: Allow creating content_shell without views.
>
> This builds content_shell with use_aura=1 and toolkit_views=0.
>
> BUG=none
> R=derat@chromium.org, jamescook@chromium.org, jochen@chromium.org
>
> Review URL: https://codereview.chromium.org/26695007
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/30413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -399,7 +399,7 @@ '../build/linux/system.gyp:glib', ], 'conditions': [ - ['toolkit_views==0 and use_aura==0', { + ['toolkit_views==0', { # Note: because of gyp predence rules this has to be defined as # 'sources/' rather than 'sources!'. 'sources/': [ |