1 files changed, 20 insertions, 11 deletions
diff --git a/chromium/build/config/chromecast_build.gni b/chromium/build/config/chromecast_build.gni
index 3702acc7514..b2640f55878 100644
--- a/chromium/build/config/chromecast_build.gni
+++ b/chromium/build/config/chromecast_build.gni
@@ -41,9 +41,10 @@ declare_args() {
 }
 
 declare_args() {
-  # True to enable the cast renderer.  It is enabled by default for non-android
-  # builds.
-  enable_cast_renderer = is_chromecast && !is_android
+  # True to enable the cast renderer.  It is enabled by default for linux and
+  # android audio only builds.
+  enable_cast_renderer =
+      is_chromecast && (is_linux || (is_cast_audio_only && is_android))
 }
 
 # Configures media options for cast.  See media/media_options.gni
@@ -51,22 +52,30 @@ cast_mojo_media_services = []
 cast_mojo_media_host = "none"
 
 if (enable_cast_renderer) {
+  # In this path, mojo media services are hosted in two processes:
+  # 1. "renderer" and "cdm" run in browser process. This is hard coded in the
+  # code.
+  # 2. "video_decoder" runs in the process specified by "cast_mojo_media_host".
   cast_mojo_media_services = [
     "cdm",
     "renderer",
   ]
-  cast_mojo_media_host = "browser"
-} else if (is_android) {
+
+  if (!is_cast_audio_only) {
+    cast_mojo_media_services += [ "video_decoder" ]
+  }
+
+  cast_mojo_media_host = "gpu"
+} else if (is_android && !is_cast_audio_only) {
+  # On Android, all the enabled mojo media services run in the process specified
+  # by "cast_mojo_media_host".
   cast_mojo_media_services = [
     "cdm",
     "audio_decoder",
+    "video_decoder",
   ]
-  if (is_cast_audio_only) {
-    cast_mojo_media_host = "browser"
-  } else {
-    cast_mojo_media_services += [ "video_decoder" ]
-    cast_mojo_media_host = "gpu"
-  }
+
+  cast_mojo_media_host = "gpu"
 }
 
 # Assert that Chromecast is being built for a supported platform.