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

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 all the unittests 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
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 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 'system/win/audio/tray_audio_delegate_win.cc', 517 'system/win/audio/tray_audio_delegate_win.cc',
518 'system/win/audio/tray_audio_delegate_win.h', 518 'system/win/audio/tray_audio_delegate_win.h',
519 'system/win/audio/tray_audio_win.cc', 519 'system/win/audio/tray_audio_win.cc',
520 'system/win/audio/tray_audio_win.h', 520 'system/win/audio/tray_audio_win.h',
521 'touch/touch_hud_debug.cc', 521 'touch/touch_hud_debug.cc',
522 'touch/touch_hud_debug.h', 522 'touch/touch_hud_debug.h',
523 'touch/touch_hud_projection.cc', 523 'touch/touch_hud_projection.cc',
524 'touch/touch_hud_projection.h', 524 'touch/touch_hud_projection.h',
525 'touch/touch_observer_hud.cc', 525 'touch/touch_observer_hud.cc',
526 'touch/touch_observer_hud.h', 526 'touch/touch_observer_hud.h',
527 'touch/touch_transformer_controller.cc',
528 'touch/touch_transformer_controller.h',
527 'touch/touch_uma.cc', 529 'touch/touch_uma.cc',
528 'touch/touch_uma.h', 530 'touch/touch_uma.h',
529 'volume_control_delegate.h', 531 'volume_control_delegate.h',
530 'wm/app_list_controller.cc', 532 'wm/app_list_controller.cc',
531 'wm/app_list_controller.h', 533 'wm/app_list_controller.h',
532 'wm/always_on_top_controller.cc', 534 'wm/always_on_top_controller.cc',
533 'wm/always_on_top_controller.h', 535 'wm/always_on_top_controller.h',
534 'wm/ash_native_cursor_manager.cc', 536 'wm/ash_native_cursor_manager.cc',
535 'wm/ash_native_cursor_manager.h', 537 'wm/ash_native_cursor_manager.h',
536 'wm/ash_focus_rules.cc', 538 'wm/ash_focus_rules.cc',
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 'msvs_disabled_warnings': [ 4267, ], 701 'msvs_disabled_warnings': [ 4267, ],
700 }], 702 }],
701 ['use_x11!=1', { 703 ['use_x11!=1', {
702 'sources/': [ 704 'sources/': [
703 ['exclude', 'accelerators/key_hold_detector.cc'], 705 ['exclude', 'accelerators/key_hold_detector.cc'],
704 ['exclude', 'accelerators/key_hold_detector.h'], 706 ['exclude', 'accelerators/key_hold_detector.h'],
705 ['exclude', 'accelerators/magnifier_key_scroller.cc'], 707 ['exclude', 'accelerators/magnifier_key_scroller.cc'],
706 ['exclude', 'accelerators/magnifier_key_scroller.h'], 708 ['exclude', 'accelerators/magnifier_key_scroller.h'],
707 ['exclude', 'accelerators/spoken_feedback_toggler.cc'], 709 ['exclude', 'accelerators/spoken_feedback_toggler.cc'],
708 ['exclude', 'accelerators/spoken_feedback_toggler.h'], 710 ['exclude', 'accelerators/spoken_feedback_toggler.h'],
711 ['exclude', 'touch/touch_transformer_controller.cc'],
712 ['exclude', 'touch/touch_transformer_controller.h'],
709 ], 713 ],
710 }, { # else: use_x11==1 714 }, { # else: use_x11==1
711 'dependencies': [ 715 'dependencies': [
712 '../build/linux/system.gyp:xfixes', 716 '../build/linux/system.gyp:xfixes',
713 ], 717 ],
714 }], 718 }],
715 ['chromeos==1', { 719 ['chromeos==1', {
716 'dependencies': [ 720 'dependencies': [
717 '../chromeos/chromeos.gyp:chromeos', 721 '../chromeos/chromeos.gyp:chromeos',
718 # Ash #includes power_supply_properties.pb.h directly. 722 # Ash #includes power_supply_properties.pb.h directly.
719 '../chromeos/chromeos.gyp:power_manager_proto', 723 '../chromeos/chromeos.gyp:power_manager_proto',
720 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 724 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
721 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 725 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
722 '../ui/display/display.gyp:display', 726 '../ui/display/display.gyp:display',
723 '../ui/display/display.gyp:display_util', 727 '../ui/display/display.gyp:display_util',
724 ], 728 ],
725 }, { # else: chromeos!=1 729 }, { # else: chromeos!=1
726 'sources/': [ 730 'sources/': [
727 ['exclude', 'display/display_configurator_animation.cc'], 731 ['exclude', 'display/display_configurator_animation.cc'],
728 ['exclude', 'display/display_configurator_animation.h'], 732 ['exclude', 'display/display_configurator_animation.h'],
729 ['exclude', 'display/resolution_notification_controller.cc'], 733 ['exclude', 'display/resolution_notification_controller.cc'],
730 ['exclude', 'display/resolution_notification_controller.h'], 734 ['exclude', 'display/resolution_notification_controller.h'],
735 ['exclude', 'touch/touch_transformer_controller.cc'],
736 ['exclude', 'touch/touch_transformer_controller.h'],
731 ], 737 ],
732 }], 738 }],
733 ], 739 ],
734 }, 740 },
735 { 741 {
736 'target_name': 'ash_with_content', 742 'target_name': 'ash_with_content',
737 'type': '<(component)', 743 'type': '<(component)',
738 'dependencies': [ 744 'dependencies': [
739 '../base/base.gyp:base', 745 '../base/base.gyp:base',
740 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 746 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 'system/date/date_view_unittest.cc', 994 'system/date/date_view_unittest.cc',
989 'system/overview/overview_button_tray_unittest.cc', 995 'system/overview/overview_button_tray_unittest.cc',
990 'system/tray/system_tray_unittest.cc', 996 'system/tray/system_tray_unittest.cc',
991 'system/tray/tray_details_view_unittest.cc', 997 'system/tray/tray_details_view_unittest.cc',
992 'system/user/tray_user_unittest.cc', 998 'system/user/tray_user_unittest.cc',
993 'system/web_notification/web_notification_tray_unittest.cc', 999 'system/web_notification/web_notification_tray_unittest.cc',
994 'test/ash_test_helper_unittest.cc', 1000 'test/ash_test_helper_unittest.cc',
995 'test/ash_unittests.cc', 1001 'test/ash_unittests.cc',
996 'tooltips/tooltip_controller_unittest.cc', 1002 'tooltips/tooltip_controller_unittest.cc',
997 'touch/touch_observer_hud_unittest.cc', 1003 'touch/touch_observer_hud_unittest.cc',
1004 'touch/touch_transformer_controller_unittest.cc',
998 'wm/app_list_controller_unittest.cc', 1005 'wm/app_list_controller_unittest.cc',
999 'wm/ash_native_cursor_manager_unittest.cc', 1006 'wm/ash_native_cursor_manager_unittest.cc',
1000 'wm/dock/docked_window_layout_manager_unittest.cc', 1007 'wm/dock/docked_window_layout_manager_unittest.cc',
1001 'wm/dock/docked_window_resizer_unittest.cc', 1008 'wm/dock/docked_window_resizer_unittest.cc',
1002 'wm/drag_window_resizer_unittest.cc', 1009 'wm/drag_window_resizer_unittest.cc',
1003 'wm/gestures/overview_gesture_handler_unittest.cc', 1010 'wm/gestures/overview_gesture_handler_unittest.cc',
1004 'wm/immersive_fullscreen_controller_unittest.cc', 1011 'wm/immersive_fullscreen_controller_unittest.cc',
1005 'wm/lock_state_controller_unittest.cc', 1012 'wm/lock_state_controller_unittest.cc',
1006 'wm/maximize_mode/accelerometer_test_data_literals.cc', 1013 'wm/maximize_mode/accelerometer_test_data_literals.cc',
1007 'wm/maximize_mode/maximize_mode_controller_unittest.cc', 1014 'wm/maximize_mode/maximize_mode_controller_unittest.cc',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 }], 1069 }],
1063 ['OS=="win" and win_use_allocator_shim==1', { 1070 ['OS=="win" and win_use_allocator_shim==1', {
1064 'dependencies': [ 1071 'dependencies': [
1065 '../base/allocator/allocator.gyp:allocator', 1072 '../base/allocator/allocator.gyp:allocator',
1066 ], 1073 ],
1067 }], 1074 }],
1068 ['use_x11!=1', { 1075 ['use_x11!=1', {
1069 'sources/': [ 1076 'sources/': [
1070 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], 1077 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
1071 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1078 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1079 ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
1072 ], 1080 ],
1073 }], 1081 }],
1074 ['chromeos==1', { 1082 ['chromeos==1', {
1075 'dependencies': [ 1083 'dependencies': [
1076 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', 1084 '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
1077 '../chromeos/chromeos.gyp:power_manager_proto', 1085 '../chromeos/chromeos.gyp:power_manager_proto',
1078 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1086 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1079 '../ui/display/display.gyp:display', 1087 '../ui/display/display.gyp:display',
1080 '../ui/display/display.gyp:display_test_util', 1088 '../ui/display/display.gyp:display_test_util',
1081 '../ui/display/display.gyp:display_types', 1089 '../ui/display/display.gyp:display_types',
1082 ], 1090 ],
1083 'sources': [ 1091 'sources': [
1084 'first_run/first_run_helper_unittest.cc', 1092 'first_run/first_run_helper_unittest.cc',
1085 ], 1093 ],
1086 }, { # else: chromeos!=1 1094 }, { # else: chromeos!=1
1087 'sources/': [ 1095 'sources/': [
1088 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1096 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1097 ['exclude', 'touch/touch_transformer_controller_unittest.cc'],
1089 ], 1098 ],
1090 }], 1099 }],
1091 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1100 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
1092 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none " and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a nd linux_use_tcmalloc==1))', { 1101 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none " and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a nd linux_use_tcmalloc==1))', {
1093 'dependencies': [ 1102 'dependencies': [
1094 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 1103 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1095 ], 1104 ],
1096 'link_settings': { 1105 'link_settings': {
1097 'ldflags': ['-rdynamic'], 1106 'ldflags': ['-rdynamic'],
1098 }, 1107 },
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 }], 1195 }],
1187 ['chromeos==1', { 1196 ['chromeos==1', {
1188 'dependencies': [ 1197 'dependencies': [
1189 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1198 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1190 ], 1199 ],
1191 }], 1200 }],
1192 ], 1201 ],
1193 }, 1202 },
1194 ], 1203 ],
1195 } 1204 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698