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

Side by Side Diff: chromeos/chromeos.gyp

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'chromeos_sources': [ 9 'chromeos_sources': [
10 'accelerometer/accelerometer_reader.cc', 10 'accelerometer/accelerometer_reader.cc',
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 'ime/component_extension_ime_manager.cc', 237 'ime/component_extension_ime_manager.cc',
238 'ime/component_extension_ime_manager.h', 238 'ime/component_extension_ime_manager.h',
239 'ime/composition_text.cc', 239 'ime/composition_text.cc',
240 'ime/composition_text.h', 240 'ime/composition_text.h',
241 'ime/extension_ime_util.cc', 241 'ime/extension_ime_util.cc',
242 'ime/extension_ime_util.h', 242 'ime/extension_ime_util.h',
243 'ime/fake_ime_keyboard.cc', 243 'ime/fake_ime_keyboard.cc',
244 'ime/fake_ime_keyboard.h', 244 'ime/fake_ime_keyboard.h',
245 'ime/ime_keyboard.cc', 245 'ime/ime_keyboard.cc',
246 'ime/ime_keyboard.h', 246 'ime/ime_keyboard.h',
247 'ime/ime_keyboard_ozone.cc',
248 'ime/ime_keyboard_ozone.h',
249 'ime/ime_keyboard_x11.cc',
250 'ime/ime_keyboard_x11.h',
251 'ime/input_method_delegate.h', 247 'ime/input_method_delegate.h',
252 'ime/input_method_descriptor.cc', 248 'ime/input_method_descriptor.cc',
253 'ime/input_method_descriptor.h', 249 'ime/input_method_descriptor.h',
254 'ime/input_method_manager.cc', 250 'ime/input_method_manager.cc',
255 'ime/input_method_manager.h', 251 'ime/input_method_manager.h',
256 'ime/input_method_whitelist.cc', 252 'ime/input_method_whitelist.cc',
257 'ime/input_method_whitelist.h', 253 'ime/input_method_whitelist.h',
258 'login/auth/auth_attempt_state.cc', 254 'login/auth/auth_attempt_state.cc',
259 'login/auth/auth_attempt_state.h', 255 'login/auth/auth_attempt_state.h',
260 'login/auth/auth_attempt_state_resolver.cc', 256 'login/auth/auth_attempt_state_resolver.cc',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 'dbus/shill_device_client_unittest.cc', 424 'dbus/shill_device_client_unittest.cc',
429 'dbus/shill_ipconfig_client_unittest.cc', 425 'dbus/shill_ipconfig_client_unittest.cc',
430 'dbus/shill_manager_client_unittest.cc', 426 'dbus/shill_manager_client_unittest.cc',
431 'dbus/shill_profile_client_unittest.cc', 427 'dbus/shill_profile_client_unittest.cc',
432 'dbus/shill_service_client_unittest.cc', 428 'dbus/shill_service_client_unittest.cc',
433 'dbus/shill_third_party_vpn_driver_client_unittest.cc', 429 'dbus/shill_third_party_vpn_driver_client_unittest.cc',
434 'disks/disk_mount_manager_unittest.cc', 430 'disks/disk_mount_manager_unittest.cc',
435 'ime/component_extension_ime_manager_unittest.cc', 431 'ime/component_extension_ime_manager_unittest.cc',
436 'ime/composition_text_unittest.cc', 432 'ime/composition_text_unittest.cc',
437 'ime/extension_ime_util_unittest.cc', 433 'ime/extension_ime_util_unittest.cc',
438 'ime/ime_keyboard_x11_unittest.cc',
439 'ime/input_method_manager.h', 434 'ime/input_method_manager.h',
440 'ime/input_method_whitelist_unittest.cc', 435 'ime/input_method_whitelist_unittest.cc',
441 'login/auth/key_unittest.cc', 436 'login/auth/key_unittest.cc',
442 'login/login_state_unittest.cc', 437 'login/login_state_unittest.cc',
443 'network/auto_connect_handler_unittest.cc', 438 'network/auto_connect_handler_unittest.cc',
444 'network/client_cert_resolver_unittest.cc', 439 'network/client_cert_resolver_unittest.cc',
445 'network/geolocation_handler_unittest.cc', 440 'network/geolocation_handler_unittest.cc',
446 'network/host_resolver_impl_chromeos_unittest.cc', 441 'network/host_resolver_impl_chromeos_unittest.cc',
447 'network/managed_network_configuration_handler_unittest.cc', 442 'network/managed_network_configuration_handler_unittest.cc',
448 'network/network_cert_migrator_unittest.cc', 443 'network/network_cert_migrator_unittest.cc',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 'defines': [ 498 'defines': [
504 'CHROMEOS_IMPLEMENTATION', 499 'CHROMEOS_IMPLEMENTATION',
505 ], 500 ],
506 'sources': [ '<@(chromeos_sources)' ], 501 'sources': [ '<@(chromeos_sources)' ],
507 'conditions': [ 502 'conditions': [
508 ['use_x11 == 1', { 503 ['use_x11 == 1', {
509 'dependencies': [ 504 'dependencies': [
510 '../build/linux/system.gyp:x11', 505 '../build/linux/system.gyp:x11',
511 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 506 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
512 ], 507 ],
513 }, {
514 # use_x11 == 0
515 'sources!': [
516 'ime/keyboard_controller.cc',
517 'ime/ime_keyboard.h',
518 ],
519 }], 508 }],
520 ], 509 ],
521 }, 510 },
522 { 511 {
523 # GN version: //chromeos:test_support 512 # GN version: //chromeos:test_support
524 # This target contains mocks that can be used to write unit tests. 513 # This target contains mocks that can be used to write unit tests.
525 'target_name': 'chromeos_test_support', 514 'target_name': 'chromeos_test_support',
526 'type': 'static_library', 515 'type': 'static_library',
527 'dependencies': [ 516 'dependencies': [
528 '../build/linux/system.gyp:dbus', 517 '../build/linux/system.gyp:dbus',
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto', 686 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
698 ], 687 ],
699 'variables': { 688 'variables': {
700 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', 689 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
701 'proto_out_dir': 'chromeos/cryptohome', 690 'proto_out_dir': 'chromeos/cryptohome',
702 }, 691 },
703 'includes': ['../build/protoc.gypi'], 692 'includes': ['../build/protoc.gypi'],
704 }, 693 },
705 ], 694 ],
706 } 695 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698