06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 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} Differential Revision: https://phabricator.services.mozilla.com/D244009
23 lines
792 B
Diff
23 lines
792 B
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Fri, 7 Feb 2025 16:26:00 -0600
|
|
Subject: Bug 1942428 - (fix-e500d46600) upstream removed p2p:rtc_p2p
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0155a8718d5d7f23b8391a1d04b1196e30127dad
|
|
---
|
|
BUILD.gn | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
|
index d3caa21e77..f0f6d6a103 100644
|
|
--- a/BUILD.gn
|
|
+++ b/BUILD.gn
|
|
@@ -599,7 +599,7 @@ if (!build_with_chromium) {
|
|
"api/video_codecs:video_encoder_factory_template_libvpx_vp9_adapter",
|
|
"api/video_codecs:video_encoder_factory_template_open_h264_adapter",
|
|
"logging:rtc_event_log_api",
|
|
- "p2p:rtc_p2p",
|
|
+# "p2p:rtc_p2p",
|
|
"pc:libjingle_peerconnection",
|
|
"pc:rtc_pc",
|
|
"sdk",
|