Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: views/views.gyp

Issue 6975045: touch: Always expect XInput2 availability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index ecac0e2bd95bdecc55d42d5542a6c98ea8ed56ea..5dd510b762deaa118ca33d97307477e405ab9905 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -7,21 +7,6 @@
'chromium_code': 1,
},
- 'conditions': [
- ['os_posix == 1 and OS != "mac"', {
- 'conditions': [
- ['sysroot!=""', {
- 'variables': {
- 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
- },
- }, {
- 'variables': {
- 'pkg-config': 'pkg-config'
- },
- }],]
- }],
- ],
-
'target_defaults': {
'sources/': [
['exclude', '/(cocoa|gtk|win)/'],
@@ -434,15 +419,6 @@
['exclude', 'focus/accelerator_handler_gtk.cc'],
['exclude', 'controls/menu/native_menu_gtk.cc'],
],
- 'conditions': [
- ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!=""', {
- # Exclude TouchFactory if XInput2 is not available.
- 'sources/': [
- ['exclude', 'touchui/touch_factory.cc'],
- ['exclude', 'touchui/touch_factory.h'],
- ],
- }],
- ],
}],
['use_ibus==1', {
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698