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
779 B
Diff
24 lines
779 B
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Tue, 2 Nov 2021 14:35:00 +0000
|
|
Subject: Bug 1729455 - Ensure the libwebrtc system clock is not used. r=bwc
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D128244
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/3e8ac168ee3db089dd892bf140df53e15d6f0918
|
|
---
|
|
rtc_base/system_time.cc | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/rtc_base/system_time.cc b/rtc_base/system_time.cc
|
|
index d8a0026cfa..f918d629fa 100644
|
|
--- a/rtc_base/system_time.cc
|
|
+++ b/rtc_base/system_time.cc
|
|
@@ -12,6 +12,8 @@
|
|
// rtc::SystemTimeNanos() must be provided externally.
|
|
#ifndef WEBRTC_EXCLUDE_SYSTEM_TIME
|
|
|
|
+#error Mozilla: Must not use the built-in libwebrtc clock
|
|
+
|
|
#include <stdint.h>
|
|
|
|
#include <limits>
|