summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-20 06:49:12 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-20 06:49:12 +0000
commitc01a3358ee69a603d993ffd47def1d70b4823508 (patch)
tree0010516a7f0f98db598e5bfea74345629b2f593c /ui/ui.gyp
parent0b99515150201b93515e01b3d3a0b6398f83378d (diff)
downloadchromium_src-c01a3358ee69a603d993ffd47def1d70b4823508.zip
chromium_src-c01a3358ee69a603d993ffd47def1d70b4823508.tar.gz
chromium_src-c01a3358ee69a603d993ffd47def1d70b4823508.tar.bz2
Revert r229671 "aura: Allow creating content_shell without views."
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder%20%28deps%29/builds/74852/steps/compile/logs/stdio git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index a5a0172..29c3e52 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -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/': [