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

Side by Side Diff: ash/ash.gyp

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix events/BUILD.gn Created 6 years, 7 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 | « ash/DEPS ('k') | ash/display/display_change_observer_chromeos.cc » ('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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 'system/win/audio/tray_audio_delegate_win.cc', 512 'system/win/audio/tray_audio_delegate_win.cc',
513 'system/win/audio/tray_audio_delegate_win.h', 513 'system/win/audio/tray_audio_delegate_win.h',
514 'system/win/audio/tray_audio_win.cc', 514 'system/win/audio/tray_audio_win.cc',
515 'system/win/audio/tray_audio_win.h', 515 'system/win/audio/tray_audio_win.h',
516 'touch/touch_hud_debug.cc', 516 'touch/touch_hud_debug.cc',
517 'touch/touch_hud_debug.h', 517 'touch/touch_hud_debug.h',
518 'touch/touch_hud_projection.cc', 518 'touch/touch_hud_projection.cc',
519 'touch/touch_hud_projection.h', 519 'touch/touch_hud_projection.h',
520 'touch/touch_observer_hud.cc', 520 'touch/touch_observer_hud.cc',
521 'touch/touch_observer_hud.h', 521 'touch/touch_observer_hud.h',
522 'touch/touch_transformer_controller.cc',
523 'touch/touch_transformer_controller.h',
522 'touch/touch_uma.cc', 524 'touch/touch_uma.cc',
523 'touch/touch_uma.h', 525 'touch/touch_uma.h',
524 'volume_control_delegate.h', 526 'volume_control_delegate.h',
525 'wm/app_list_controller.cc', 527 'wm/app_list_controller.cc',
526 'wm/app_list_controller.h', 528 'wm/app_list_controller.h',
527 'wm/always_on_top_controller.cc', 529 'wm/always_on_top_controller.cc',
528 'wm/always_on_top_controller.h', 530 'wm/always_on_top_controller.h',
529 'wm/ash_native_cursor_manager.cc', 531 'wm/ash_native_cursor_manager.cc',
530 'wm/ash_native_cursor_manager.h', 532 'wm/ash_native_cursor_manager.h',
531 'wm/ash_focus_rules.cc', 533 'wm/ash_focus_rules.cc',
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 'msvs_disabled_warnings': [ 4267, ], 695 'msvs_disabled_warnings': [ 4267, ],
694 }], 696 }],
695 ['use_x11!=1', { 697 ['use_x11!=1', {
696 'sources/': [ 698 'sources/': [
697 ['exclude', 'accelerators/key_hold_detector.cc'], 699 ['exclude', 'accelerators/key_hold_detector.cc'],
698 ['exclude', 'accelerators/key_hold_detector.h'], 700 ['exclude', 'accelerators/key_hold_detector.h'],
699 ['exclude', 'accelerators/magnifier_key_scroller.cc'], 701 ['exclude', 'accelerators/magnifier_key_scroller.cc'],
700 ['exclude', 'accelerators/magnifier_key_scroller.h'], 702 ['exclude', 'accelerators/magnifier_key_scroller.h'],
701 ['exclude', 'accelerators/spoken_feedback_toggler.cc'], 703 ['exclude', 'accelerators/spoken_feedback_toggler.cc'],
702 ['exclude', 'accelerators/spoken_feedback_toggler.h'], 704 ['exclude', 'accelerators/spoken_feedback_toggler.h'],
705 ['exclude', 'touch/touch_transformer_controller.cc'],
706 ['exclude', 'touch/touch_transformer_controller.h'],
703 ], 707 ],
704 }, { # else: use_x11==1 708 }, { # else: use_x11==1
705 'dependencies': [ 709 'dependencies': [
706 '../build/linux/system.gyp:xfixes', 710 '../build/linux/system.gyp:xfixes',
707 ], 711 ],
708 }], 712 }],
709 ['chromeos==1', { 713 ['chromeos==1', {
710 'dependencies': [ 714 'dependencies': [
711 '../chromeos/chromeos.gyp:chromeos', 715 '../chromeos/chromeos.gyp:chromeos',
712 # Ash #includes power_supply_properties.pb.h directly. 716 # Ash #includes power_supply_properties.pb.h directly.
713 '../chromeos/chromeos.gyp:power_manager_proto', 717 '../chromeos/chromeos.gyp:power_manager_proto',
714 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 718 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
715 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 719 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
716 '../ui/display/display.gyp:display', 720 '../ui/display/display.gyp:display',
717 '../ui/display/display.gyp:display_util', 721 '../ui/display/display.gyp:display_util',
718 ], 722 ],
719 }, { # else: chromeos!=1 723 }, { # else: chromeos!=1
720 'sources/': [ 724 'sources/': [
721 ['exclude', 'display/display_configurator_animation.cc'], 725 ['exclude', 'display/display_configurator_animation.cc'],
722 ['exclude', 'display/display_configurator_animation.h'], 726 ['exclude', 'display/display_configurator_animation.h'],
723 ['exclude', 'display/resolution_notification_controller.cc'], 727 ['exclude', 'display/resolution_notification_controller.cc'],
724 ['exclude', 'display/resolution_notification_controller.h'], 728 ['exclude', 'display/resolution_notification_controller.h'],
725 ['exclude', 'system/tray/media_security/media_capture_observer.h'], 729 ['exclude', 'system/tray/media_security/media_capture_observer.h'],
726 ['exclude', 'system/tray/media_security/multi_profile_media_tray_ite m.cc'], 730 ['exclude', 'system/tray/media_security/multi_profile_media_tray_ite m.cc'],
727 ['exclude', 'system/tray/media_security/multi_profile_media_tray_ite m.h'], 731 ['exclude', 'system/tray/media_security/multi_profile_media_tray_ite m.h'],
732 ['exclude', 'touch/touch_transformer_controller.cc'],
733 ['exclude', 'touch/touch_transformer_controller.h'],
728 ], 734 ],
729 }], 735 }],
730 ], 736 ],
731 }, 737 },
732 { 738 {
733 'target_name': 'ash_with_content', 739 'target_name': 'ash_with_content',
734 'type': '<(component)', 740 'type': '<(component)',
735 'dependencies': [ 741 'dependencies': [
736 '../base/base.gyp:base', 742 '../base/base.gyp:base',
737 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 743 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
963 'system/overview/overview_button_tray_unittest.cc', 969 'system/overview/overview_button_tray_unittest.cc',
964 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc', 970 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
965 'system/tray/system_tray_unittest.cc', 971 'system/tray/system_tray_unittest.cc',
966 'system/tray/tray_details_view_unittest.cc', 972 'system/tray/tray_details_view_unittest.cc',
967 'system/user/tray_user_unittest.cc', 973 'system/user/tray_user_unittest.cc',
968 'system/web_notification/web_notification_tray_unittest.cc', 974 'system/web_notification/web_notification_tray_unittest.cc',
969 'test/ash_test_helper_unittest.cc', 975 'test/ash_test_helper_unittest.cc',
970 'test/ash_unittests.cc', 976 'test/ash_unittests.cc',
971 'tooltips/tooltip_controller_unittest.cc', 977 'tooltips/tooltip_controller_unittest.cc',
972 'touch/touch_observer_hud_unittest.cc', 978 'touch/touch_observer_hud_unittest.cc',
979 'touch/touch_transformer_controller_unittest.cc',
973 'wm/app_list_controller_unittest.cc', 980 'wm/app_list_controller_unittest.cc',
974 'wm/ash_native_cursor_manager_unittest.cc', 981 'wm/ash_native_cursor_manager_unittest.cc',
975 'wm/dock/docked_window_layout_manager_unittest.cc', 982 'wm/dock/docked_window_layout_manager_unittest.cc',
976 'wm/dock/docked_window_resizer_unittest.cc', 983 'wm/dock/docked_window_resizer_unittest.cc',
977 'wm/drag_window_resizer_unittest.cc', 984 'wm/drag_window_resizer_unittest.cc',
978 'wm/gestures/overview_gesture_handler_unittest.cc', 985 'wm/gestures/overview_gesture_handler_unittest.cc',
979 'wm/immersive_fullscreen_controller_unittest.cc', 986 'wm/immersive_fullscreen_controller_unittest.cc',
980 'wm/lock_state_controller_unittest.cc', 987 'wm/lock_state_controller_unittest.cc',
981 'wm/maximize_mode/accelerometer_test_data_literals.cc', 988 'wm/maximize_mode/accelerometer_test_data_literals.cc',
982 'wm/maximize_mode/maximize_mode_controller_unittest.cc', 989 'wm/maximize_mode/maximize_mode_controller_unittest.cc',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 }], 1044 }],
1038 ['OS=="win" and win_use_allocator_shim==1', { 1045 ['OS=="win" and win_use_allocator_shim==1', {
1039 'dependencies': [ 1046 'dependencies': [
1040 '../base/allocator/allocator.gyp:allocator', 1047 '../base/allocator/allocator.gyp:allocator',
1041 ], 1048 ],
1042 }], 1049 }],
1043 ['use_x11!=1', { 1050 ['use_x11!=1', {
1044 'sources/': [ 1051 'sources/': [
1045 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], 1052 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
1046 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1053 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1054 ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
1047 ], 1055 ],
1048 }], 1056 }],
1049 ['chromeos==1', { 1057 ['chromeos==1', {
1050 'dependencies': [ 1058 'dependencies': [
1051 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', 1059 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
1052 '../chromeos/chromeos.gyp:power_manager_proto', 1060 '../chromeos/chromeos.gyp:power_manager_proto',
1053 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1061 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1054 '../ui/display/display.gyp:display', 1062 '../ui/display/display.gyp:display',
1055 '../ui/display/display.gyp:display_test_util', 1063 '../ui/display/display.gyp:display_test_util',
1056 '../ui/display/display.gyp:display_types', 1064 '../ui/display/display.gyp:display_types',
1057 ], 1065 ],
1058 'sources': [ 1066 'sources': [
1059 'first_run/first_run_helper_unittest.cc', 1067 'first_run/first_run_helper_unittest.cc',
1060 ], 1068 ],
1061 }, { # else: chromeos!=1 1069 }, { # else: chromeos!=1
1062 'sources/': [ 1070 'sources/': [
1063 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1071 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1072 ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
1064 ], 1073 ],
1065 }], 1074 }],
1066 ['OS=="linux" and component=="shared_library" and use_allocator!="none"' , { 1075 ['OS=="linux" and component=="shared_library" and use_allocator!="none"' , {
1067 'dependencies': [ 1076 'dependencies': [
1068 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 1077 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1069 ], 1078 ],
1070 'link_settings': { 1079 'link_settings': {
1071 'ldflags': ['-rdynamic'], 1080 'ldflags': ['-rdynamic'],
1072 }, 1081 },
1073 }], 1082 }],
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 'ash_shell_lib', 1194 'ash_shell_lib',
1186 'ash_test_support', 1195 'ash_test_support',
1187 ], 1196 ],
1188 'sources': [ 1197 'sources': [
1189 'shell/window_watcher_unittest.cc', 1198 'shell/window_watcher_unittest.cc',
1190 'test/ash_unittests.cc', 1199 'test/ash_unittests.cc',
1191 ], 1200 ],
1192 }, 1201 },
1193 ], 1202 ],
1194 } 1203 }
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/display/display_change_observer_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698