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

Unified Diff: views/views.gyp

Issue 6904053: Remove ibus checking script from views.gyp and add use_ibus=1 option (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated Created 9 years, 8 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 | « build/linux/system.gyp ('k') | no next file » | 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 939ab40d1e74af40bd4d5a7eb844fa6cca9dbe77..0eb07f1c69ebc633132d701e79cb716e18ca0f28 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -422,9 +422,6 @@
],
}],
['touchui==1', {
- 'dependencies': [
- '../build/linux/system.gyp:ibus',
- ],
'defines': ['TOUCH_UI=1'],
'sources/': [
['exclude', 'focus/accelerator_handler_gtk.cc'],
@@ -438,15 +435,15 @@
['exclude', 'touchui/touch_factory.h'],
],
}],
- # TODO(suzhe): We should not check ibus version here. Instead, we
- # should use a variable to control whether or not to use ibus.
- ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"==""', {
- 'defines': ['HAVE_IBUS=1'],
+ ['use_ibus==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:ibus',
+ ],
'sources/': [
['exclude', 'ime/input_method_gtk.cc'],
['exclude', 'ime/input_method_gtk.h'],
],
- }, { # else: no ibus
+ }, { # else: use_ibus != 1
'sources/': [
['exclude', 'ime/input_method_ibus.cc'],
['exclude', 'ime/input_method_ibus.h'],
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698