diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 13:01:10 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 13:01:10 +0000 |
| commit | 2de9d4a731d60ba3e5b9d07fe2a7c3022e632d43 (patch) | |
| tree | cf853dc073aa7bb8f07c0c884cc8fc74039d97c4 /build/linux | |
| parent | ac7f3fdb4987d7f44c1612d55437cfcb3eb263f6 (diff) | |
| download | chromium_src-2de9d4a731d60ba3e5b9d07fe2a7c3022e632d43.zip chromium_src-2de9d4a731d60ba3e5b9d07fe2a7c3022e632d43.tar.gz chromium_src-2de9d4a731d60ba3e5b9d07fe2a7c3022e632d43.tar.bz2 | |
Revert 65938 (arm compile fail) - touchui: First pass at XInput2 message pump.
Capture X events using XInput2.
BUG=None
TEST=None
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=65888
Review URL: http://codereview.chromium.org/4186004
TBR=sadrul@chromium.org
Review URL: http://codereview.chromium.org/4894001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 7193c67..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', |