summaryrefslogtreecommitdiffstats
path: root/build/linux
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 01:49:15 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 01:49:15 +0000
commit34150bd49c099265dac814b1d30e5f7b4c500fec (patch)
treee350e86a3130dadd2226e8265fdacd73aeb5e446 /build/linux
parentf4f7dd072cb18b122edeca7992b1984759757962 (diff)
downloadchromium_src-34150bd49c099265dac814b1d30e5f7b4c500fec.zip
chromium_src-34150bd49c099265dac814b1d30e5f7b4c500fec.tar.gz
chromium_src-34150bd49c099265dac814b1d30e5f7b4c500fec.tar.bz2
Revert "touchui: First pass at XInput2 message pump."
This reverts commit r65888, build breakage. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
-rw-r--r--build/linux/system.gyp12
1 files changed, 1 insertions, 11 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index afa2a76..cf25bb1 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -225,17 +225,7 @@
'<!@(<(pkg-config) --libs-only-l x11)',
],
},
- }],
- # When XInput2 is available (i.e. inputproto version is 2.0), the
- # pkg-config command will succeed, so the output will be empty.
- ['"<!(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"==""', {
- 'direct_dependent_settings': {
- 'defines': [
- 'HAVE_XINPUT2',
- ],
- },
- }],
- ],
+ }]]
},
{
'target_name': 'xext',