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: http://src.chromium.org/svn/trunk/src/build@83232 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
c7ca0e0a70
Коммит
37c754d4d3
|
@ -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': {
|
||||
|
|
|
@ -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)',
|
||||
],
|
||||
|
|
Загрузка…
Ссылка в новой задаче