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

Unified Diff: ui/views/mus/BUILD.gn

Issue 2291803002: Remove views.gypi, inline sources into GN files. (Closed)
Patch Set: Remove shared file Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/BUILD.gn ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/BUILD.gn
diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn
index 3f3d4c7517eb85465183b8cd2630f29112937408..37065661ace3add30283f5c73a54550a1c8068df 100644
--- a/ui/views/mus/BUILD.gn
+++ b/ui/views/mus/BUILD.gn
@@ -9,10 +9,6 @@ import("//services/shell/public/service_manifest.gni")
import("//testing/test.gni")
import("//tools/grit/repack.gni")
-gypi = exec_script("//build/gypi_to_gn.py",
- [ rebase_path("../views.gyp") ],
- "scope",
- [ "../views.gyp" ])
component("mus") {
output_name = "ui_views_mus_lib"
@@ -151,8 +147,6 @@ static_library("test_support") {
test("views_mus_unittests") {
testonly = true
- configs += [ "//build/config:precompiled_headers" ]
-
sources = [
"display_list_unittest.cc",
"native_widget_mus_unittest.cc",
@@ -162,23 +156,7 @@ test("views_mus_unittests") {
"screen_mus_unittest.cc",
]
- sources += rebase_path(gypi.views_unittests_sources, ".", "//ui/views")
- 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",
- ]
+ configs += [ "//build/config:precompiled_headers" ]
deps = [
":mus",
@@ -213,6 +191,7 @@ test("views_mus_unittests") {
"//ui/touch_selection",
"//ui/views",
"//ui/views:test_support_internal",
+ "//ui/views:views_unittests_sources",
"//ui/wm",
"//url",
]
@@ -253,8 +232,6 @@ test("views_mus_unittests") {
test("views_mus_interactive_ui_tests") {
testonly = true
- configs += [ "//build/config:precompiled_headers" ]
-
sources = [
"../widget/widget_interactive_uitest.cc",
"clipboard_unittest.cc",
« no previous file with comments | « ui/views/BUILD.gn ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698