zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Cast Convergence] Replace is_chromecast with new args

Browse Source 
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 <henrika@webrtc.org>
Reviewed-by: David Dorwin <ddorwin@google.com>
Reviewed-by: Mark Foltz <mfoltz@chromium.org>
Commit-Queue: Ryan Keane <rwkeane@google.com>
Cr-Commit-Position: refs/heads/main@{#37230}
This commit is contained in:
Ryan Keane
2022-06-10 21:33:18 +00:00
committed by WebRTC LUCI CQ
parent 88b8c5280e
commit cf7802d3f4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/desktop_capture/BUILD.gn
View File

@ -287,7 +287,7 @@ if (is_linux || is_chromeos) {
# Chromecast build config overrides `WEBRTC_USE_PIPEWIRE` even when # Chromecast build config overrides `WEBRTC_USE_PIPEWIRE` even when
# `rtc_use_pipewire` is not set, which causes pipewire_config to not be # `rtc_use_pipewire` is not set, which causes pipewire_config to not be
# included in targets. More details in: webrtc:13898 # included in targets. More details in: webrtc:13898
if (is_linux && !is_chromecast) { if (is_linux && !is_castos) {
defines += [ "WEBRTC_USE_GIO" ] defines += [ "WEBRTC_USE_GIO" ]
} }
} }
@ -396,7 +396,7 @@ rtc_library("desktop_capture_generic") {
"window_finder.cc", "window_finder.cc",
"window_finder.h", "window_finder.h",
] ]
if (is_linux && !is_chromecast && rtc_use_pipewire) { if (is_linux && !is_castos && rtc_use_pipewire) {
sources += [ "desktop_capture_metadata.h" ] sources += [ "desktop_capture_metadata.h" ]
} }
if (is_mac) { if (is_mac) {

2
webrtc.gni
View File

@ -65,7 +65,7 @@ declare_args() {
# When WebRTC is built as part of Chromium it should exclude the default # When WebRTC is built as part of Chromium it should exclude the default
# implementation of field_trial unless it is building for NACL or # implementation of field_trial unless it is building for NACL or
# Chromecast. # Chromecast.
rtc_exclude_field_trial_default = !is_nacl && !is_chromecast rtc_exclude_field_trial_default = !is_nacl && !is_castos && !is_cast_android
} else { } else {
rtc_exclude_field_trial_default = false rtc_exclude_field_trial_default = false
} }