961e87ca91
Upstream commit: https://webrtc.googlesource.com/src/+/b85686c8bf1aca57b0bb0183798235f134ed1aa2 Reland "more p2p cleanups" This reverts commit 995688c8e85b520d50961486abbe0cc03eae9558. Reason for revert: Fix the chromium problem Original change's description: > Revert "more p2p cleanups" > > This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. > > Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview > > Original change's description: > > more p2p cleanups > > > > Move test code from p2p/base and rtc_base/ into p2p/test/ > > This p2p/base much less crowded and > > clarifies that the rtc_base/nat* is in fact only test code. > > > > BUG=webrtc:0 > > > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#43995} > > Bug: webrtc:0 > Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> > Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43999} Bug: webrtc:0 Change-Id: Iab861b1509c738f4ce8c68301dcc107ccb2d6915 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379161 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Auto-Submit: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44006} Differential Revision: https://phabricator.services.mozilla.com/D244016
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Thu, 23 May 2024 17:28:00 +0000
|
|
Subject: Bug 1897459 - P0 - for BSD do not build physical_socket_server in
|
|
libwebrtc;r=mjf,webrtc-reviewers
|
|
|
|
libwebrtc added the use of several non-portable socket options in this code.
|
|
Firefox does not use any of the code in this file, but there is a header dependency chain leading from code that is used.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D210858
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/4e7b3c485e549e7e35b227b517acadbbad957004
|
|
---
|
|
rtc_base/BUILD.gn | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
|
|
index b9c5a66147..11c68d5fcd 100644
|
|
--- a/rtc_base/BUILD.gn
|
|
+++ b/rtc_base/BUILD.gn
|
|
@@ -979,6 +979,12 @@ rtc_library("threading") {
|
|
"thread.cc",
|
|
"thread.h",
|
|
]
|
|
+ if (is_bsd && build_with_mozilla) {
|
|
+ sources -= [
|
|
+ "physical_socket_server.cc",
|
|
+ "physical_socket_server.h",
|
|
+ ]
|
|
+ }
|
|
deps = [
|
|
":async_dns_resolver",
|
|
":byte_order",
|