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

Side by Side Diff: chromeos/chromeos.gyp

Issue 13042007: Extract input_method_whitelist.{h|cc} from c/b/chromeos. (2nd try) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replicate input_methods.txt for migration Created 7 years, 9 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chromeos/ime/gen_input_methods.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chromeos_tools.gypi' 10 'chromeos_tools.gypi'
11 ], 11 ],
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'chromeos', 14 'target_name': 'chromeos',
15 'type': '<(component)', 15 'type': '<(component)',
16 'dependencies': [ 16 'dependencies': [
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 '../base/base.gyp:base_prefs', 18 '../base/base.gyp:base_prefs',
19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
20 '../build/linux/system.gyp:dbus', 20 '../build/linux/system.gyp:dbus',
21 '../build/linux/system.gyp:ssl', 21 '../build/linux/system.gyp:ssl',
22 '../dbus/dbus.gyp:dbus', 22 '../dbus/dbus.gyp:dbus',
23 '../net/net.gyp:net', 23 '../net/net.gyp:net',
24 '../third_party/libxml/libxml.gyp:libxml', 24 '../third_party/libxml/libxml.gyp:libxml',
25 'ime/input_method.gyp:gencode',
25 'power_manager_proto', 26 'power_manager_proto',
26 'power_supply_properties_proto', 27 'power_supply_properties_proto',
27 'video_activity_update_proto', 28 'video_activity_update_proto',
28 ], 29 ],
29 'defines': [ 30 'defines': [
30 'CHROMEOS_IMPLEMENTATION', 31 'CHROMEOS_IMPLEMENTATION',
31 ], 32 ],
32 'sources': [ 33 'sources': [
33 'attestation/attestation_flow.cc', 34 'attestation/attestation_flow.cc',
34 'attestation/attestation_flow.h', 35 'attestation/attestation_flow.h',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 'ime/ibus_daemon_controller.h', 161 'ime/ibus_daemon_controller.h',
161 'ime/ibus_keymap.cc', 162 'ime/ibus_keymap.cc',
162 'ime/ibus_keymap.h', 163 'ime/ibus_keymap.h',
163 'ime/input_method_config.cc', 164 'ime/input_method_config.cc',
164 'ime/input_method_config.h', 165 'ime/input_method_config.h',
165 'ime/input_method_delegate.h', 166 'ime/input_method_delegate.h',
166 'ime/input_method_descriptor.cc', 167 'ime/input_method_descriptor.cc',
167 'ime/input_method_descriptor.h', 168 'ime/input_method_descriptor.h',
168 'ime/input_method_property.cc', 169 'ime/input_method_property.cc',
169 'ime/input_method_property.h', 170 'ime/input_method_property.h',
171 'ime/input_method_whitelist.cc',
172 'ime/input_method_whitelist.h',
170 'network/cros_network_functions.cc', 173 'network/cros_network_functions.cc',
171 'network/cros_network_functions.h', 174 'network/cros_network_functions.h',
172 'network/device_state.cc', 175 'network/device_state.cc',
173 'network/device_state.h', 176 'network/device_state.h',
174 'network/geolocation_handler.cc', 177 'network/geolocation_handler.cc',
175 'network/geolocation_handler.h', 178 'network/geolocation_handler.h',
176 'network/managed_state.cc', 179 'network/managed_state.cc',
177 'network/managed_state.h', 180 'network/managed_state.h',
178 'network/network_change_notifier_chromeos.cc', 181 'network/network_change_notifier_chromeos.cc',
179 'network/network_change_notifier_chromeos.h', 182 'network/network_change_notifier_chromeos.h',
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 'dbus/ibus/ibus_object_unittest.cc', 405 'dbus/ibus/ibus_object_unittest.cc',
403 'dbus/ibus/ibus_panel_service_unittest.cc', 406 'dbus/ibus/ibus_panel_service_unittest.cc',
404 'dbus/ibus/ibus_property_unittest.cc', 407 'dbus/ibus/ibus_property_unittest.cc',
405 'dbus/ibus/ibus_text_unittest.cc', 408 'dbus/ibus/ibus_text_unittest.cc',
406 'dbus/introspectable_client_unittest.cc', 409 'dbus/introspectable_client_unittest.cc',
407 'dbus/modem_messaging_client_unittest.cc', 410 'dbus/modem_messaging_client_unittest.cc',
408 'disks/disk_mount_manager_unittest.cc', 411 'disks/disk_mount_manager_unittest.cc',
409 'ime/extension_ime_util_unittest.cc', 412 'ime/extension_ime_util_unittest.cc',
410 'ime/input_method_descriptor_unittest.cc', 413 'ime/input_method_descriptor_unittest.cc',
411 'ime/input_method_property_unittest.cc', 414 'ime/input_method_property_unittest.cc',
415 'ime/input_method_whitelist_unittest.cc',
412 'network/cros_network_functions_unittest.cc', 416 'network/cros_network_functions_unittest.cc',
413 'network/geolocation_handler_unittest.cc', 417 'network/geolocation_handler_unittest.cc',
414 'network/network_change_notifier_chromeos_unittest.cc', 418 'network/network_change_notifier_chromeos_unittest.cc',
415 'network/network_configuration_handler_unittest.cc', 419 'network/network_configuration_handler_unittest.cc',
416 'network/network_event_log_unittest.cc', 420 'network/network_event_log_unittest.cc',
417 'network/network_sms_handler_unittest.cc', 421 'network/network_sms_handler_unittest.cc',
418 'network/network_state_handler_unittest.cc', 422 'network/network_state_handler_unittest.cc',
419 'network/network_util_unittest.cc', 423 'network/network_util_unittest.cc',
420 'network/onc/onc_certificate_importer_unittest.cc', 424 'network/onc/onc_certificate_importer_unittest.cc',
421 'network/onc/onc_merger_unittest.cc', 425 'network/onc/onc_merger_unittest.cc',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 '../third_party/cros_system_api/dbus/video_activity_update.proto', 482 '../third_party/cros_system_api/dbus/video_activity_update.proto',
479 ], 483 ],
480 'variables': { 484 'variables': {
481 'proto_in_dir': '../third_party/cros_system_api/dbus/', 485 'proto_in_dir': '../third_party/cros_system_api/dbus/',
482 'proto_out_dir': 'chromeos/dbus', 486 'proto_out_dir': 'chromeos/dbus',
483 }, 487 },
484 'includes': ['../build/protoc.gypi'], 488 'includes': ['../build/protoc.gypi'],
485 }, 489 },
486 ], 490 ],
487 } 491 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chromeos/ime/gen_input_methods.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698