diff options
| author | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 22:30:23 +0000 |
|---|---|---|
| committer | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 22:30:23 +0000 |
| commit | cfa2e11076daae5c5f955c67620164b400c77801 (patch) | |
| tree | fc2bf480c9a941217b3a4a532ebadb8a0c445303 /build | |
| parent | 16864221105a01dde61848870965a139609da7ae (diff) | |
| download | chromium_src-cfa2e11076daae5c5f955c67620164b400c77801.zip chromium_src-cfa2e11076daae5c5f955c67620164b400c77801.tar.gz chromium_src-cfa2e11076daae5c5f955c67620164b400c77801.tar.bz2 | |
Remove ibus checking script from views.gyp and add use_ibus=1 option
BUG=chromium:80700
TEST=Test it on Linux desktop
Review URL: http://codereview.chromium.org/6904053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 | ||||
| -rw-r--r-- | build/linux/system.gyp | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0a51eab..03de1e2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -541,6 +541,13 @@ 'clang_chrome_plugins_flags': '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)', }], + + # Set 1 to enable ibus support. Currently it is only supported in touchui. + ['touchui==1 and chromeos==1', { + 'use_ibus%': 1, + }, { + 'use_ibus%': 0, + }] ], }, 'target_defaults': { diff --git a/build/linux/system.gyp b/build/linux/system.gyp index a52083b..cbe51940 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -350,11 +350,9 @@ 'target_name': 'ibus', 'type': 'settings', 'conditions': [ - ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"==""', { - 'variables': { - 'ibus': 1 - }, + ['use_ibus==1', { 'direct_dependent_settings': { + 'defines': ['HAVE_IBUS=1'], 'cflags': [ '<!@(<(pkg-config) --cflags ibus-1.0)', ], |