From cf7802d3f4c4e69bf6e6536b8b421efd4ee7371f Mon Sep 17 00:00:00 2001 From: Ryan Keane Date: Fri, 10 Jun 2022 21:33:18 +0000 Subject: [PATCH] [Cast Convergence] Replace is_chromecast with new args Replace `is_chromecast` with `is_castos` and `is_cast_android` as appropriate. See linked bug for further context. Bug: chromium:1219802 Change-Id: If24af59e058940b7259cf4f1d9a3ba2ee0449cdb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265601 Reviewed-by: Henrik Andreassson Reviewed-by: David Dorwin Reviewed-by: Mark Foltz Commit-Queue: Ryan Keane Cr-Commit-Position: refs/heads/main@{#37230} --- modules/desktop_capture/BUILD.gn | 4 ++-- webrtc.gni | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index 64ce1a2bf3..0c59ecd38d 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -287,7 +287,7 @@ if (is_linux || is_chromeos) { # Chromecast build config overrides `WEBRTC_USE_PIPEWIRE` even when # `rtc_use_pipewire` is not set, which causes pipewire_config to not be # included in targets. More details in: webrtc:13898 - if (is_linux && !is_chromecast) { + if (is_linux && !is_castos) { defines += [ "WEBRTC_USE_GIO" ] } } @@ -396,7 +396,7 @@ rtc_library("desktop_capture_generic") { "window_finder.cc", "window_finder.h", ] - if (is_linux && !is_chromecast && rtc_use_pipewire) { + if (is_linux && !is_castos && rtc_use_pipewire) { sources += [ "desktop_capture_metadata.h" ] } if (is_mac) { diff --git a/webrtc.gni b/webrtc.gni index 264f0d6863..c91c25ba0d 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -65,7 +65,7 @@ declare_args() { # When WebRTC is built as part of Chromium it should exclude the default # implementation of field_trial unless it is building for NACL or # Chromecast. - rtc_exclude_field_trial_default = !is_nacl && !is_chromecast + rtc_exclude_field_trial_default = !is_nacl && !is_castos && !is_cast_android } else { rtc_exclude_field_trial_default = false }