Index: ash/BUILD.gn |
diff --git a/ash/BUILD.gn b/ash/BUILD.gn |
index 2700da75a5b2ab37a288178490f1aa89beb2bdf8..084f27c164f631da134631bd3ff3bbf5fe4de5e7 100644 |
--- a/ash/BUILD.gn |
+++ b/ash/BUILD.gn |
@@ -168,227 +168,231 @@ component("ash_with_content") { |
] |
} |
-static_library("test_support") { |
- testonly = true |
- sources = gypi_values.ash_test_support_sources |
- |
- public_deps = [ |
- ":ash", |
- ] |
- deps = [ |
- "//ash/resources", |
- "//content/test:test_support", |
- "//skia", |
- "//testing/gtest", |
- "//ui/accessibility", |
- "//ui/app_list", |
- "//ui/app_list:test_support", |
- "//ui/events:events_base", |
- "//ui/events/devices", |
- "//ui/gl", |
- "//ui/views", |
- "//ui/views:test_support", |
- ] |
- |
- if (is_win) { |
- sources += [ |
- "test/test_metro_viewer_process_host.cc", |
- "test/test_metro_viewer_process_host.h", |
+# TODO(brettw) enable on Windows. This should link but is disabled due to bot |
+# capacity issues. |
+if (!is_win) { |
+ static_library("test_support") { |
+ testonly = true |
+ sources = gypi_values.ash_test_support_sources |
+ |
+ public_deps = [ |
+ ":ash", |
] |
- deps += [ |
- "//ipc", |
- "//ui/metro_viewer", |
- "//win8:metro_viewer", |
- "//win8:test_support_win8", |
- "//win8:test_registrar", |
+ deps = [ |
+ "//ash/resources", |
+ "//content/test:test_support", |
+ "//skia", |
+ "//testing/gtest", |
+ "//ui/accessibility", |
+ "//ui/app_list", |
+ "//ui/app_list:test_support", |
+ "//ui/events:events_base", |
+ "//ui/events/devices", |
+ "//ui/gl", |
+ "//ui/views", |
+ "//ui/views:test_support", |
] |
- } |
-} |
- |
-static_library("ash_shell_lib") { |
- testonly = true |
- sources = gypi_values.ash_shell_lib_sources |
- |
- deps = [ |
- ":ash", |
- ":ash_with_content", |
- ":test_support", |
- "//ash/resources", |
- "//ash/strings", |
- "//base", |
- "//base:i18n", |
- #"//chrome:packed_resources", TODO(GYP) |
- "//content", |
- "//content/shell:content_shell_lib", |
- "//net", |
- "//skia", |
- "//third_party/icu", |
- "//ui/app_list", |
- "//ui/aura", |
- "//ui/base", |
- "//ui/compositor", |
- "//ui/events", |
- "//ui/events:events_base", |
- "//ui/gfx", |
- "//ui/gfx/geometry", |
- "//ui/keyboard", |
- "//ui/message_center", |
- "//ui/resources", |
- "//ui/views", |
- "//ui/views:test_support", |
- "//ui/views/examples:views_examples_lib", |
- "//ui/views/examples:views_examples_with_content_lib", |
- ] |
-} |
- |
-test("ash_unittests") { |
- sources = gypi_values.ash_unittests_sources |
- |
- deps = [ |
- ":ash", |
- ":ash_with_content", |
- ":test_support", |
- "//ash/resources", |
- "//ash/strings", |
- "//base", |
- "//base/allocator", |
- "//base/test:test_support", |
- "//components/user_manager", |
- "//content/public/browser", |
- "//content/test:test_support", |
- "//skia", |
- "//testing/gtest", |
- "//third_party/icu", |
- "//ui/accelerometer", |
- "//ui/accessibility", |
- "//ui/aura", |
- "//ui/aura:test_support", |
- "//ui/base", |
- "//ui/base:test_support", |
- "//ui/compositor", |
- "//ui/compositor:test_support", |
- "//ui/events", |
- "//ui/events/devices", |
- "//ui/events:test_support", |
- "//ui/events:gesture_detection", |
- "//ui/gfx", |
- "//ui/gfx/geometry", |
- "//ui/keyboard", |
- "//ui/message_center", |
- "//ui/message_center:test_support", |
- "//ui/resources", |
- "//ui/views", |
- "//ui/views:test_support", |
- "//ui/views/controls/webview:test_support", |
- "//ui/web_dialogs:test_support", |
- "//ui/wm", |
- "//url", |
- ] |
- |
- if (!is_chromeos) { |
- sources -= [ |
- # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 |
- "focus_cycler_unittest.cc", |
- |
- # All tests for multiple displays: not supported on Windows Ash. |
- "wm/drag_window_resizer_unittest.cc", |
- |
- # Accelerometer is only available on Chrome OS. |
- "wm/maximize_mode/maximize_mode_controller_unittest.cc", |
- |
- # Can't resize on Windows Ash. http://crbug.com/165962 |
- "magnifier/magnification_controller_unittest.cc", |
- "wm/workspace/workspace_window_resizer_unittest.cc", |
- "sticky_keys/sticky_keys_overlay_unittest.cc", |
- "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", |
- "autoclick/autoclick_unittest.cc", |
- "virtual_keyboard_controller_unittest.cc", |
- ] |
- sources += [ |
- #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO(GYP) |
- ] |
- } |
- |
- if (is_win) { |
- cflags = [ "/wd4267" ] |
+ if (is_win) { |
+ sources += [ |
+ "test/test_metro_viewer_process_host.cc", |
+ "test/test_metro_viewer_process_host.h", |
+ ] |
+ deps += [ |
+ "//ipc", |
+ "//ui/metro_viewer", |
+ "//win8:metro_viewer", |
+ "//win8:test_support_win8", |
+ "//win8:test_registrar", |
+ ] |
+ } |
} |
- if (!use_x11) { |
- sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] |
- } |
- if (is_chromeos) { |
- sources += [ "first_run/first_run_helper_unittest.cc" ] |
- deps += [ |
- "//device/bluetooth", |
- "//ui/display", |
- "//ui/display:test_util", |
- "//ui/display/types", |
- "//chromeos:power_manager_proto", |
- "//chromeos:test_support_without_gmock", |
- ] |
- } else { |
- sources -= [ |
- "accelerators/magnifier_key_scroller_unittest.cc", |
- "accelerators/spoken_feedback_toggler_unittest.cc", |
- "display/resolution_notification_controller_unittest.cc", |
- "touch/touchscreen_util_unittest.cc", |
+ static_library("ash_shell_lib") { |
+ testonly = true |
+ sources = gypi_values.ash_shell_lib_sources |
+ |
+ deps = [ |
+ ":ash", |
+ ":ash_with_content", |
+ ":test_support", |
+ "//ash/resources", |
+ "//ash/strings", |
+ "//base", |
+ "//base:i18n", |
+ |
+ #"//chrome:packed_resources", TODO(GYP) |
+ "//content", |
+ "//content/shell:content_shell_lib", |
+ "//net", |
+ "//skia", |
+ "//third_party/icu", |
+ "//ui/app_list", |
+ "//ui/aura", |
+ "//ui/base", |
+ "//ui/compositor", |
+ "//ui/events", |
+ "//ui/events:events_base", |
+ "//ui/gfx", |
+ "//ui/gfx/geometry", |
+ "//ui/keyboard", |
+ "//ui/message_center", |
+ "//ui/resources", |
+ "//ui/views", |
+ "//ui/views:test_support", |
+ "//ui/views/examples:views_examples_lib", |
+ "//ui/views/examples:views_examples_with_content_lib", |
] |
} |
- if (!use_x11 || !is_chromeos) { |
- sources -= [ "touch/touch_transformer_controller_unittest.cc" ] |
- } |
- |
- # TODO(GYP) is this necessary? |
- #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { |
- # ldflags = "-rdynamic" |
+ test("ash_unittests") { |
+ sources = gypi_values.ash_unittests_sources |
+ |
+ deps = [ |
+ ":ash", |
+ ":ash_with_content", |
+ ":test_support", |
+ "//ash/resources", |
+ "//ash/strings", |
+ "//base", |
+ "//base/allocator", |
+ "//base/test:test_support", |
+ "//components/user_manager", |
+ "//content/public/browser", |
+ "//content/test:test_support", |
+ "//skia", |
+ "//testing/gtest", |
+ "//third_party/icu", |
+ "//ui/accelerometer", |
+ "//ui/accessibility", |
+ "//ui/aura", |
+ "//ui/aura:test_support", |
+ "//ui/base", |
+ "//ui/base:test_support", |
+ "//ui/compositor", |
+ "//ui/compositor:test_support", |
+ "//ui/events", |
+ "//ui/events/devices", |
+ "//ui/events:test_support", |
+ "//ui/events:gesture_detection", |
+ "//ui/gfx", |
+ "//ui/gfx/geometry", |
+ "//ui/keyboard", |
+ "//ui/message_center", |
+ "//ui/message_center:test_support", |
+ "//ui/resources", |
+ "//ui/views", |
+ "//ui/views:test_support", |
+ "//ui/views/controls/webview:test_support", |
+ "//ui/web_dialogs:test_support", |
+ "//ui/wm", |
+ "//url", |
+ ] |
- if (!is_chromeos || use_ozone) { |
- sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] # crbug.com/354035 |
+ if (!is_chromeos) { |
+ sources -= [ |
+ # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 |
+ "focus_cycler_unittest.cc", |
+ |
+ # All tests for multiple displays: not supported on Windows Ash. |
+ "wm/drag_window_resizer_unittest.cc", |
+ |
+ # Accelerometer is only available on Chrome OS. |
+ "wm/maximize_mode/maximize_mode_controller_unittest.cc", |
+ |
+ # Can't resize on Windows Ash. http://crbug.com/165962 |
+ "magnifier/magnification_controller_unittest.cc", |
+ "wm/workspace/workspace_window_resizer_unittest.cc", |
+ "sticky_keys/sticky_keys_overlay_unittest.cc", |
+ "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", |
+ "autoclick/autoclick_unittest.cc", |
+ "virtual_keyboard_controller_unittest.cc", |
+ ] |
+ sources += [ |
+ #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO(GYP) |
+ ] |
+ } |
+ |
+ if (is_win) { |
+ cflags = [ "/wd4267" ] |
+ } |
+ |
+ if (!use_x11) { |
+ sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] |
+ } |
+ if (is_chromeos) { |
+ sources += [ "first_run/first_run_helper_unittest.cc" ] |
+ deps += [ |
+ "//device/bluetooth", |
+ "//ui/display", |
+ "//ui/display:test_util", |
+ "//ui/display/types", |
+ "//chromeos:power_manager_proto", |
+ "//chromeos:test_support_without_gmock", |
+ ] |
+ } else { |
+ sources -= [ |
+ "accelerators/magnifier_key_scroller_unittest.cc", |
+ "accelerators/spoken_feedback_toggler_unittest.cc", |
+ "display/resolution_notification_controller_unittest.cc", |
+ "touch/touchscreen_util_unittest.cc", |
+ ] |
+ } |
+ |
+ if (!use_x11 || !is_chromeos) { |
+ sources -= [ "touch/touch_transformer_controller_unittest.cc" ] |
+ } |
+ |
+ # TODO(GYP) is this necessary? |
+ #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { |
+ # ldflags = "-rdynamic" |
+ |
+ if (!is_chromeos || use_ozone) { |
+ sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] # crbug.com/354035 |
+ } |
} |
-} |
-executable("ash_shell") { |
- testonly = true |
- sources = [ |
- "shell/shell_main.cc", |
- ] |
+ executable("ash_shell") { |
+ testonly = true |
+ sources = [ |
+ "shell/shell_main.cc", |
+ ] |
- deps = [ |
- ":ash_shell_lib", |
- "//components/user_manager", |
- ] |
+ deps = [ |
+ ":ash_shell_lib", |
+ "//components/user_manager", |
+ ] |
- if (is_win) { |
- configs -= [ "//build/config/win:console" ] |
- configs += [ "//build/config/win:windowed" ] |
- deps += [ "//sandbox" ] |
- } |
+ if (is_win) { |
+ configs -= [ "//build/config/win:console" ] |
+ configs += [ "//build/config/win:windowed" ] |
+ deps += [ "//sandbox" ] |
+ } |
- if (is_chromeos) { |
- deps += [ "//device/bluetooth" ] |
+ if (is_chromeos) { |
+ deps += [ "//device/bluetooth" ] |
+ } |
} |
-} |
-test("ash_shell_unittests") { |
- sources = [ |
- "shell/window_watcher_unittest.cc", |
- "test/ash_unittests.cc", |
- ] |
+ test("ash_shell_unittests") { |
+ sources = [ |
+ "shell/window_watcher_unittest.cc", |
+ "test/ash_unittests.cc", |
+ ] |
- deps = [ |
- ":ash_shell_lib", |
- ":test_support", |
- "//base/test:test_support", |
- "//components/user_manager", |
- "//content/test:test_support", |
- "//skia", |
- "//testing/gtest", |
- "//ui/accessibility", |
- ] |
+ deps = [ |
+ ":ash_shell_lib", |
+ ":test_support", |
+ "//base/test:test_support", |
+ "//components/user_manager", |
+ "//content/test:test_support", |
+ "//skia", |
+ "//testing/gtest", |
+ "//ui/accessibility", |
+ ] |
- if (is_chromeos) { |
- deps += [ "//ui/display" ] |
+ if (is_chromeos) { |
+ deps += [ "//ui/display" ] |
+ } |
} |
} |