diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/chromecast/chromecast.gni | |
parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chromecast/chromecast.gni')
-rw-r--r-- | chromium/chromecast/chromecast.gni | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni index 69116c6b5e7..75cf2fc4390 100644 --- a/chromium/chromecast/chromecast.gni +++ b/chromium/chromecast/chromecast.gni @@ -5,15 +5,12 @@ import("//build/config/chromecast_build.gni") import("//build/config/locales.gni") import("//extensions/buildflags/buildflags.gni") +import("//media/media_options.gni") # This args block should contain arguments used within the //chromecast # directory. Arguments which are used in other Chrome components should # be instead declared in //build/config/chromecast_build.gni. declare_args() { - # chromecast_branding is used to include or exclude Google-branded components. - # Set it to "public" for a Chromium build. - chromecast_branding = "public" - # The incremental build number. The Cast automated builders will set this # value to indicate the buildset. Note: The default value should be greater # than any value the builder may assign to prevent attempted automatic updates @@ -49,6 +46,10 @@ declare_args() { # Set true for builds targeting Android Things. is_android_things = false + # Set true if the platform works as a single volume device, mapping all + # volume streams to a single one. + is_single_volume = false + # Set to true to start music apps in headless mode. enable_headless_music_mode = false @@ -82,6 +83,11 @@ declare_args() { # unified flag to pick monotonic_clock OR monotonic_clock_raw media_clock_monotonic_raw = !is_android && !is_cast_desktop_build + + # Include 'Android' in user agent string to avoid being served desktop + # versions of websites. + # TODO(halliwell): consider making this default for all Cast hardware. + use_android_user_agent = false } declare_args() { @@ -113,6 +119,12 @@ cast_locales = locales enable_chromecast_extensions = enable_extensions +# Use Chromecast CDMs for protected content. Some Android platforms use +# MediaDrm for CDM support. +declare_args() { + use_chromecast_cdms = is_cast_using_cma_backend +} + foreach(target_type, [ "executable", |