summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 16:31:11 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 16:31:11 +0000
commit37c645b3b3642a224ebc910cc24a095d53bbad1b (patch)
treeda55ad64baa05df0fe1e23627b9426b4f7907f75
parent4d7a5cbb643a42dda662177d7ea232c28717d5c1 (diff)
downloadchromium_src-37c645b3b3642a224ebc910cc24a095d53bbad1b.zip
chromium_src-37c645b3b3642a224ebc910cc24a095d53bbad1b.tar.gz
chromium_src-37c645b3b3642a224ebc910cc24a095d53bbad1b.tar.bz2
Fixes aura build on windows. TBRing since build is broken without this
on windows. BUG=none TEST=none TBR=evan@chromium.org R=evan@chromium.org Review URL: http://codereview.chromium.org/7978030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102114 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/base.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 3332b6b..c6ea838 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -394,7 +394,7 @@
[ 'toolkit_uses_gtk==0', {
'sources!': [ 'message_pump_gtk.cc', ],
}],
- [ 'touchui==0 and use_aura==0', {
+ [ '(touchui==0 and use_aura==0) or OS == "win"', {
'sources!' : [ 'message_pump_x.cc', ],
}, {
'sources!' : [ 'message_pump_gtk.cc', ],