| Index: media/mojo/services/BUILD.gn
|
| diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
|
| index f9e46334d77a059d5b9a930c3e87c14522e290fd..a92031bdc8542acaa982b28a7dc6d7f0cd4bd2ba 100644
|
| --- a/media/mojo/services/BUILD.gn
|
| +++ b/media/mojo/services/BUILD.gn
|
| @@ -6,6 +6,7 @@ import("//media/media_options.gni")
|
| import("//services/catalog/public/tools/catalog.gni")
|
| import("//services/service_manager/public/cpp/service.gni")
|
| import("//services/service_manager/public/service_manifest.gni")
|
| +import("//services/service_manager/public/tools/test/service_test.gni")
|
| import("//testing/test.gni")
|
|
|
| config("mojo_media_config") {
|
| @@ -162,24 +163,22 @@ service("media") {
|
| # component builds, so don't declare it, otherwise the "all" target will still
|
| # try to build it.
|
| if (!(is_win && is_component_build)) {
|
| - test("media_service_unittests") {
|
| + service_test("media_service_unittests") {
|
| testonly = true
|
|
|
| sources = [
|
| "media_service_unittest.cc",
|
| - "run_all_unittests.cc",
|
| ]
|
|
|
| + catalog = ":media_service_unittests_catalog"
|
| +
|
| deps = [
|
| "//base",
|
| - "//base/test:test_support",
|
| "//media",
|
| "//media/base:test_support",
|
| "//media/mojo/clients",
|
| "//media/mojo/common",
|
| "//media/mojo/interfaces",
|
| - "//mojo/edk/system",
|
| - "//services/catalog:lib",
|
| "//services/service_manager/public/cpp:service_test_support",
|
| "//testing/gmock",
|
| "//testing/gtest",
|
| @@ -187,7 +186,6 @@ if (!(is_win && is_component_build)) {
|
|
|
| data_deps = [
|
| ":media",
|
| - ":media_service_unittests_catalog_copy",
|
| ]
|
| }
|
| } # !(is_win && is_component_build)
|
| @@ -225,13 +223,3 @@ catalog("media_service_unittests_catalog") {
|
| embedded_services = [ ":test_manifest" ]
|
| standalone_services = [ ":media_manifest" ]
|
| }
|
| -
|
| -copy("media_service_unittests_catalog_copy") {
|
| - sources = get_target_outputs(":media_service_unittests_catalog")
|
| - outputs = [
|
| - "${root_out_dir}/media_service_unittests_catalog.json",
|
| - ]
|
| - deps = [
|
| - ":media_service_unittests_catalog",
|
| - ]
|
| -}
|
|
|