diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 02:36:05 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 02:36:05 +0000 |
| commit | 452da69e427d9c9fe87b4e2ce37f1c5276db1922 (patch) | |
| tree | 5cdf61851b5630cb11a70583c1a61e7b84f76e64 /views/views.gyp | |
| parent | f8fa8fb9362151cfce0c55a61f26c55c640925de (diff) | |
| download | chromium_src-452da69e427d9c9fe87b4e2ce37f1c5276db1922.zip chromium_src-452da69e427d9c9fe87b4e2ce37f1c5276db1922.tar.gz chromium_src-452da69e427d9c9fe87b4e2ce37f1c5276db1922.tar.bz2 | |
Fix to make InputMethodIBus usable on every ChromeOS device (even without TouchUI)
Add switch "--enable-inputmethod-ibus" to enable InputMethodIBus on ChromeOS
Modify gyp files to link IBus
BUG=chromium-os:15566
TEST=manually
Review URL: http://codereview.chromium.org/7004029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/views/views.gyp b/views/views.gyp index 8f86b11..694b5a36 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -431,6 +431,8 @@ 'sources/': [ ['exclude', 'focus/accelerator_handler_gtk.cc'], ['exclude', 'controls/menu/native_menu_gtk.cc'], + ['exclude', 'ime/input_method_gtk.cc'], + ['exclude', 'ime/input_method_gtk.h'], ], 'conditions': [ ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!=""', { @@ -440,25 +442,16 @@ ['exclude', 'touchui/touch_factory.h'], ], }], - ['use_ibus==1', { - 'dependencies': [ - '../build/linux/system.gyp:ibus', - ], - 'sources/': [ - ['exclude', 'ime/input_method_gtk.cc'], - ['exclude', 'ime/input_method_gtk.h'], - ], - }, { # else: use_ibus != 1 - 'sources/': [ - ['exclude', 'ime/input_method_ibus.cc'], - ['exclude', 'ime/input_method_ibus.h'], - ], - }], ], - }, { # else: touchui != 1 - 'sources!': [ - 'ime/input_method_ibus.cc', - 'ime/input_method_ibus.h', + }], + ['use_ibus==1', { + 'dependencies': [ + '../build/linux/system.gyp:ibus', + ], + }, { # else: use_ibus != 1 + 'sources/': [ + ['exclude', 'ime/input_method_ibus.cc'], + ['exclude', 'ime/input_method_ibus.h'], ], }], ['OS=="win"', { |