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
27 lines
1020 B
Diff
27 lines
1020 B
Diff
From: Byron Campen <docfaraday@gmail.com>
|
|
Date: Fri, 26 Jul 2024 09:26:00 -0500
|
|
Subject: Bug 1909234 - (fix-a0d1a51217) Move this errant include where it
|
|
belongs. r?mjf
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/6baf67202c67b27c6464cb8e4dbb419485aa6c4c
|
|
---
|
|
api/test/network_emulation/BUILD.gn | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/api/test/network_emulation/BUILD.gn b/api/test/network_emulation/BUILD.gn
|
|
index 6ff83717d4..cb535a5f84 100644
|
|
--- a/api/test/network_emulation/BUILD.gn
|
|
+++ b/api/test/network_emulation/BUILD.gn
|
|
@@ -6,10 +6,10 @@
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
-import("//third_party/protobuf/proto_library.gni")
|
|
import("../../../webrtc.gni")
|
|
|
|
if (rtc_enable_protobuf) {
|
|
+ import("//third_party/protobuf/proto_library.gni")
|
|
proto_library("network_config_schedule_proto") {
|
|
visibility = [ "*" ]
|
|
sources = [ "network_config_schedule.proto" ]
|