summaryrefslogtreecommitdiff
path: root/chromium/chromecast/chromecast.gni
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-16 11:45:35 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-17 08:59:23 +0000
commit552906b0f222c5d5dd11b9fd73829d510980461a (patch)
tree3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/chromecast/chromecast.gni
parent1b05827804eaf047779b597718c03e7d38344261 (diff)
downloadqtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chromecast/chromecast.gni')
-rw-r--r--chromium/chromecast/chromecast.gni14
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni
index 2945bf5e82e..6feaaaefe4d 100644
--- a/chromium/chromecast/chromecast.gni
+++ b/chromium/chromecast/chromecast.gni
@@ -104,9 +104,6 @@ declare_args() {
# cast CMA media backend and supporting Widevine or Playready.
disable_secure_flac_and_opus_decoding = false
- # Set to true to enable wayland server
- enable_cast_wayland_server = false
-
# Set to true to enable mixing in CastAudioManager. Only needed on devices
# that do not have a mixer in the CMA backend.
enable_cast_audio_manager_mixer =
@@ -159,7 +156,16 @@ if (chromecast_branding == "public") {
# in //build/config/locales.gni.
cast_locales = locales
-enable_chromecast_extensions = enable_extensions
+# Android currently supports more locales than Desktop and ChromeOS.
+# If Cast will also the android files update this and the Cast grd files.
+if (is_android) {
+ # Subtract out additional Android locales
+ cast_locales -= android_bundle_only_locales
+}
+
+declare_args() {
+ enable_chromecast_extensions = enable_extensions
+}
# Use Chromecast CDMs for protected content. Some Android platforms use
# MediaDrm for CDM support.