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

Side by Side Diff: trunk/src/chromeos/chromeos.gyp

Issue 12453021: Revert 190596 "Extract input_method_whitelist.{h|cc} from c/b/ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/chrome_tests_unit.gypi ('k') | trunk/src/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')
Property Changes:
Deleted: svn:mergeinfo
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',
26 'power_manager_proto', 25 'power_manager_proto',
27 'power_supply_properties_proto', 26 'power_supply_properties_proto',
28 'video_activity_update_proto', 27 'video_activity_update_proto',
29 ], 28 ],
30 'defines': [ 29 'defines': [
31 'CHROMEOS_IMPLEMENTATION', 30 'CHROMEOS_IMPLEMENTATION',
32 ], 31 ],
33 'sources': [ 32 'sources': [
34 'attestation/attestation_flow.cc', 33 'attestation/attestation_flow.cc',
35 'attestation/attestation_flow.h', 34 'attestation/attestation_flow.h',
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 'ime/ibus_daemon_controller.h', 158 'ime/ibus_daemon_controller.h',
160 'ime/ibus_keymap.cc', 159 'ime/ibus_keymap.cc',
161 'ime/ibus_keymap.h', 160 'ime/ibus_keymap.h',
162 'ime/input_method_config.cc', 161 'ime/input_method_config.cc',
163 'ime/input_method_config.h', 162 'ime/input_method_config.h',
164 'ime/input_method_delegate.h', 163 'ime/input_method_delegate.h',
165 'ime/input_method_descriptor.cc', 164 'ime/input_method_descriptor.cc',
166 'ime/input_method_descriptor.h', 165 'ime/input_method_descriptor.h',
167 'ime/input_method_property.cc', 166 'ime/input_method_property.cc',
168 'ime/input_method_property.h', 167 'ime/input_method_property.h',
169 'ime/input_method_whitelist.cc',
170 'ime/input_method_whitelist.h',
171 'network/cros_network_functions.cc', 168 'network/cros_network_functions.cc',
172 'network/cros_network_functions.h', 169 'network/cros_network_functions.h',
173 'network/device_state.cc', 170 'network/device_state.cc',
174 'network/device_state.h', 171 'network/device_state.h',
175 'network/geolocation_handler.cc', 172 'network/geolocation_handler.cc',
176 'network/geolocation_handler.h', 173 'network/geolocation_handler.h',
177 'network/managed_state.cc', 174 'network/managed_state.cc',
178 'network/managed_state.h', 175 'network/managed_state.h',
179 'network/network_change_notifier_chromeos.cc', 176 'network/network_change_notifier_chromeos.cc',
180 'network/network_change_notifier_chromeos.h', 177 'network/network_change_notifier_chromeos.h',
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 'dbus/ibus/ibus_lookup_table_unittest.cc', 399 'dbus/ibus/ibus_lookup_table_unittest.cc',
403 'dbus/ibus/ibus_object_unittest.cc', 400 'dbus/ibus/ibus_object_unittest.cc',
404 'dbus/ibus/ibus_panel_service_unittest.cc', 401 'dbus/ibus/ibus_panel_service_unittest.cc',
405 'dbus/ibus/ibus_property_unittest.cc', 402 'dbus/ibus/ibus_property_unittest.cc',
406 'dbus/ibus/ibus_text_unittest.cc', 403 'dbus/ibus/ibus_text_unittest.cc',
407 'dbus/introspectable_client_unittest.cc', 404 'dbus/introspectable_client_unittest.cc',
408 'dbus/modem_messaging_client_unittest.cc', 405 'dbus/modem_messaging_client_unittest.cc',
409 'disks/disk_mount_manager_unittest.cc', 406 'disks/disk_mount_manager_unittest.cc',
410 'ime/input_method_descriptor_unittest.cc', 407 'ime/input_method_descriptor_unittest.cc',
411 'ime/input_method_property_unittest.cc', 408 'ime/input_method_property_unittest.cc',
412 'ime/input_method_whitelist_unittest.cc',
413 'network/cros_network_functions_unittest.cc', 409 'network/cros_network_functions_unittest.cc',
414 'network/geolocation_handler_unittest.cc', 410 'network/geolocation_handler_unittest.cc',
415 'network/network_change_notifier_chromeos_unittest.cc', 411 'network/network_change_notifier_chromeos_unittest.cc',
416 'network/network_configuration_handler_unittest.cc', 412 'network/network_configuration_handler_unittest.cc',
417 'network/network_event_log_unittest.cc', 413 'network/network_event_log_unittest.cc',
418 'network/network_sms_handler_unittest.cc', 414 'network/network_sms_handler_unittest.cc',
419 'network/network_state_handler_unittest.cc', 415 'network/network_state_handler_unittest.cc',
420 'network/network_util_unittest.cc', 416 'network/network_util_unittest.cc',
421 'network/onc/onc_certificate_importer_unittest.cc', 417 'network/onc/onc_certificate_importer_unittest.cc',
422 'network/onc/onc_merger_unittest.cc', 418 'network/onc/onc_merger_unittest.cc',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 '../third_party/cros_system_api/dbus/video_activity_update.proto', 475 '../third_party/cros_system_api/dbus/video_activity_update.proto',
480 ], 476 ],
481 'variables': { 477 'variables': {
482 'proto_in_dir': '../third_party/cros_system_api/dbus/', 478 'proto_in_dir': '../third_party/cros_system_api/dbus/',
483 'proto_out_dir': 'chromeos/dbus', 479 'proto_out_dir': 'chromeos/dbus',
484 }, 480 },
485 'includes': ['../build/protoc.gypi'], 481 'includes': ['../build/protoc.gypi'],
486 }, 482 },
487 ], 483 ],
488 } 484 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_tests_unit.gypi ('k') | trunk/src/chromeos/ime/gen_input_methods.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698