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
25 lines
811 B
Diff
25 lines
811 B
Diff
From: Michael Froman <mjfroman@mac.com>
|
|
Date: Tue, 21 Jun 2022 11:11:09 -0500
|
|
Subject: Bug 1773223 - Generate webrtc moz.builds for all platforms at once.
|
|
r=mjf,firefox-build-system-reviewers,ahochheiden
|
|
|
|
---
|
|
build_overrides/build.gni | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
|
|
index 88b7ac3d38..57e8900e3e 100644
|
|
--- a/build_overrides/build.gni
|
|
+++ b/build_overrides/build.gni
|
|
@@ -50,6 +50,10 @@ if (host_os == "mac" || host_os == "linux") {
|
|
use_system_xcode = _result == 0
|
|
}
|
|
|
|
+use_system_xcode = false
|
|
+xcode_version = "10.15"
|
|
+mac_xcode_version = "default"
|
|
+
|
|
declare_args() {
|
|
# WebRTC doesn't depend on //base from production code but only for testing
|
|
# purposes. In any case, it doesn't depend on //third_party/perfetto which
|