Reland "Link fewer X11-related libraries"
This is a reland of 829a5dce900b781376ea72ba5d869c5dbe58a82d
(unchanged)
Downstream is fixed in https://chromium-review.googlesource.com/1651786
Original change's description:
> Link fewer X11-related libraries
>
> Use an explicit list and don't add X11 dependency to rtc_base.
>
> Allow skipping code that depends on rarer extensions such as Xdamage, Xfixes.
>
> Bug: None
> Change-Id: Icb8d20a267358f5cd3f1ff2af31a669e0670d2f6
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140865
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Guido Urdaneta <guidou@webrtc.org>
> Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#28204}
Bug: None
Change-Id: I51c60f7713eb49889cebbca2242f33b81b0aef39
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141301
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28218}
diff --git a/webrtc.gni b/webrtc.gni
index 6ba8d0a..3a8592d 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -242,6 +242,10 @@
# Include tests in standalone checkout.
rtc_include_tests = !build_with_chromium && !build_with_mozilla
+
+ # Set this to false to skip building code that also requires X11 extensions
+ # such as Xdamage, Xfixes.
+ rtc_use_x11_extensions = rtc_use_x11
}
# Make it possible to provide custom locations for some libraries (move these
@@ -250,8 +254,9 @@
rtc_opus_dir = "//third_party/opus"
# Desktop capturer is supported only on Windows, OSX and Linux.
-rtc_desktop_capture_supported = (is_win && current_os != "winuwp") || is_mac ||
- (is_linux && (rtc_use_x11 || rtc_use_pipewire))
+rtc_desktop_capture_supported =
+ (is_win && current_os != "winuwp") || is_mac ||
+ (is_linux && (rtc_use_x11_extensions || rtc_use_pipewire))
###############################################################################
# Templates