Michael Froman
f70f3b0dfc
Upstream commit: https://webrtc.googlesource.com/src/+/04964db74ddc63236c30b7e3e38e78f43cdd3536 build: consolidate the iOS XCTest main() into rtc_test() Bug: webrtc:467294026 Change-Id: Ic1b515bc0ee7bd64d0a16b841dc4ec74025cdb34 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/455740 Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com> Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48192}
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 10 Jul 2025 20:03:00 +0000
|
|
Subject: Bug 1975060 - improve build file generation regarding x11 usage.
|
|
r=dbaker
|
|
|
|
Upstream will be removing use_x11. We override the use_x11 settings
|
|
from within gn_processor.py anyway, so we can remove our hack in
|
|
third_party/libwebrtc/webrtc.gni, and then make gn_processor.py modify
|
|
ozone_platform_x11 rather than use_x11.
|
|
|
|
Note: these changes produce identical moz.build files for libwebrtc
|
|
and abseil-cpp.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D255713
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c8cf67108972d5caefbfbb66146e26e5358493c2
|
|
---
|
|
webrtc.gni | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/webrtc.gni b/webrtc.gni
|
|
index 950eda1204..a5b7b51b19 100644
|
|
--- a/webrtc.gni
|
|
+++ b/webrtc.gni
|
|
@@ -132,7 +132,7 @@ declare_args() {
|
|
rtc_build_tools = false
|
|
|
|
# Set this to false to skip building code that requires X11.
|
|
- rtc_use_x11 = use_x11
|
|
+ rtc_use_x11 = ozone_platform_x11
|
|
|
|
# Set this to use PipeWire on the Wayland display server.
|
|
# By default it's only enabled on desktop Linux (excludes ChromeOS) and
|