Commit a966841c authored by brettw's avatar brettw Committed by Commit bot

Remove views.gypi, inline sources into GN files.

Previously the views unit tests duplicated sources between views_unittests and views_mus_unittests. This puts the sources in one target and shares the compiles between both test suites.

Review-Url: https://codereview.chromium.org/2291803002
Cr-Commit-Position: refs/heads/master@{#415402}
parent f299e19d
...@@ -315,8 +315,6 @@ exec_script_whitelist = [ ...@@ -315,8 +315,6 @@ exec_script_whitelist = [
"//tools/gn/setup.cc", "//tools/gn/setup.cc",
"//ui/accessibility/BUILD.gn", "//ui/accessibility/BUILD.gn",
"//ui/gfx/BUILD.gn", "//ui/gfx/BUILD.gn",
"//ui/views/BUILD.gn",
"//ui/views/mus/BUILD.gn",
"//v8/test/cctest/BUILD.gn", "//v8/test/cctest/BUILD.gn",
"//v8/test/unittests/BUILD.gn", "//v8/test/unittests/BUILD.gn",
] ]
This diff is collapsed.
...@@ -9,10 +9,6 @@ import("//services/shell/public/service_manifest.gni") ...@@ -9,10 +9,6 @@ import("//services/shell/public/service_manifest.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("//tools/grit/repack.gni") import("//tools/grit/repack.gni")
gypi = exec_script("//build/gypi_to_gn.py",
[ rebase_path("../views.gyp") ],
"scope",
[ "../views.gyp" ])
component("mus") { component("mus") {
output_name = "ui_views_mus_lib" output_name = "ui_views_mus_lib"
...@@ -151,8 +147,6 @@ static_library("test_support") { ...@@ -151,8 +147,6 @@ static_library("test_support") {
test("views_mus_unittests") { test("views_mus_unittests") {
testonly = true testonly = true
configs += [ "//build/config:precompiled_headers" ]
sources = [ sources = [
"display_list_unittest.cc", "display_list_unittest.cc",
"native_widget_mus_unittest.cc", "native_widget_mus_unittest.cc",
...@@ -162,23 +156,7 @@ test("views_mus_unittests") { ...@@ -162,23 +156,7 @@ test("views_mus_unittests") {
"screen_mus_unittest.cc", "screen_mus_unittest.cc",
] ]
sources += rebase_path(gypi.views_unittests_sources, ".", "//ui/views") configs += [ "//build/config:precompiled_headers" ]
sources += rebase_path(gypi.views_unittests_aura_sources, ".", "//ui/views")
sources -= [
# Mus has its own runner.
"../run_all_unittests_main.cc",
# EventGenerator doesn't work well with IME in mus.
# crbug.com/615033 crbug.com/548407
"../controls/textfield/textfield_unittest.cc",
# Tooltips. crbug.com/599558
"../corewm/tooltip_controller_unittest.cc",
# Some of the tests need drag-drop support. crbug.com/614037
"../touchui/touch_selection_controller_impl_unittest.cc",
]
deps = [ deps = [
":mus", ":mus",
...@@ -213,6 +191,7 @@ test("views_mus_unittests") { ...@@ -213,6 +191,7 @@ test("views_mus_unittests") {
"//ui/touch_selection", "//ui/touch_selection",
"//ui/views", "//ui/views",
"//ui/views:test_support_internal", "//ui/views:test_support_internal",
"//ui/views:views_unittests_sources",
"//ui/wm", "//ui/wm",
"//url", "//url",
] ]
...@@ -253,8 +232,6 @@ test("views_mus_unittests") { ...@@ -253,8 +232,6 @@ test("views_mus_unittests") {
test("views_mus_interactive_ui_tests") { test("views_mus_interactive_ui_tests") {
testonly = true testonly = true
configs += [ "//build/config:precompiled_headers" ]
sources = [ sources = [
"../widget/widget_interactive_uitest.cc", "../widget/widget_interactive_uitest.cc",
"clipboard_unittest.cc", "clipboard_unittest.cc",
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment