Skip to content

GitLab

T
tangled
Commit 4091f5c8 authored by tfarina@chromium.org's avatar tfarina@chromium.org
Browse files
Options

ui: Fold ime gypi files directly into their main targets (ui_base and ui_unittests). 

This simplifies the management and will also make the conversion to GN easier.

BUG=299841
TEST=ui_unittests
R=yukishiino@chromium.org

Review URL: https://codereview.chromium.org/365303003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284211 0039d316-1c4b-4281-b951-d872f2087c98
parent d8234d2f
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 185 deletions
ui/base/ime/ime.gypi deleted 100644 → 0
View file @ d8234d2f
# Copyright (c) 2012 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.
{
'dependencies' : [
'<(DEPTH)/ui/events/events.gyp:events',
],
'sources': [
'candidate_window.cc',
'candidate_window.h',
'chromeos/character_composer.cc',
'chromeos/character_composer.h',
'chromeos/ime_bridge.cc',
'chromeos/ime_bridge.h',
'chromeos/ime_keymap.cc',
'chromeos/ime_keymap.h',
'chromeos/mock_ime_candidate_window_handler.cc',
'chromeos/mock_ime_candidate_window_handler.h',
'chromeos/mock_ime_engine_handler.cc',
'chromeos/mock_ime_engine_handler.h',
'chromeos/mock_ime_input_context_handler.cc',
'chromeos/mock_ime_input_context_handler.h',
'composition_text.cc',
'composition_text.h',
'composition_text_util_pango.cc',
'composition_text_util_pango.h',
'composition_underline.h',
'dummy_input_method_delegate.cc',
'dummy_input_method_delegate.h',
'infolist_entry.cc',
'infolist_entry.h',
'input_method.h',
'input_method_auralinux.cc',
'input_method_auralinux.h',
'input_method_base.cc',
'input_method_base.h',
'input_method_chromeos.cc',
'input_method_chromeos.h',
'input_method_delegate.h',
'input_method_factory.cc',
'input_method_factory.h',
'input_method_initializer.cc',
'input_method_initializer.h',
'input_method_mac.h',
'input_method_mac.mm',
'input_method_minimal.cc',
'input_method_minimal.h',
'input_method_observer.h',
'input_method_win.cc',
'input_method_win.h',
'linux/fake_input_method_context.cc',
'linux/fake_input_method_context.h',
'linux/fake_input_method_context_factory.cc',
'linux/fake_input_method_context_factory.h',
'linux/linux_input_method_context.h',
'linux/linux_input_method_context_factory.cc',
'linux/linux_input_method_context_factory.h',
'mock_input_method.cc',
'mock_input_method.h',
'remote_input_method_delegate_win.h',
'remote_input_method_win.cc',
'remote_input_method_win.h',
'text_input_client.cc',
'text_input_client.h',
'text_input_focus_manager.cc',
'text_input_focus_manager.h',
'text_input_type.h',
'win/imm32_manager.cc',
'win/imm32_manager.h',
'win/tsf_input_scope.cc',
'win/tsf_input_scope.h',
],
'conditions': [
['toolkit_views==0 and use_aura==0', {
'sources!': [
'input_method_factory.cc',
'input_method_factory.h',
'input_method_minimal.cc',
'input_method_minimal.h',
],
}],
['chromeos==0 or use_x11==0', {
'sources!': [
'input_method_chromeos.cc',
'input_method_chromeos.h',
],
}],
['chromeos==1', {
'dependencies': [
'<(DEPTH)/chromeos/chromeos.gyp:chromeos',
],
}],
['OS!="win"', {
'sources!': [
'input_method_imm32.cc',
'input_method_imm32.h',
],
}],
['use_aura==0 or (desktop_linux==0 and use_ozone==0)', {
'sources!': [
'input_method_auralinux.cc',
'input_method_auralinux.h',
'linux/fake_input_method_context.cc',
'linux/fake_input_method_context.h',
'linux/fake_input_method_context_factory.cc',
'linux/fake_input_method_context_factory.h',
'linux/linux_input_method_context.h',
'linux/linux_input_method_context_factory.cc',
'linux/linux_input_method_context_factory.h',
],
}],
['use_x11==0', {
'sources!': [
'composition_text_util_pango.cc',
'composition_text_util_pango.h',
'chromeos/character_composer.cc',
'chromeos/character_composer.h',
],
}],
['OS=="android"', {
'dependencies!' : [
'<(DEPTH)/ui/events/events.gyp:events',
],
}]
],
}
ui/base/ime/ime_test_support.gypi deleted 100644 → 0
View file @ d8234d2f
# Copyright (c) 2012 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.
{
'sources': [
'dummy_input_method.cc',
'dummy_input_method.h',
'dummy_text_input_client.cc',
'dummy_text_input_client.h',
],
}
ui/base/ime/ime_unittests.gypi deleted 100644 → 0
View file @ d8234d2f
# Copyright (c) 2012 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.
{
'sources': [
'candidate_window_unittest.cc',
'chromeos/character_composer_unittest.cc',
'composition_text_util_pango_unittest.cc',
'input_method_base_unittest.cc',
'input_method_chromeos_unittest.cc',
'remote_input_method_win_unittest.cc',
'win/imm32_manager_unittest.cc',
'win/tsf_input_scope_unittest.cc',
],
'conditions': [
['chromeos==0 or use_x11==0', {
'sources!': [
'chromeos/character_composer_unittest.cc',
'input_method_chromeos_unittest.cc',
],
}],
['use_x11==0', {
'sources!': [
'composition_text_util_pango_unittest.cc',
],
}],
],
}
ui/base/ui_base.gyp
View file @ 4091f5c8
......@@ -21,6 +21,7 @@
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
'../../url/url.gyp:url_lib',
'../events/events.gyp:events',
'../events/events.gyp:events_base',
'../events/platform/events_platform.gyp:events_platform',
'../gfx/gfx.gyp:gfx',
......@@ -176,6 +177,69 @@
'dragdrop/os_exchange_data_provider_win.cc',
'dragdrop/os_exchange_data_provider_win.h',
'hit_test.h',
'ime/candidate_window.cc',
'ime/candidate_window.h',
'ime/chromeos/character_composer.cc',
'ime/chromeos/character_composer.h',
'ime/chromeos/ime_bridge.cc',
'ime/chromeos/ime_bridge.h',
'ime/chromeos/ime_keymap.cc',
'ime/chromeos/ime_keymap.h',
'ime/chromeos/mock_ime_candidate_window_handler.cc',
'ime/chromeos/mock_ime_candidate_window_handler.h',
'ime/chromeos/mock_ime_engine_handler.cc',
'ime/chromeos/mock_ime_engine_handler.h',
'ime/chromeos/mock_ime_input_context_handler.cc',
'ime/chromeos/mock_ime_input_context_handler.h',
'ime/composition_text.cc',
'ime/composition_text.h',
'ime/composition_text_util_pango.cc',
'ime/composition_text_util_pango.h',
'ime/composition_underline.h',
'ime/dummy_input_method_delegate.cc',
'ime/dummy_input_method_delegate.h',
'ime/infolist_entry.cc',
'ime/infolist_entry.h',
'ime/input_method.h',
'ime/input_method_auralinux.cc',
'ime/input_method_auralinux.h',
'ime/input_method_base.cc',
'ime/input_method_base.h',
'ime/input_method_chromeos.cc',
'ime/input_method_chromeos.h',
'ime/input_method_delegate.h',
'ime/input_method_factory.cc',
'ime/input_method_factory.h',
'ime/input_method_initializer.cc',
'ime/input_method_initializer.h',
'ime/input_method_mac.h',
'ime/input_method_mac.mm',
'ime/input_method_minimal.cc',
'ime/input_method_minimal.h',
'ime/input_method_observer.h',
'ime/input_method_win.cc',
'ime/input_method_win.h',
'ime/linux/fake_input_method_context.cc',
'ime/linux/fake_input_method_context.h',
'ime/linux/fake_input_method_context_factory.cc',
'ime/linux/fake_input_method_context_factory.h',
'ime/linux/linux_input_method_context.h',
'ime/linux/linux_input_method_context_factory.cc',
'ime/linux/linux_input_method_context_factory.h',
'ime/mock_input_method.cc',
'ime/mock_input_method.h',
'ime/remote_input_method_delegate_win.h',
'ime/remote_input_method_win.cc',
'ime/remote_input_method_win.h',
'ime/text_input_client.cc',
'ime/text_input_client.h',
'ime/text_input_focus_manager.cc',
'ime/text_input_focus_manager.h',
'ime/text_input_type.h',
'ime/win/imm32_manager.cc',
'ime/win/imm32_manager.h',
'ime/win/tsf_input_scope.cc',
'ime/win/tsf_input_scope.h',
'l10n/formatter.cc',
'l10n/formatter.h',
'l10n/l10n_font_util.cc',
......@@ -319,11 +383,7 @@
}],
],
'conditions': [
['OS!="ios"', {
'includes': [
'ime/ime.gypi',
],
}, { # OS=="ios"
['OS=="ios"', {
# iOS only uses a subset of UI.
'sources/': [
['exclude', '\\.(cc|mm)$'],
......@@ -340,20 +400,12 @@
],
},
}],
['toolkit_views==1', {
'dependencies': [
'../events/events.gyp:events',
],
}],
['use_aura==1', {
'sources/': [
['exclude', 'clipboard/clipboard_mac.mm'],
['exclude', 'layout_mac.mm'],
['exclude', 'work_area_watcher_observer.h'],
],
'dependencies': [
'../events/events.gyp:events',
],
}, { # use_aura!=1
'sources!': [
'cursor/cursor.cc',
......@@ -579,6 +631,52 @@
# ui to be a hard dependency for all its users.
'hard_dependency': 1,
}],
['toolkit_views==0 and use_aura==0', {
'sources!': [
'ime/input_method_factory.cc',
'ime/input_method_factory.h',
'ime/input_method_minimal.cc',
'ime/input_method_minimal.h',
],
}],
['chromeos==0 or use_x11==0', {
'sources!': [
'ime/input_method_chromeos.cc',
'ime/input_method_chromeos.h',
],
}],
['chromeos==1', {
'dependencies': [
'../../chromeos/chromeos.gyp:chromeos',
],
}],
['OS!="win"', {
'sources!': [
'ime/input_method_imm32.cc',
'ime/input_method_imm32.h',
],
}],
['use_aura==0 or (desktop_linux==0 and use_ozone==0)', {
'sources!': [
'ime/input_method_auralinux.cc',
'ime/input_method_auralinux.h',
'ime/linux/fake_input_method_context.cc',
'ime/linux/fake_input_method_context.h',
'ime/linux/fake_input_method_context_factory.cc',
'ime/linux/fake_input_method_context_factory.h',
'ime/linux/linux_input_method_context.h',
'ime/linux/linux_input_method_context_factory.cc',
'ime/linux/linux_input_method_context_factory.h',
],
}],
['use_x11==0', {
'sources!': [
'ime/composition_text_util_pango.cc',
'ime/composition_text_util_pango.h',
'ime/chromeos/character_composer.cc',
'ime/chromeos/character_composer.h',
],
}],
],
},
{
......@@ -606,7 +704,12 @@
'conditions': [
['OS!="ios"', {
'type': 'static_library',
'includes': [ 'ime/ime_test_support.gypi' ],
'sources': [
'ime/dummy_input_method.cc',
'ime/dummy_input_method.h',
'ime/dummy_text_input_client.cc',
'ime/dummy_text_input_client.h',
],
}, { # OS=="ios"
# None of the sources in this target are built on iOS, resulting in
# link errors when building targets that depend on this target
......
ui/ui_unittests.gyp
View file @ 4091f5c8
......@@ -60,6 +60,14 @@
'base/cocoa/nsgraphics_context_additions_unittest.mm',
'base/cocoa/tracking_area_unittest.mm',
'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
'base/ime/candidate_window_unittest.cc',
'base/ime/chromeos/character_composer_unittest.cc',
'base/ime/composition_text_util_pango_unittest.cc',
'base/ime/input_method_base_unittest.cc',
'base/ime/input_method_chromeos_unittest.cc',
'base/ime/remote_input_method_win_unittest.cc',
'base/ime/win/imm32_manager_unittest.cc',
'base/ime/win/tsf_input_scope_unittest.cc',
'base/models/list_model_unittest.cc',
'base/models/list_selection_model_unittest.cc',
'base/models/tree_node_model_unittest.cc',
......@@ -76,9 +84,6 @@
'conditions': [
['OS!="ios"', {
'sources' : ['<@(_all_sources)'],
'includes': [
'base/ime/ime_unittests.gypi',
],
}, { # OS=="ios"
'sources' : [
'<@(_common_sources)',
......@@ -215,6 +220,17 @@
'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
],
}],
['chromeos==0 or use_x11==0', {
'sources!': [
'base/ime/chromeos/character_composer_unittest.cc',
'base/ime/input_method_chromeos_unittest.cc',
],
}],
['use_x11==0', {
'sources!': [
'base/ime/composition_text_util_pango_unittest.cc',
],
}],
],
'target_conditions': [
['OS == "ios"', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment