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

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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 'dbus/sms_client.cc', 227 'dbus/sms_client.cc',
228 'dbus/sms_client.h', 228 'dbus/sms_client.h',
229 'dbus/system_clock_client.cc', 229 'dbus/system_clock_client.cc',
230 'dbus/system_clock_client.h', 230 'dbus/system_clock_client.h',
231 'dbus/update_engine_client.cc', 231 'dbus/update_engine_client.cc',
232 'dbus/update_engine_client.h', 232 'dbus/update_engine_client.h',
233 'dbus/volume_state.cc', 233 'dbus/volume_state.cc',
234 'dbus/volume_state.h', 234 'dbus/volume_state.h',
235 'disks/disk_mount_manager.cc', 235 'disks/disk_mount_manager.cc',
236 'disks/disk_mount_manager.h', 236 'disks/disk_mount_manager.h',
237 'ime/component_extension_ime_manager.cc',
238 'ime/component_extension_ime_manager.h',
239 'ime/composition_text.cc',
240 'ime/composition_text.h',
241 'ime/extension_ime_util.cc',
242 'ime/extension_ime_util.h',
243 'ime/fake_ime_keyboard.cc',
244 'ime/fake_ime_keyboard.h',
245 'ime/ime_keyboard.cc',
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',
252 'ime/input_method_descriptor.cc',
253 'ime/input_method_descriptor.h',
254 'ime/input_method_manager.cc',
255 'ime/input_method_manager.h',
256 'ime/input_method_whitelist.cc',
257 'ime/input_method_whitelist.h',
258 'login/auth/auth_attempt_state.cc', 237 'login/auth/auth_attempt_state.cc',
259 'login/auth/auth_attempt_state.h', 238 'login/auth/auth_attempt_state.h',
260 'login/auth/auth_attempt_state_resolver.cc', 239 'login/auth/auth_attempt_state_resolver.cc',
261 'login/auth/auth_attempt_state_resolver.h', 240 'login/auth/auth_attempt_state_resolver.h',
262 'login/auth/auth_status_consumer.cc', 241 'login/auth/auth_status_consumer.cc',
263 'login/auth/auth_status_consumer.h', 242 'login/auth/auth_status_consumer.h',
264 'login/auth/authenticator.cc', 243 'login/auth/authenticator.cc',
265 'login/auth/authenticator.h', 244 'login/auth/authenticator.h',
266 'login/auth/cryptohome_authenticator.cc', 245 'login/auth/cryptohome_authenticator.cc',
267 'login/auth/cryptohome_authenticator.h', 246 'login/auth/cryptohome_authenticator.h',
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 'dbus/power_policy_controller_unittest.cc', 404 'dbus/power_policy_controller_unittest.cc',
426 'dbus/shill_client_unittest_base.cc', 405 'dbus/shill_client_unittest_base.cc',
427 'dbus/shill_client_unittest_base.h', 406 'dbus/shill_client_unittest_base.h',
428 'dbus/shill_device_client_unittest.cc', 407 'dbus/shill_device_client_unittest.cc',
429 'dbus/shill_ipconfig_client_unittest.cc', 408 'dbus/shill_ipconfig_client_unittest.cc',
430 'dbus/shill_manager_client_unittest.cc', 409 'dbus/shill_manager_client_unittest.cc',
431 'dbus/shill_profile_client_unittest.cc', 410 'dbus/shill_profile_client_unittest.cc',
432 'dbus/shill_service_client_unittest.cc', 411 'dbus/shill_service_client_unittest.cc',
433 'dbus/shill_third_party_vpn_driver_client_unittest.cc', 412 'dbus/shill_third_party_vpn_driver_client_unittest.cc',
434 'disks/disk_mount_manager_unittest.cc', 413 'disks/disk_mount_manager_unittest.cc',
435 'ime/component_extension_ime_manager_unittest.cc',
436 'ime/composition_text_unittest.cc',
437 'ime/extension_ime_util_unittest.cc',
438 'ime/ime_keyboard_x11_unittest.cc',
439 'ime/input_method_manager.h',
440 'ime/input_method_whitelist_unittest.cc',
441 'login/auth/key_unittest.cc', 414 'login/auth/key_unittest.cc',
442 'login/login_state_unittest.cc', 415 'login/login_state_unittest.cc',
443 'network/auto_connect_handler_unittest.cc', 416 'network/auto_connect_handler_unittest.cc',
444 'network/client_cert_resolver_unittest.cc', 417 'network/client_cert_resolver_unittest.cc',
445 'network/geolocation_handler_unittest.cc', 418 'network/geolocation_handler_unittest.cc',
446 'network/host_resolver_impl_chromeos_unittest.cc', 419 'network/host_resolver_impl_chromeos_unittest.cc',
447 'network/managed_network_configuration_handler_unittest.cc', 420 'network/managed_network_configuration_handler_unittest.cc',
448 'network/network_cert_migrator_unittest.cc', 421 'network/network_cert_migrator_unittest.cc',
449 'network/network_change_notifier_chromeos_unittest.cc', 422 'network/network_change_notifier_chromeos_unittest.cc',
450 'network/network_configuration_handler_unittest.cc', 423 'network/network_configuration_handler_unittest.cc',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 'power_manager_proto', 474 'power_manager_proto',
502 ], 475 ],
503 'defines': [ 476 'defines': [
504 'CHROMEOS_IMPLEMENTATION', 477 'CHROMEOS_IMPLEMENTATION',
505 ], 478 ],
506 'sources': [ '<@(chromeos_sources)' ], 479 'sources': [ '<@(chromeos_sources)' ],
507 'conditions': [ 480 'conditions': [
508 ['use_x11 == 1', { 481 ['use_x11 == 1', {
509 'dependencies': [ 482 'dependencies': [
510 '../build/linux/system.gyp:x11', 483 '../build/linux/system.gyp:x11',
511 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 484 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
Yuki 2014/11/19 14:16:43 Do we still need these lines?
Shu Chen 2014/11/19 16:40:53 Done.
512 ], 485 ],
513 }, {
514 # use_x11 == 0
515 'sources!': [
516 'ime/keyboard_controller.cc',
517 'ime/ime_keyboard.h',
518 ],
519 }], 486 }],
520 ], 487 ],
521 }, 488 },
522 { 489 {
523 # GN version: //chromeos:test_support 490 # GN version: //chromeos:test_support
524 # This target contains mocks that can be used to write unit tests. 491 # This target contains mocks that can be used to write unit tests.
525 'target_name': 'chromeos_test_support', 492 'target_name': 'chromeos_test_support',
526 'type': 'static_library', 493 'type': 'static_library',
527 'dependencies': [ 494 'dependencies': [
528 '../build/linux/system.gyp:dbus', 495 '../build/linux/system.gyp:dbus',
(...skipping 20 matching lines...) Expand all
549 'dbus/mock_session_manager_client.cc', 516 'dbus/mock_session_manager_client.cc',
550 'dbus/mock_session_manager_client.h', 517 'dbus/mock_session_manager_client.h',
551 'dbus/mock_shill_manager_client.cc', 518 'dbus/mock_shill_manager_client.cc',
552 'dbus/mock_shill_manager_client.h', 519 'dbus/mock_shill_manager_client.h',
553 'dbus/mock_shill_profile_client.cc', 520 'dbus/mock_shill_profile_client.cc',
554 'dbus/mock_shill_profile_client.h', 521 'dbus/mock_shill_profile_client.h',
555 'dbus/mock_shill_service_client.cc', 522 'dbus/mock_shill_service_client.cc',
556 'dbus/mock_shill_service_client.h', 523 'dbus/mock_shill_service_client.h',
557 'disks/mock_disk_mount_manager.cc', 524 'disks/mock_disk_mount_manager.cc',
558 'disks/mock_disk_mount_manager.h', 525 'disks/mock_disk_mount_manager.h',
559 'ime/mock_component_extension_ime_manager_delegate.cc',
560 'ime/mock_component_extension_ime_manager_delegate.h',
561 'login/auth/fake_extended_authenticator.cc', 526 'login/auth/fake_extended_authenticator.cc',
562 'login/auth/fake_extended_authenticator.h', 527 'login/auth/fake_extended_authenticator.h',
563 'login/auth/mock_auth_attempt_state_resolver.cc', 528 'login/auth/mock_auth_attempt_state_resolver.cc',
564 'login/auth/mock_auth_attempt_state_resolver.h', 529 'login/auth/mock_auth_attempt_state_resolver.h',
565 'login/auth/mock_auth_status_consumer.cc', 530 'login/auth/mock_auth_status_consumer.cc',
566 'login/auth/mock_auth_status_consumer.h', 531 'login/auth/mock_auth_status_consumer.h',
567 'login/auth/mock_authenticator.cc', 532 'login/auth/mock_authenticator.cc',
568 'login/auth/mock_authenticator.h', 533 'login/auth/mock_authenticator.h',
569 'login/auth/mock_url_fetchers.cc', 534 'login/auth/mock_url_fetchers.cc',
570 'login/auth/mock_url_fetchers.h', 535 'login/auth/mock_url_fetchers.h',
(...skipping 29 matching lines...) Expand all
600 # If you edit the file list of this target, please edit BUILD.gn as well. 565 # If you edit the file list of this target, please edit BUILD.gn as well.
601 'sources': [ 566 'sources': [
602 'dbus/fake_power_manager_client.cc', 567 'dbus/fake_power_manager_client.cc',
603 'dbus/fake_power_manager_client.h', 568 'dbus/fake_power_manager_client.h',
604 'dbus/fake_session_manager_client.cc', 569 'dbus/fake_session_manager_client.cc',
605 'dbus/fake_session_manager_client.h', 570 'dbus/fake_session_manager_client.h',
606 'dbus/fake_shill_manager_client.cc', 571 'dbus/fake_shill_manager_client.cc',
607 'dbus/fake_shill_manager_client.h', 572 'dbus/fake_shill_manager_client.h',
608 'dbus/fake_update_engine_client.cc', 573 'dbus/fake_update_engine_client.cc',
609 'dbus/fake_update_engine_client.h', 574 'dbus/fake_update_engine_client.h',
610 'ime/fake_input_method_delegate.cc',
611 'ime/fake_input_method_delegate.h',
612 ], 575 ],
613 'include_dirs': [ 576 'include_dirs': [
614 '..', 577 '..',
615 ], 578 ],
616 }, 579 },
617 { 580 {
618 # GN version: //chromeos:chromeos_unittests 581 # GN version: //chromeos:chromeos_unittests
619 'target_name': 'chromeos_unittests', 582 'target_name': 'chromeos_unittests',
620 'type': 'executable', 583 'type': 'executable',
621 'dependencies': [ 584 'dependencies': [
(...skipping 21 matching lines...) Expand all
643 ], 606 ],
644 'conditions': [ 607 'conditions': [
645 [ 'use_allocator!="none"', { 608 [ 'use_allocator!="none"', {
646 'dependencies': [ 609 'dependencies': [
647 '../base/allocator/allocator.gyp:allocator', 610 '../base/allocator/allocator.gyp:allocator',
648 ], 611 ],
649 }, 612 },
650 ], 613 ],
651 ['use_x11 == 1', { 614 ['use_x11 == 1', {
652 'dependencies': [ 615 'dependencies': [
653 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 616 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
Yuki 2014/11/19 14:16:43 Can we remove these lines?
Shu Chen 2014/11/19 16:40:53 Done.
654 ], 617 ],
655 }] 618 }]
656 ], 619 ],
657 }, 620 },
658 { 621 {
659 # GN version: //chromeos:power_manager_proto 622 # GN version: //chromeos:power_manager_proto
660 # Protobuf compiler/generator for power-manager related protocol buffers. 623 # Protobuf compiler/generator for power-manager related protocol buffers.
661 'target_name': 'power_manager_proto', 624 'target_name': 'power_manager_proto',
662 'type': 'static_library', 625 'type': 'static_library',
663 'sources': [ 626 'sources': [
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto', 660 '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
698 ], 661 ],
699 'variables': { 662 'variables': {
700 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', 663 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
701 'proto_out_dir': 'chromeos/cryptohome', 664 'proto_out_dir': 'chromeos/cryptohome',
702 }, 665 },
703 'includes': ['../build/protoc.gypi'], 666 'includes': ['../build/protoc.gypi'],
704 }, 667 },
705 ], 668 ],
706 } 669 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698