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

Unified Diff: media/mojo/services/BUILD.gn

Issue 2645973006: [Service Manager] Get rid of dynamic service discovery (Closed)
Patch Set: . Created 3 years, 11 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 | « mash/test/mash_unittests.cc ('k') | media/mojo/services/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/BUILD.gn
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 3ee32122d8a77b323f362178a09b65a4ce6b0811..f9e46334d77a059d5b9a930c3e87c14522e290fd 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
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("//testing/test.gni")
@@ -166,23 +167,27 @@ if (!(is_win && is_component_build)) {
sources = [
"media_service_unittest.cc",
+ "run_all_unittests.cc",
]
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",
- "//services/service_manager/public/cpp/test:run_all_service_tests",
"//testing/gmock",
"//testing/gtest",
]
data_deps = [
":media",
- ":test_manifest",
+ ":media_service_unittests_catalog_copy",
]
}
} # !(is_win && is_component_build)
@@ -215,3 +220,18 @@ service_manifest("pipeline_test_manifest") {
name = "media_pipeline_integration_unittests"
source = "pipeline_test_manifest.json"
}
+
+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",
+ ]
+}
« no previous file with comments | « mash/test/mash_unittests.cc ('k') | media/mojo/services/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698