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

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: nit. Created 6 years 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 | « chromeos/DEPS ('k') | chromeos/ime/component_extension_ime_manager.h » ('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 # 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 'dbus/sms_client.cc', 245 'dbus/sms_client.cc',
246 'dbus/sms_client.h', 246 'dbus/sms_client.h',
247 'dbus/system_clock_client.cc', 247 'dbus/system_clock_client.cc',
248 'dbus/system_clock_client.h', 248 'dbus/system_clock_client.h',
249 'dbus/update_engine_client.cc', 249 'dbus/update_engine_client.cc',
250 'dbus/update_engine_client.h', 250 'dbus/update_engine_client.h',
251 'dbus/volume_state.cc', 251 'dbus/volume_state.cc',
252 'dbus/volume_state.h', 252 'dbus/volume_state.h',
253 'disks/disk_mount_manager.cc', 253 'disks/disk_mount_manager.cc',
254 'disks/disk_mount_manager.h', 254 'disks/disk_mount_manager.h',
255 'ime/component_extension_ime_manager.cc',
256 'ime/component_extension_ime_manager.h',
257 'ime/composition_text.cc',
258 'ime/composition_text.h',
259 'ime/extension_ime_util.cc',
260 'ime/extension_ime_util.h',
261 'ime/fake_ime_keyboard.cc',
262 'ime/fake_ime_keyboard.h',
263 'ime/ime_keyboard.cc',
264 'ime/ime_keyboard.h',
265 'ime/ime_keyboard_ozone.cc',
266 'ime/ime_keyboard_ozone.h',
267 'ime/ime_keyboard_x11.cc',
268 'ime/ime_keyboard_x11.h',
269 'ime/input_method_delegate.h',
270 'ime/input_method_descriptor.cc',
271 'ime/input_method_descriptor.h',
272 'ime/input_method_manager.cc',
273 'ime/input_method_manager.h',
274 'ime/input_method_whitelist.cc',
275 'ime/input_method_whitelist.h',
276 'login/auth/auth_attempt_state.cc', 255 'login/auth/auth_attempt_state.cc',
277 'login/auth/auth_attempt_state.h', 256 'login/auth/auth_attempt_state.h',
278 'login/auth/auth_attempt_state_resolver.cc', 257 'login/auth/auth_attempt_state_resolver.cc',
279 'login/auth/auth_attempt_state_resolver.h', 258 'login/auth/auth_attempt_state_resolver.h',
280 'login/auth/auth_status_consumer.cc', 259 'login/auth/auth_status_consumer.cc',
281 'login/auth/auth_status_consumer.h', 260 'login/auth/auth_status_consumer.h',
282 'login/auth/authenticator.cc', 261 'login/auth/authenticator.cc',
283 'login/auth/authenticator.h', 262 'login/auth/authenticator.h',
284 'login/auth/cryptohome_authenticator.cc', 263 'login/auth/cryptohome_authenticator.cc',
285 'login/auth/cryptohome_authenticator.h', 264 'login/auth/cryptohome_authenticator.h',
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 'dbus/services/proxy_resolution_service_provider_unittest.cc', 425 'dbus/services/proxy_resolution_service_provider_unittest.cc',
447 'dbus/shill_client_unittest_base.cc', 426 'dbus/shill_client_unittest_base.cc',
448 'dbus/shill_client_unittest_base.h', 427 'dbus/shill_client_unittest_base.h',
449 'dbus/shill_device_client_unittest.cc', 428 'dbus/shill_device_client_unittest.cc',
450 'dbus/shill_ipconfig_client_unittest.cc', 429 'dbus/shill_ipconfig_client_unittest.cc',
451 'dbus/shill_manager_client_unittest.cc', 430 'dbus/shill_manager_client_unittest.cc',
452 'dbus/shill_profile_client_unittest.cc', 431 'dbus/shill_profile_client_unittest.cc',
453 'dbus/shill_service_client_unittest.cc', 432 'dbus/shill_service_client_unittest.cc',
454 'dbus/shill_third_party_vpn_driver_client_unittest.cc', 433 'dbus/shill_third_party_vpn_driver_client_unittest.cc',
455 'disks/disk_mount_manager_unittest.cc', 434 'disks/disk_mount_manager_unittest.cc',
456 'ime/component_extension_ime_manager_unittest.cc',
457 'ime/composition_text_unittest.cc',
458 'ime/extension_ime_util_unittest.cc',
459 'ime/ime_keyboard_x11_unittest.cc',
460 'ime/input_method_manager.h',
461 'ime/input_method_whitelist_unittest.cc',
462 'login/auth/key_unittest.cc', 435 'login/auth/key_unittest.cc',
463 'login/login_state_unittest.cc', 436 'login/login_state_unittest.cc',
464 'network/auto_connect_handler_unittest.cc', 437 'network/auto_connect_handler_unittest.cc',
465 'network/client_cert_resolver_unittest.cc', 438 'network/client_cert_resolver_unittest.cc',
466 'network/geolocation_handler_unittest.cc', 439 'network/geolocation_handler_unittest.cc',
467 'network/host_resolver_impl_chromeos_unittest.cc', 440 'network/host_resolver_impl_chromeos_unittest.cc',
468 'network/managed_network_configuration_handler_unittest.cc', 441 'network/managed_network_configuration_handler_unittest.cc',
469 'network/network_cert_migrator_unittest.cc', 442 'network/network_cert_migrator_unittest.cc',
470 'network/network_change_notifier_chromeos_unittest.cc', 443 'network/network_change_notifier_chromeos_unittest.cc',
471 'network/network_configuration_handler_unittest.cc', 444 'network/network_configuration_handler_unittest.cc',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer', 491 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer',
519 '../url/url.gyp:url_lib', 492 '../url/url.gyp:url_lib',
520 'cryptohome_proto', 493 'cryptohome_proto',
521 'ime/input_method.gyp:gencode', 494 'ime/input_method.gyp:gencode',
522 'power_manager_proto', 495 'power_manager_proto',
523 ], 496 ],
524 'defines': [ 497 'defines': [
525 'CHROMEOS_IMPLEMENTATION', 498 'CHROMEOS_IMPLEMENTATION',
526 ], 499 ],
527 'sources': [ '<@(chromeos_sources)' ], 500 'sources': [ '<@(chromeos_sources)' ],
528 'conditions': [
529 ['use_x11 == 1', {
530 'dependencies': [
531 '../build/linux/system.gyp:x11',
532 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
533 ],
534 }, {
535 # use_x11 == 0
536 'sources!': [
537 'ime/keyboard_controller.cc',
538 'ime/ime_keyboard.h',
539 ],
540 }],
541 ],
542 }, 501 },
543 { 502 {
544 # GN version: //chromeos:test_support 503 # GN version: //chromeos:test_support
545 # This target contains mocks that can be used to write unit tests. 504 # This target contains mocks that can be used to write unit tests.
546 'target_name': 'chromeos_test_support', 505 'target_name': 'chromeos_test_support',
547 'type': 'static_library', 506 'type': 'static_library',
548 'dependencies': [ 507 'dependencies': [
549 '../build/linux/system.gyp:dbus', 508 '../build/linux/system.gyp:dbus',
550 '../testing/gmock.gyp:gmock', 509 '../testing/gmock.gyp:gmock',
551 'chromeos', 510 'chromeos',
(...skipping 20 matching lines...) Expand all
572 'dbus/mock_shill_manager_client.cc', 531 'dbus/mock_shill_manager_client.cc',
573 'dbus/mock_shill_manager_client.h', 532 'dbus/mock_shill_manager_client.h',
574 'dbus/mock_shill_profile_client.cc', 533 'dbus/mock_shill_profile_client.cc',
575 'dbus/mock_shill_profile_client.h', 534 'dbus/mock_shill_profile_client.h',
576 'dbus/mock_shill_service_client.cc', 535 'dbus/mock_shill_service_client.cc',
577 'dbus/mock_shill_service_client.h', 536 'dbus/mock_shill_service_client.h',
578 'dbus/services/service_provider_test_helper.cc', 537 'dbus/services/service_provider_test_helper.cc',
579 'dbus/services/service_provider_test_helper.h', 538 'dbus/services/service_provider_test_helper.h',
580 'disks/mock_disk_mount_manager.cc', 539 'disks/mock_disk_mount_manager.cc',
581 'disks/mock_disk_mount_manager.h', 540 'disks/mock_disk_mount_manager.h',
582 'ime/mock_component_extension_ime_manager_delegate.cc',
583 'ime/mock_component_extension_ime_manager_delegate.h',
584 'login/auth/fake_extended_authenticator.cc', 541 'login/auth/fake_extended_authenticator.cc',
585 'login/auth/fake_extended_authenticator.h', 542 'login/auth/fake_extended_authenticator.h',
586 'login/auth/mock_auth_attempt_state_resolver.cc', 543 'login/auth/mock_auth_attempt_state_resolver.cc',
587 'login/auth/mock_auth_attempt_state_resolver.h', 544 'login/auth/mock_auth_attempt_state_resolver.h',
588 'login/auth/mock_auth_status_consumer.cc', 545 'login/auth/mock_auth_status_consumer.cc',
589 'login/auth/mock_auth_status_consumer.h', 546 'login/auth/mock_auth_status_consumer.h',
590 'login/auth/mock_authenticator.cc', 547 'login/auth/mock_authenticator.cc',
591 'login/auth/mock_authenticator.h', 548 'login/auth/mock_authenticator.h',
592 'login/auth/mock_url_fetchers.cc', 549 'login/auth/mock_url_fetchers.cc',
593 'login/auth/mock_url_fetchers.h', 550 'login/auth/mock_url_fetchers.h',
(...skipping 29 matching lines...) Expand all
623 # If you edit the file list of this target, please edit BUILD.gn as well. 580 # If you edit the file list of this target, please edit BUILD.gn as well.
624 'sources': [ 581 'sources': [
625 'dbus/fake_power_manager_client.cc', 582 'dbus/fake_power_manager_client.cc',
626 'dbus/fake_power_manager_client.h', 583 'dbus/fake_power_manager_client.h',
627 'dbus/fake_session_manager_client.cc', 584 'dbus/fake_session_manager_client.cc',
628 'dbus/fake_session_manager_client.h', 585 'dbus/fake_session_manager_client.h',
629 'dbus/fake_shill_manager_client.cc', 586 'dbus/fake_shill_manager_client.cc',
630 'dbus/fake_shill_manager_client.h', 587 'dbus/fake_shill_manager_client.h',
631 'dbus/fake_update_engine_client.cc', 588 'dbus/fake_update_engine_client.cc',
632 'dbus/fake_update_engine_client.h', 589 'dbus/fake_update_engine_client.h',
633 'ime/fake_input_method_delegate.cc',
634 'ime/fake_input_method_delegate.h',
635 ], 590 ],
636 'include_dirs': [ 591 'include_dirs': [
637 '..', 592 '..',
638 ], 593 ],
639 }, 594 },
640 { 595 {
641 # GN version: //chromeos:chromeos_unittests 596 # GN version: //chromeos:chromeos_unittests
642 'target_name': 'chromeos_unittests', 597 'target_name': 'chromeos_unittests',
643 'type': 'executable', 598 'type': 'executable',
644 'dependencies': [ 599 'dependencies': [
(...skipping 19 matching lines...) Expand all
664 'include_dirs': [ 619 'include_dirs': [
665 '..', 620 '..',
666 ], 621 ],
667 'conditions': [ 622 'conditions': [
668 [ 'use_allocator!="none"', { 623 [ 'use_allocator!="none"', {
669 'dependencies': [ 624 'dependencies': [
670 '../base/allocator/allocator.gyp:allocator', 625 '../base/allocator/allocator.gyp:allocator',
671 ], 626 ],
672 }, 627 },
673 ], 628 ],
674 ['use_x11 == 1', {
675 'dependencies': [
676 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
677 ],
678 }]
679 ], 629 ],
680 }, 630 },
681 { 631 {
682 # GN version: //chromeos:power_manager_proto 632 # GN version: //chromeos:power_manager_proto
683 # Protobuf compiler/generator for power-manager related protocol buffers. 633 # Protobuf compiler/generator for power-manager related protocol buffers.
684 'target_name': 'power_manager_proto', 634 'target_name': 'power_manager_proto',
685 'type': 'static_library', 635 'type': 'static_library',
686 'sources': [ 636 'sources': [
687 '../third_party/cros_system_api/dbus/power_manager/input_event.proto', 637 '../third_party/cros_system_api/dbus/power_manager/input_event.proto',
688 '../third_party/cros_system_api/dbus/power_manager/peripheral_battery_st atus.proto', 638 '../third_party/cros_system_api/dbus/power_manager/peripheral_battery_st atus.proto',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto', 670 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
721 ], 671 ],
722 'variables': { 672 'variables': {
723 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', 673 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
724 'proto_out_dir': 'chromeos/cryptohome', 674 'proto_out_dir': 'chromeos/cryptohome',
725 }, 675 },
726 'includes': ['../build/protoc.gypi'], 676 'includes': ['../build/protoc.gypi'],
727 }, 677 },
728 ], 678 ],
729 } 679 }
OLDNEW
« no previous file with comments | « chromeos/DEPS ('k') | chromeos/ime/component_extension_ime_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698