3 files changed, 18 insertions, 56 deletions
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 494785f..945e6f0 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -27,7 +27,6 @@ group("services") {
       "//mojo/services/surfaces",
       "//mojo/services/tracing",
       "//mojo/services/view_manager",
-      "//mojo/services/window_manager:lib",
     ]
 
     # TODO(GYP): Make this work.
@@ -37,55 +36,6 @@ group("services") {
         "//mojo/services/kiosk_wm:window_manager",
         "//mojo/services/native_viewport",
         "//mojo/services/view_manager",
-        "//mojo/services/window_manager:lib",
-      ]
-    }
-  }
-}
-
-group("tests") {
-  testonly = true
-  deps = [
-    ":services",
-  ]
-  if (!is_component_build) {
-    deps += [
-      "//mojo/services/html_viewer:tests",
-      "//mojo/services/view_manager:view_manager_service_unittests",
-      "//mojo/services/window_manager:window_manager_unittests",
-    ]
-
-    # TODO(GYP): Make this work.
-    if (is_mac) {
-      deps -= [
-        "//mojo/services/html_viewer:tests",
-        "//mojo/services/view_manager:view_manager_service_unittests",
-        "//mojo/services/window_manager:window_manager_unittests",
-      ]
-    }
-  }
-}
-
-group("apptests") {
-  testonly = true
-  deps = [
-    ":services",
-  ]
-  if (!is_component_build) {
-    deps += [
-      "//mojo/services/clipboard:apptests",
-      "//mojo/services/html_viewer:apptests",
-      "//mojo/services/network:apptests",
-      "//mojo/services/view_manager:apptests",
-      "//mojo/services/window_manager:apptests",
-    ]
-
-    # TODO(GYP): Make this work.
-    if (is_mac) {
-      deps -= [
-        "//mojo/services/html_viewer:apptests",
-        "//mojo/services/view_manager:apptests",
-        "//mojo/services/window_manager:apptests",
       ]
     }
   }
diff --git a/mojo/services/view_manager/BUILD.gn b/mojo/services/view_manager/BUILD.gn
index 04b3988..a0eb871 100644
--- a/mojo/services/view_manager/BUILD.gn
+++ b/mojo/services/view_manager/BUILD.gn
@@ -156,24 +156,37 @@ test("view_manager_service_unittests") {
   }
 }
 
-mojo_native_application("apptests") {
-  output_name = "view_manager_apptests"
+mojo_native_application("mojo_view_manager_client_apptests") {
   testonly = true
 
   sources = [
     "view_manager_client_apptest.cc",
+  ]
+
+  deps = [
+    "//base",
+    "//base/test:test_config",
+    "//mojo/application",
+    "//mojo/application:test_support",
+    "//third_party/mojo_services/src/geometry/public/cpp:cpp",
+    "//third_party/mojo_services/src/view_manager/public/cpp",
+  ]
+}
+
+mojo_native_application("view_manager_service_apptests") {
+  testonly = true
+
+  sources = [
     "view_manager_service_apptest.cc",
   ]
 
   deps = [
     ":test_support",
     "//base",
-    "//base/test:test_config",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo_services/src/geometry/public/cpp:cpp",
     "//third_party/mojo_services/src/geometry/public/interfaces",
     "//third_party/mojo_services/src/view_manager/public/cpp",
     "//third_party/mojo_services/src/view_manager/public/interfaces",
diff --git a/mojo/services/window_manager/BUILD.gn b/mojo/services/window_manager/BUILD.gn
index 74259dc..bf5e416 100644
--- a/mojo/services/window_manager/BUILD.gn
+++ b/mojo/services/window_manager/BUILD.gn
@@ -106,8 +106,7 @@ mojo_native_application("test_window_manager") {
   ]
 }
 
-mojo_native_application("apptests") {
-  output_name = "window_manager_apptests"
+mojo_native_application("window_manager_apptests") {
   testonly = true
 
   sources = [