0

Revert "[Cast Convergence] Remove is_chromecast."

This reverts commit e5db674bc3.

Reason for revert: Failing on offical builders https://ci.chromium.org/ui/p/chrome/builders/ci/linux64/88303/overview

Original change's description:
> [Cast Convergence] Remove is_chromecast.
>
> No usages remain outside of this file.
>
> Bug: 1219802
> Change-Id: Ib3830d87c7bb494bdbdd0fc8cb80d05cad035a23
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3897149
> Reviewed-by: Sean Topping <seantopping@chromium.org>
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Commit-Queue: Mark Foltz <mfoltz@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1048751}

Bug: 1219802
Change-Id: I02f56a50f2bb471df861ccde0422f0cd6a866c06
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3905305
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Sean Topping <seantopping@chromium.org>
Owners-Override: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1048771}
This commit is contained in:
Dave Tapuska
2022-09-19 20:34:34 +00:00
committed by Chromium LUCI CQ
parent 44c8b25a21
commit 53acd00d6c
2 changed files with 21 additions and 3 deletions

@@ -37,6 +37,10 @@ buildflag_header("chromecast_buildflags") {
"IS_CASTOS=$is_castos", "IS_CASTOS=$is_castos",
"IS_CAST_ANDROID=$is_cast_android", "IS_CAST_ANDROID=$is_cast_android",
"ENABLE_CAST_RECEIVER=$enable_cast_receiver", "ENABLE_CAST_RECEIVER=$enable_cast_receiver",
# TODO(crbug.com/1219802): IS_CHROMECAST is deprecated and will be removed.
# The above flags should be used instead.
"IS_CHROMECAST=$is_chromecast",
] ]
} }

@@ -8,6 +8,13 @@
# #
# TODO(crbug.com/1294964): Rename this file after is_chromecast is removed. # TODO(crbug.com/1294964): Rename this file after is_chromecast is removed.
declare_args() { declare_args() {
# DEPRECATED. This flag will be removed in the future; see https://crbug.com/1219802.
#
# New code should use enable_cast_receiver if the feature in question is
# required for all Cast-enabled browsers, or an alternative buildflag if it is
# for specific types of devices.
is_chromecast = false
# Set this true for an audio-only Chromecast build. # Set this true for an audio-only Chromecast build.
# TODO(crbug.com/1293538): Replace with a buildflag for speaker-only builds not # TODO(crbug.com/1293538): Replace with a buildflag for speaker-only builds not
# specific to Cast. # specific to Cast.
@@ -33,15 +40,16 @@ declare_args() {
# Set this to false to use the defaults for Android. # Set this to false to use the defaults for Android.
is_cast_android = false is_cast_android = false
} }
# Restrict is_castos and is_cast_android to only be set on the target toolchain.
is_castos = is_castos && current_toolchain == default_toolchain is_castos = is_castos && current_toolchain == default_toolchain
is_cast_android = is_cast_android && current_toolchain == default_toolchain is_cast_android = is_cast_android && current_toolchain == default_toolchain
declare_args() { declare_args() {
# Set this true for a Chromecast build. Chromecast builds are supported on # Set this true for a Chromecast build. Chromecast builds are supported on
# Linux, Android, ChromeOS, and Fuchsia. # Linux, Android, ChromeOS, and Fuchsia.
enable_cast_receiver = false #
# During the migration from is_chromecast, this must be set to the same value
# as is_chromecast.
enable_cast_receiver = is_chromecast
} }
declare_args() { declare_args() {
@@ -114,6 +122,9 @@ assert(is_linux || is_chromeos || is_android || is_fuchsia ||
assert(enable_cast_receiver || !is_cast_audio_only, assert(enable_cast_receiver || !is_cast_audio_only,
"is_cast_audio_only = true requires enable_cast_receiver = true.") "is_cast_audio_only = true requires enable_cast_receiver = true.")
assert(enable_cast_receiver || !is_chromecast,
"is_chromecast = true requires enable_cast_receiver = true.")
assert(enable_cast_receiver || !is_castos, assert(enable_cast_receiver || !is_castos,
"is_castos = true requires enable_cast_receiver = true.") "is_castos = true requires enable_cast_receiver = true.")
assert(is_linux || !is_castos, "is_castos = true requires is_linux = true.") assert(is_linux || !is_castos, "is_castos = true requires is_linux = true.")
@@ -122,3 +133,6 @@ assert(enable_cast_receiver || !is_cast_android,
"is_cast_android = true requires enable_cast_receiver = true.") "is_cast_android = true requires enable_cast_receiver = true.")
assert(is_android || !is_cast_android, assert(is_android || !is_cast_android,
"is_cast_android = true requires is_android = true.") "is_cast_android = true requires is_android = true.")
assert(!is_fuchsia || !is_chromecast,
"is_chromecast is no longer supported on Fuchsia.")