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

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

Issue 1649933002: [Chromecast] Hook up mojo media pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted unnecessary changes Created 4 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
Index: media/mojo/services/BUILD.gn
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index d7581c005bc9763a5d59023dd811033e846b97d9..09c69c9e6d1340ed6623cfb248f5005b0a7185e3 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -80,26 +80,6 @@ source_set("proxy") {
]
}
-source_set("media_client") {
- sources = [
- "mojo_media_client.cc",
- "mojo_media_client.h",
- ]
- if (is_android) {
- sources += [ "android_mojo_media_client.cc" ]
- } else {
- sources += [ "default_mojo_media_client.cc" ]
- }
-
- public_configs = [ ":enable_mojo_media_config" ]
-
- deps = [
- "//base",
- "//media",
- "//media:shared_memory_support",
- ]
-}
-
source_set("cdm_service") {
deps = [
":converters",
@@ -154,10 +134,10 @@ source_set("renderer_service") {
]
}
-source_set("application") {
+source_set("service_factory") {
sources = [
- "mojo_media_application.cc",
- "mojo_media_application.h",
+ "mojo_media_client.cc",
+ "mojo_media_client.h",
"service_factory_impl.cc",
"service_factory_impl.h",
]
@@ -166,11 +146,25 @@ source_set("application") {
deps = [
":cdm_service",
- ":media_client",
":renderer_service",
- "//base",
- "//mojo/public/c/system:for_component",
- "//mojo/shell/public/cpp",
+ ]
+}
+
+source_set("application") {
+ sources = [
+ "mojo_media_application.cc",
+ "mojo_media_application.h",
+ ]
+ if (is_android) {
+ sources += [ "android_mojo_media_client.cc" ]
+ } else {
+ sources += [ "default_mojo_media_client.cc" ]
+ }
+
+ public_configs = [ ":enable_mojo_media_config" ]
+
+ deps = [
+ ":service_factory",
]
}
« chromecast/media/mojo/cast_media_client.h ('K') | « chromecast/media/mojo/cast_media_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698