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
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 5 Oct 2023 14:21:00 +0000
|
|
Subject: Bug 1857037 - pt1 - add shim gni files to limit BUILD.gn changes.
|
|
r=ng,webrtc-reviewers
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D190104
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/a84d39db037cbe34aa19588b0d18335eb5e2d79b
|
|
---
|
|
testing/libfuzzer/fuzzer_test.gni | 2 ++
|
|
testing/test.gni | 2 ++
|
|
2 files changed, 4 insertions(+)
|
|
create mode 100644 testing/libfuzzer/fuzzer_test.gni
|
|
create mode 100644 testing/test.gni
|
|
|
|
diff --git a/testing/libfuzzer/fuzzer_test.gni b/testing/libfuzzer/fuzzer_test.gni
|
|
new file mode 100644
|
|
index 0000000000..8fdf3cdad2
|
|
--- /dev/null
|
|
+++ b/testing/libfuzzer/fuzzer_test.gni
|
|
@@ -0,0 +1,2 @@
|
|
+# "empty" file in place of importing new testing/libfuzzer
|
|
+# to allow BUILD.gn imports to succeed.
|
|
diff --git a/testing/test.gni b/testing/test.gni
|
|
new file mode 100644
|
|
index 0000000000..f46fa82778
|
|
--- /dev/null
|
|
+++ b/testing/test.gni
|
|
@@ -0,0 +1,2 @@
|
|
+# "empty" file in place of importing new testing/test.gni
|
|
+# to allow BUILD.gn imports to succeed.
|