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

Guard pipewire configs with rtc_use_pipewire.

Browse Source 
[1] has introduced two dependencies on
//modules/desktop_capture:pipewire_config
even when rtc_use_pipewire=false, this CL changes the guard in order to
make sure GN doesn't raise errors when is_linux=true and
rtc_use_pipewire=false.

[1] - https://webrtc-review.googlesource.com/c/src/+/160649

No-Try: True
Bug: chromium:682122
Change-Id: I28d2f10936dd75199a2a98862751708eb1e5615a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187122
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32345}
This commit is contained in:
Mirko Bonadei
2020-10-07 16:20:25 +02:00
committed by Commit Bot
parent f25590e00b
commit 4e8a797e14
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/desktop_capture/BUILD.gn
View File

@ -76,9 +76,8 @@ if (rtc_include_tests) {
"window_finder_unittest.cc", "window_finder_unittest.cc",
] ]
public_configs = [ ":x11_config" ] public_configs = [ ":x11_config" ]
if (is_linux) {
public_configs += [ ":pipewire_config" ]
if (rtc_use_pipewire) { if (rtc_use_pipewire) {
public_configs += [ ":pipewire_config" ]
configs += [ configs += [
":pipewire_config", ":pipewire_config",
":gio", ":gio",
@ -90,7 +89,6 @@ if (rtc_include_tests) {
deps += [ ":pipewire_stubs" ] deps += [ ":pipewire_stubs" ]
} }
} }
}
if (is_win) { if (is_win) {
deps += [ "../../rtc_base:win32" ] deps += [ "../../rtc_base:win32" ]
} }
@ -147,9 +145,8 @@ if (rtc_include_tests) {
} }
deps += [ ":desktop_capture_mock" ] deps += [ ":desktop_capture_mock" ]
public_configs = [ ":x11_config" ] public_configs = [ ":x11_config" ]
if (is_linux) {
public_configs += [ ":pipewire_config" ]
if (rtc_use_pipewire) { if (rtc_use_pipewire) {
public_configs += [ ":pipewire_config" ]
configs += [ configs += [
":pipewire_config", ":pipewire_config",
":gio", ":gio",
@ -163,7 +160,6 @@ if (rtc_include_tests) {
} }
} }
} }
}
rtc_library("screen_drawer") { rtc_library("screen_drawer") {
testonly = true testonly = true