diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 06:08:16 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 06:08:16 +0000 |
| commit | b63fffebc66986665da2192649b59d4b0f9a7f59 (patch) | |
| tree | 626eab07c68286ef974d3e3b0732684e9c43af1f /ui/ui.gyp | |
| parent | 62f37684af00493f01d2212c26db073ff20b60cb (diff) | |
| download | chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.zip chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.tar.gz chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.tar.bz2 | |
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
Previously, on this issue:
* Landed in r229507
* Speculatively reverted in r229521.
* Relanded in r229524, since the revert didn't fix anything.
* Reverted in r229525 because it broken win-blink bots.
Review URL: https://codereview.chromium.org/26695007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229671 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', { + ['toolkit_views==0 and use_aura==0', { # Note: because of gyp predence rules this has to be defined as # 'sources/' rather than 'sources!'. 'sources/': [ |