diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 07:06:42 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 07:06:42 +0000 |
| commit | db49b39c9969722de3540d53f4beb12942d5855b (patch) | |
| tree | 2dd9724d3a1c34c66f8f9d14a32925d552b697df /ui/ui.gyp | |
| parent | ee5eef01050628bf12b0de9f1acaa20312e3b6ea (diff) | |
| download | chromium_src-db49b39c9969722de3540d53f4beb12942d5855b.zip chromium_src-db49b39c9969722de3540d53f4beb12942d5855b.tar.gz chromium_src-db49b39c9969722de3540d53f4beb12942d5855b.tar.bz2 | |
Revert 229524 "Revert 229521 "Revert 229507 "aura: Allow creating content_shell...""
Breaks blink waterfall due to TOOLKIT_VIEWS not defined there.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229525 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/': [ |