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

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, 5 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
« no previous file with comments | « views/touchui/touch_factory.cc ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 92859ae89120f95395440641e140fea28e5907c3..613f50f8171b4847b3ff0eeccca96a72a36b7bf4 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': {
'conditions': [
['OS=="win"', {'sources/': [
@@ -419,15 +404,6 @@
['exclude', 'controls/menu/native_menu_gtk.cc'],
['exclude', 'widget/tooltip_manager_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': [
« no previous file with comments | « views/touchui/touch_factory.cc ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698