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

Commit 3fb94a4

Browse files
Guido UrdanetaCommit Bot
authored andcommitted
Revert "Guard pipewire configs with rtc_use_pipewire."
This reverts commit 4e8a797. Reason for revert: Required to revert CL causing compile problems that prevent rolling into chrome. See https://ci.chromium.org/p/chromium/builders/try/cast_shell_linux/726007 https://chromium-review.googlesource.com/c/chromium/src/+/2461647 Original change's description: > 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} [email protected],[email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:682122 Change-Id: Ifc493c0789520b6aa163390c382b6aaff9d732a8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187353 Reviewed-by: Guido Urdaneta <[email protected]> Commit-Queue: Guido Urdaneta <[email protected]> Cr-Commit-Position: refs/heads/master@{#32364}
1 parent 09bd9ba commit 3fb94a4

File tree

1 file changed

+24
-20
lines changed

1 file changed

+24
-20
lines changed

modules/desktop_capture/BUILD.gn

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,19 @@ if (rtc_include_tests) {
7676
"window_finder_unittest.cc",
7777
]
7878
public_configs = [ ":x11_config" ]
79-
if (rtc_use_pipewire) {
79+
if (is_linux) {
8080
public_configs += [ ":pipewire_config" ]
81-
configs += [
82-
":pipewire_config",
83-
":gio",
84-
]
85-
86-
if (rtc_link_pipewire) {
87-
configs += [ ":pipewire" ]
88-
} else {
89-
deps += [ ":pipewire_stubs" ]
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+
}
9092
}
9193
}
9294
if (is_win) {
@@ -145,17 +147,19 @@ if (rtc_include_tests) {
145147
}
146148
deps += [ ":desktop_capture_mock" ]
147149
public_configs = [ ":x11_config" ]
148-
if (rtc_use_pipewire) {
150+
if (is_linux) {
149151
public_configs += [ ":pipewire_config" ]
150-
configs += [
151-
":pipewire_config",
152-
":gio",
153-
]
154-
155-
if (rtc_link_pipewire) {
156-
configs += [ ":pipewire" ]
157-
} else {
158-
deps += [ ":pipewire_stubs" ]
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+
}
159163
}
160164
}
161165
}

0 commit comments

Comments
 (0)