961e87ca91
Upstream commit: https://webrtc.googlesource.com/src/+/b85686c8bf1aca57b0bb0183798235f134ed1aa2 Reland "more p2p cleanups" This reverts commit 995688c8e85b520d50961486abbe0cc03eae9558. Reason for revert: Fix the chromium problem Original change's description: > 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} Bug: webrtc:0 Change-Id: Iab861b1509c738f4ce8c68301dcc107ccb2d6915 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379161 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Auto-Submit: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44006} Differential Revision: https://phabricator.services.mozilla.com/D244016
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Mon, 24 Oct 2022 13:00:00 -0500
|
|
Subject: Bug 1797161 - pt1 - tweak BUILD.gn around task_queue_win usage. r?ng!
|
|
|
|
Add assurance that we will not build task_queue_win.cc to avoid
|
|
possible win32k API usage.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D160115
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f097eb8cbd8b7686ce306a46a4db691194fd39c1
|
|
---
|
|
api/task_queue/BUILD.gn | 5 +++++
|
|
rtc_base/BUILD.gn | 4 ++++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn
|
|
index c1c917abb2..de937ccf7e 100644
|
|
--- a/api/task_queue/BUILD.gn
|
|
+++ b/api/task_queue/BUILD.gn
|
|
@@ -29,6 +29,11 @@ rtc_library("task_queue") {
|
|
]
|
|
}
|
|
|
|
+# Mozilla - we want to ensure that rtc_include_tests is set to false
|
|
+# to guarantee that default_task_queue_factory is not used so we
|
|
+# know that remaining win32k code in task_queue_win.cc is not built.
|
|
+# See Bug 1797161 for more info.
|
|
+assert(!rtc_include_tests, "Mozilla - verify rtc_include_tests is off")
|
|
if (rtc_include_tests) {
|
|
rtc_library("task_queue_test") {
|
|
visibility = [ "*" ]
|
|
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
|
|
index b1e53c16c7..b9c5a66147 100644
|
|
--- a/rtc_base/BUILD.gn
|
|
+++ b/rtc_base/BUILD.gn
|
|
@@ -669,10 +669,14 @@ if (is_mac || is_ios) {
|
|
if (is_win) {
|
|
rtc_library("rtc_task_queue_win") {
|
|
visibility = [ "../api/task_queue:default_task_queue_factory" ]
|
|
+# See Bug 1797161 for more info. Remove from build until win32k
|
|
+# usage is removed.
|
|
+if (!build_with_mozilla) {
|
|
sources = [
|
|
"task_queue_win.cc",
|
|
"task_queue_win.h",
|
|
]
|
|
+}
|
|
deps = [
|
|
":checks",
|
|
":logging",
|