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
24 lines
783 B
Diff
24 lines
783 B
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Fri, 17 May 2024 22:30:00 -0500
|
|
Subject: Bug 1897501 - (fix-09bb4f09e1) keep default python intepreter as
|
|
python3
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b21ca84c8b2620a98515624de0e43a237698726c
|
|
---
|
|
.gn | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/.gn b/.gn
|
|
index 6c011fd453..01bb0e7b02 100644
|
|
--- a/.gn
|
|
+++ b/.gn
|
|
@@ -13,7 +13,7 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
|
|
|
|
# The python interpreter to use by default. On Windows, this will look
|
|
# for vpython3.exe and vpython3.bat.
|
|
-script_executable = "vpython3"
|
|
+script_executable = "python3"
|
|
|
|
# The secondary source root is a parallel directory tree where
|
|
# GN build files are placed when they can not be placed directly
|