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

Side by Side Diff: ash/ash.gyp

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: fix ozone 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
« no previous file with comments | « ash/BUILD.gn ('k') | ash/display/display_change_observer_chromeos.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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 # These files lists are shared with the GN build. 9 # These files lists are shared with the GN build.
10 'ash_sources': [ 10 'ash_sources': [
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 '../net/net.gyp:net', 904 '../net/net.gyp:net',
905 '../skia/skia.gyp:skia', 905 '../skia/skia.gyp:skia',
906 '../third_party/icu/icu.gyp:icui18n', 906 '../third_party/icu/icu.gyp:icui18n',
907 '../third_party/icu/icu.gyp:icuuc', 907 '../third_party/icu/icu.gyp:icuuc',
908 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer', 908 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer',
909 '../ui/accessibility/accessibility.gyp:accessibility', 909 '../ui/accessibility/accessibility.gyp:accessibility',
910 '../ui/app_list/app_list.gyp:app_list', 910 '../ui/app_list/app_list.gyp:app_list',
911 '../ui/aura/aura.gyp:aura', 911 '../ui/aura/aura.gyp:aura',
912 '../ui/base/ui_base.gyp:ui_base', 912 '../ui/base/ui_base.gyp:ui_base',
913 '../ui/compositor/compositor.gyp:compositor', 913 '../ui/compositor/compositor.gyp:compositor',
914 '../ui/events/devices/events_devices.gyp:events_devices',
914 '../ui/events/events.gyp:events', 915 '../ui/events/events.gyp:events',
915 '../ui/events/events.gyp:events_base', 916 '../ui/events/events.gyp:events_base',
916 '../ui/events/events.gyp:gesture_detection', 917 '../ui/events/events.gyp:gesture_detection',
917 '../ui/gfx/gfx.gyp:gfx', 918 '../ui/gfx/gfx.gyp:gfx',
918 '../ui/gfx/gfx.gyp:gfx_geometry', 919 '../ui/gfx/gfx.gyp:gfx_geometry',
919 '../ui/keyboard/keyboard.gyp:keyboard', 920 '../ui/keyboard/keyboard.gyp:keyboard',
920 '../ui/message_center/message_center.gyp:message_center', 921 '../ui/message_center/message_center.gyp:message_center',
921 '../ui/resources/ui_resources.gyp:ui_resources', 922 '../ui/resources/ui_resources.gyp:ui_resources',
922 '../ui/strings/ui_strings.gyp:ui_strings', 923 '../ui/strings/ui_strings.gyp:ui_strings',
923 '../ui/views/controls/webview/webview.gyp:webview', 924 '../ui/views/controls/webview/webview.gyp:webview',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 }, 1035 },
1035 { 1036 {
1036 # GN version: //ash:test_support 1037 # GN version: //ash:test_support
1037 'target_name': 'ash_test_support', 1038 'target_name': 'ash_test_support',
1038 'type': 'static_library', 1039 'type': 'static_library',
1039 'dependencies': [ 1040 'dependencies': [
1040 '../skia/skia.gyp:skia', 1041 '../skia/skia.gyp:skia',
1041 '../testing/gtest.gyp:gtest', 1042 '../testing/gtest.gyp:gtest',
1042 '../ui/accessibility/accessibility.gyp:ax_gen', 1043 '../ui/accessibility/accessibility.gyp:ax_gen',
1043 '../ui/app_list/app_list.gyp:app_list_test_support', 1044 '../ui/app_list/app_list.gyp:app_list_test_support',
1045 '../ui/events/devices/events_devices.gyp:events_devices',
1044 '../ui/views/views.gyp:views_test_support', 1046 '../ui/views/views.gyp:views_test_support',
1045 'ash', 1047 'ash',
1046 'ash_resources.gyp:ash_resources', 1048 'ash_resources.gyp:ash_resources',
1047 ], 1049 ],
1048 'sources': [ 1050 'sources': [
1049 '<@(ash_test_support_sources)', 1051 '<@(ash_test_support_sources)',
1050 ], 1052 ],
1051 'conditions': [ 1053 'conditions': [
1052 ['OS=="win"', { 1054 ['OS=="win"', {
1053 'dependencies': [ 1055 'dependencies': [
(...skipping 28 matching lines...) Expand all
1082 '../third_party/icu/icu.gyp:icuuc', 1084 '../third_party/icu/icu.gyp:icuuc',
1083 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer', 1085 '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer',
1084 '../ui/accessibility/accessibility.gyp:accessibility', 1086 '../ui/accessibility/accessibility.gyp:accessibility',
1085 '../ui/app_list/app_list.gyp:app_list', 1087 '../ui/app_list/app_list.gyp:app_list',
1086 '../ui/aura/aura.gyp:aura', 1088 '../ui/aura/aura.gyp:aura',
1087 '../ui/aura/aura.gyp:aura_test_support', 1089 '../ui/aura/aura.gyp:aura_test_support',
1088 '../ui/base/ui_base.gyp:ui_base', 1090 '../ui/base/ui_base.gyp:ui_base',
1089 '../ui/base/ui_base.gyp:ui_base_test_support', 1091 '../ui/base/ui_base.gyp:ui_base_test_support',
1090 '../ui/compositor/compositor.gyp:compositor', 1092 '../ui/compositor/compositor.gyp:compositor',
1091 '../ui/compositor/compositor.gyp:compositor_test_support', 1093 '../ui/compositor/compositor.gyp:compositor_test_support',
1094 '../ui/events/devices/events_devices.gyp:events_devices',
1092 '../ui/events/events.gyp:events', 1095 '../ui/events/events.gyp:events',
1093 '../ui/events/events.gyp:events_test_support', 1096 '../ui/events/events.gyp:events_test_support',
1094 '../ui/events/events.gyp:gesture_detection', 1097 '../ui/events/events.gyp:gesture_detection',
1095 '../ui/gfx/gfx.gyp:gfx', 1098 '../ui/gfx/gfx.gyp:gfx',
1096 '../ui/gfx/gfx.gyp:gfx_geometry', 1099 '../ui/gfx/gfx.gyp:gfx_geometry',
1097 '../ui/keyboard/keyboard.gyp:keyboard', 1100 '../ui/keyboard/keyboard.gyp:keyboard',
1098 '../ui/message_center/message_center.gyp:message_center', 1101 '../ui/message_center/message_center.gyp:message_center',
1099 '../ui/message_center/message_center.gyp:message_center_test_support', 1102 '../ui/message_center/message_center.gyp:message_center_test_support',
1100 '../ui/resources/ui_resources.gyp:ui_resources', 1103 '../ui/resources/ui_resources.gyp:ui_resources',
1101 '../ui/views/controls/webview/webview_tests.gyp:webview_test_support', 1104 '../ui/views/controls/webview/webview_tests.gyp:webview_test_support',
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 '../build/isolate.gypi', 1297 '../build/isolate.gypi',
1295 ], 1298 ],
1296 'sources': [ 1299 'sources': [
1297 'ash_unittests.isolate', 1300 'ash_unittests.isolate',
1298 ], 1301 ],
1299 }, 1302 },
1300 ], 1303 ],
1301 }], 1304 }],
1302 ], 1305 ],
1303 } 1306 }
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/display/display_change_observer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698