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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/BUILD.gn

Issue 2559713003: Remove non-chromeos support from src/ash BUILD.gn files (Closed)
Patch Set: rebase, nit Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index ccd4b2a4eed5395e28dab4bb932a142840b78ba9..0ec92252a4a3124b9123ea06f08d80697956faa0 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -686,12 +686,22 @@ component("ash") {
"host/transformer_helper.h",
"ime/input_method_event_handler.cc",
"ime/input_method_event_handler.h",
+ "laser/laser_pointer_controller.cc",
+ "laser/laser_pointer_controller.h",
+ "laser/laser_pointer_points.cc",
+ "laser/laser_pointer_points.h",
+ "laser/laser_pointer_view.cc",
+ "laser/laser_pointer_view.h",
+ "laser/laser_segment_utils.cc",
+ "laser/laser_segment_utils.h",
"link_handler_model.cc",
"link_handler_model.h",
"link_handler_model_factory.cc",
"link_handler_model_factory.h",
"magnifier/magnification_controller.cc",
"magnifier/magnification_controller.h",
+ "magnifier/partial_magnification_controller.cc",
+ "magnifier/partial_magnification_controller.h",
"metrics/desktop_task_switch_metric_recorder.cc",
"metrics/desktop_task_switch_metric_recorder.h",
"metrics/task_switch_metrics_recorder.cc",
@@ -867,29 +877,41 @@ component("ash") {
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//cc",
+ "//chromeos",
+ "//chromeos:power_manager_proto",
"//components/device_event_log",
"//components/onc",
+ "//components/quirks",
"//components/session_manager:base",
"//components/signin/core/account_id",
"//components/ui_devtools",
"//components/user_manager",
"//components/wallpaper",
+ "//device/bluetooth",
"//media",
"//net",
"//services/service_manager/public/cpp",
"//services/ui/public/interfaces",
"//skia",
+
+ # TODO(msw): Remove this; only ash_with_content should depend on webkit.
+ "//third_party/WebKit/public:blink_headers",
"//third_party/icu",
+ "//third_party/qcms",
"//ui/accessibility",
"//ui/app_list/presenter",
"//ui/aura",
"//ui/base",
"//ui/base:ui_data_pack",
"//ui/base/ime",
+ "//ui/chromeos",
+ "//ui/chromeos/resources",
+ "//ui/chromeos/strings",
"//ui/compositor",
"//ui/display",
"//ui/display/manager",
"//ui/display/types",
+ "//ui/display/util",
"//ui/events",
"//ui/events:events_base",
"//ui/events:gesture_detection",
@@ -908,15 +930,10 @@ component("ash") {
"//url",
]
- if (is_win) {
- sources -= [
- "sticky_keys/sticky_keys_controller.cc",
- "sticky_keys/sticky_keys_controller.h",
- ]
-
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
- }
+ # TODO(jamescook): Move to ash_unittests?
+ data = [
+ "display/test_data/",
+ ]
if (use_x11) {
configs += [
@@ -950,55 +967,6 @@ component("ash") {
]
}
- if (is_chromeos) {
- deps += [
- "//chromeos",
- "//chromeos:power_manager_proto",
- "//components/quirks",
- "//device/bluetooth",
-
- # TODO(msw): Remove this; only ash_with_content should depend on webkit.
- "//third_party/WebKit/public:blink_headers",
- "//third_party/qcms",
- "//ui/chromeos",
- "//ui/chromeos/resources",
- "//ui/chromeos/strings",
- "//ui/display/util",
- ]
-
- data = [
- "display/test_data/",
- ]
-
- sources += [
- "laser/laser_pointer_controller.cc",
- "laser/laser_pointer_controller.h",
- "laser/laser_pointer_points.cc",
- "laser/laser_pointer_points.h",
- "laser/laser_pointer_view.cc",
- "laser/laser_pointer_view.h",
- "laser/laser_segment_utils.cc",
- "laser/laser_segment_utils.h",
- "magnifier/partial_magnification_controller.cc",
- "magnifier/partial_magnification_controller.h",
- ]
- } else {
- sources -= [
- "accelerators/key_hold_detector.cc",
- "accelerators/key_hold_detector.h",
- "accelerators/magnifier_key_scroller.cc",
- "accelerators/magnifier_key_scroller.h",
- "accelerators/spoken_feedback_toggler.cc",
- "accelerators/spoken_feedback_toggler.h",
- "display/resolution_notification_controller.cc",
- "display/resolution_notification_controller.h",
- "touch/touch_transformer_controller.cc",
- "touch/touch_transformer_controller.h",
- "virtual_keyboard_controller.cc",
- "virtual_keyboard_controller.h",
- ]
- }
-
# Usage of content should be in ash_content_unittests.
assert_no_deps = [
"//content/public/browser",
@@ -1121,6 +1089,7 @@ static_library("ash_shell_lib_with_content") {
"//ash/test:test_support_without_content",
"//base:i18n",
"//chrome:packed_resources",
+ "//chromeos",
"//content",
"//content/shell:content_shell_lib",
"//device/bluetooth",
@@ -1137,10 +1106,6 @@ static_library("ash_shell_lib_with_content") {
"//ui/views/examples:views_examples_with_content_lib",
"//ui/wm",
]
-
- if (is_chromeos) {
- deps += [ "//chromeos" ]
- }
}
# This target is intended for tests that use content. In general very few tests
@@ -1166,15 +1131,24 @@ test("ash_content_unittests") {
"//ash/test:test_support_with_content",
"//base",
"//base/test:test_support",
+ "//chromeos",
+ "//chromeos:power_manager_proto",
+ "//chromeos:test_support_without_gmock",
+ "//components/quirks",
"//components/signin/core/account_id",
"//components/user_manager",
"//content/public/browser",
"//content/test:test_support",
+ "//device/bluetooth",
"//mojo/edk/system",
+ "//net",
"//skia",
"//testing/gtest",
"//ui/aura",
"//ui/aura:test_support",
+ "//ui/chromeos",
+ "//ui/display",
+ "//ui/display:test_support",
"//ui/message_center",
"//ui/message_center:test_support",
"//ui/views",
@@ -1188,20 +1162,6 @@ test("ash_content_unittests") {
"//ash/resources:ash_test_resources_with_content_100_percent",
"//ash/resources:ash_test_resources_200_percent",
]
-
- if (is_chromeos) {
- deps += [
- "//chromeos",
- "//chromeos:power_manager_proto",
- "//chromeos:test_support_without_gmock",
- "//components/quirks",
- "//device/bluetooth",
- "//net:net",
- "//ui/chromeos",
- "//ui/display",
- "//ui/display:test_support",
- ]
- }
}
test("ash_unittests") {
@@ -1286,10 +1246,14 @@ test("ash_unittests") {
"drag_drop/drag_drop_controller_unittest.cc",
"drag_drop/drag_drop_tracker_unittest.cc",
"extended_desktop_unittest.cc",
+ "first_run/first_run_helper_unittest.cc",
"focus_cycler_unittest.cc",
"frame/caption_buttons/frame_size_button_unittest.cc",
"host/ash_window_tree_host_x11_unittest.cc",
+ "laser/laser_pointer_controller_unittest.cc",
+ "laser/laser_segment_utils_unittest.cc",
"magnifier/magnification_controller_unittest.cc",
+ "magnifier/partial_magnification_controller_unittest.cc",
"metrics/desktop_task_switch_metric_recorder_unittest.cc",
"metrics/task_switch_metrics_recorder_unittest.cc",
"metrics/task_switch_time_tracker_unittest.cc",
@@ -1382,9 +1346,15 @@ test("ash_unittests") {
"//ash/touch_hud",
"//base",
"//base/test:test_support",
+ "//chromeos",
+ "//chromeos:power_manager_proto",
+ "//chromeos:test_support_without_gmock",
+ "//components/quirks",
"//components/signin/core/account_id",
"//components/user_manager",
+ "//device/bluetooth",
"//mojo/edk/system",
+ "//net:net",
"//services/ui/public/interfaces",
"//skia",
"//testing/gmock",
@@ -1397,8 +1367,11 @@ test("ash_unittests") {
"//ui/base",
"//ui/base:test_support",
"//ui/base/ime",
+ "//ui/chromeos",
"//ui/compositor",
"//ui/compositor:test_support",
+ "//ui/display",
+ "//ui/display:test_support",
"//ui/display/types",
"//ui/events",
"//ui/events:gesture_detection",
@@ -1425,60 +1398,12 @@ test("ash_unittests") {
]
if (!use_x11) {
- sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
- }
-
- if (is_chromeos) {
- sources += [
- "first_run/first_run_helper_unittest.cc",
- "laser/laser_pointer_controller_unittest.cc",
- "laser/laser_segment_utils_unittest.cc",
- "magnifier/partial_magnification_controller_unittest.cc",
- ]
- deps += [
- "//chromeos",
- "//chromeos:power_manager_proto",
- "//chromeos:test_support_without_gmock",
- "//components/quirks",
- "//device/bluetooth",
- "//net:net",
- "//ui/chromeos",
- "//ui/display",
- "//ui/display:test_support",
- ]
- } else {
sources -= [
- "accelerators/magnifier_key_scroller_unittest.cc",
- "accelerators/spoken_feedback_toggler_unittest.cc",
-
- # Can't resize on Windows Ash. http://crbug.com/165962
- "autoclick/autoclick_unittest.cc",
- "display/resolution_notification_controller_unittest.cc",
-
- # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
- "focus_cycler_unittest.cc",
- "magnifier/magnification_controller_unittest.cc",
- "sticky_keys/sticky_keys_overlay_unittest.cc",
- "sticky_keys/sticky_keys_unittest.cc",
- "virtual_keyboard_controller_unittest.cc",
-
- # All tests for multiple displays: not supported on Windows Ash.
- "wm/drag_window_resizer_unittest.cc",
-
- # Talks to ChromeOS system services.
- "wm/lock_state_controller_unittest.cc",
-
- # Maximize mode is only available on Chrome OS.
- "wm/maximize_mode/maximize_mode_controller_unittest.cc",
- "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
- "wm/workspace/workspace_window_resizer_unittest.cc",
+ "host/ash_window_tree_host_x11_unittest.cc",
+ "touch/touch_transformer_controller_unittest.cc",
]
}
- if (!use_x11 || !is_chromeos) {
- sources -= [ "touch/touch_transformer_controller_unittest.cc" ]
- }
-
# Usage of content should be in ash_with_content.
assert_no_deps = [
"//content/public/browser",
@@ -1500,6 +1425,7 @@ executable("ash_shell_with_content") {
"//components/user_manager",
"//content",
"//content/public/app:both",
+ "//device/bluetooth",
]
data_deps = [
@@ -1507,14 +1433,4 @@ executable("ash_shell_with_content") {
"//ash/resources:ash_test_resources_with_content_100_percent",
"//ash/resources:ash_test_resources_200_percent",
]
-
- if (is_win) {
- configs -= [ "//build/config/win:console" ]
- configs += [ "//build/config/win:windowed" ]
- deps += [ "//sandbox" ]
- }
-
- if (is_chromeos) {
- deps += [ "//device/bluetooth" ]
- }
}
« no previous file with comments | « no previous file | ash/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698