Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 4e8a797

Browse files
MirkoBonadeiCommit Bot
authored andcommitted
Guard pipewire configs with rtc_use_pipewire.
[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 <[email protected]> Reviewed-by: Tommi <[email protected]> Cr-Commit-Position: refs/heads/master@{#32345}
1 parent f25590e commit 4e8a797

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

modules/desktop_capture/BUILD.gn

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,17 @@ if (rtc_include_tests) {
7676
"window_finder_unittest.cc",
7777
]
7878
public_configs = [ ":x11_config" ]
79-
if (is_linux) {
79+
if (rtc_use_pipewire) {
8080
public_configs += [ ":pipewire_config" ]
81-
if (rtc_use_pipewire) {
82-
configs += [
83-
":pipewire_config",
84-
":gio",
85-
]
86-
87-
if (rtc_link_pipewire) {
88-
configs += [ ":pipewire" ]
89-
} else {
90-
deps += [ ":pipewire_stubs" ]
91-
}
81+
configs += [
82+
":pipewire_config",
83+
":gio",
84+
]
85+
86+
if (rtc_link_pipewire) {
87+
configs += [ ":pipewire" ]
88+
} else {
89+
deps += [ ":pipewire_stubs" ]
9290
}
9391
}
9492
if (is_win) {
@@ -147,19 +145,17 @@ if (rtc_include_tests) {
147145
}
148146
deps += [ ":desktop_capture_mock" ]
149147
public_configs = [ ":x11_config" ]
150-
if (is_linux) {
148+
if (rtc_use_pipewire) {
151149
public_configs += [ ":pipewire_config" ]
152-
if (rtc_use_pipewire) {
153-
configs += [
154-
":pipewire_config",
155-
":gio",
156-
]
157-
158-
if (rtc_link_pipewire) {
159-
configs += [ ":pipewire" ]
160-
} else {
161-
deps += [ ":pipewire_stubs" ]
162-
}
150+
configs += [
151+
":pipewire_config",
152+
":gio",
153+
]
154+
155+
if (rtc_link_pipewire) {
156+
configs += [ ":pipewire" ]
157+
} else {
158+
deps += [ ":pipewire_stubs" ]
163159
}
164160
}
165161
}

0 commit comments

Comments
 (0)