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
101 lines
3.2 KiB
Diff
101 lines
3.2 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 10 Oct 2024 13:42:00 +0000
|
|
Subject: Bug 1921707 - webrtc.gni - filter out '//third_party/abseil-cpp/'
|
|
deps r=ng,webrtc-reviewers
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D224079
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/45b99d1ba95b46896506de1c7dd92f19e4dc9207
|
|
---
|
|
webrtc.gni | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 71 insertions(+)
|
|
|
|
diff --git a/webrtc.gni b/webrtc.gni
|
|
index bd0af3a4c5..33d81920f4 100644
|
|
--- a/webrtc.gni
|
|
+++ b/webrtc.gni
|
|
@@ -691,6 +691,36 @@ template("rtc_source_set") {
|
|
deps += [ "//third_party/abseil-cpp:absl" ]
|
|
}
|
|
}
|
|
+
|
|
+ # Rather than widespread changes to most, if not all, BUILD.gn files
|
|
+ # we'll do some filtering on dependencies here.
|
|
+ if (build_with_mozilla && defined(deps)) {
|
|
+ # Now that abseil-cpp is moved to Mozilla's third_party directory
|
|
+ # we remove all the abseil-cpp dependency listings so moz.build
|
|
+ # generation succeed.
|
|
+ filtered_deps = []
|
|
+ foreach (dep, deps) {
|
|
+ newdep = string_replace(dep, "//third_party/abseil-cpp/", "")
|
|
+ if (newdep == dep) {
|
|
+ filtered_deps += [ dep ]
|
|
+ }
|
|
+ }
|
|
+ deps = []
|
|
+ deps = filtered_deps
|
|
+
|
|
+ # We don't build any of the test code, but many of the test
|
|
+ # targets list gtest/gmock as a dependency. We can simply
|
|
+ # filter them out here.
|
|
+ filtered_deps = []
|
|
+ foreach (dep, deps) {
|
|
+ newdep = string_replace(dep, "//testing/g", "")
|
|
+ if (newdep == dep) {
|
|
+ filtered_deps += [ dep ]
|
|
+ }
|
|
+ }
|
|
+ deps = []
|
|
+ deps = filtered_deps
|
|
+ }
|
|
}
|
|
}
|
|
|
|
@@ -925,6 +955,47 @@ template("rtc_library") {
|
|
deps += [ "//third_party/abseil-cpp:absl" ]
|
|
}
|
|
}
|
|
+
|
|
+ # Rather than widespread changes to most, if not all, BUILD.gn files
|
|
+ # we'll do some filtering on dependencies here.
|
|
+ if (build_with_mozilla && defined(deps)) {
|
|
+ # Now that abseil-cpp is moved to Mozilla's third_party directory
|
|
+ # we remove all the abseil-cpp dependency listings so moz.build
|
|
+ # generation succeed.
|
|
+ filtered_deps = []
|
|
+ foreach (dep, deps) {
|
|
+ newdep = string_replace(dep, "//third_party/abseil-cpp/", "")
|
|
+ if (newdep == dep) {
|
|
+ filtered_deps += [ dep ]
|
|
+ }
|
|
+ }
|
|
+ deps = []
|
|
+ deps = filtered_deps
|
|
+
|
|
+ # We don't build any of the test code, but many of the test
|
|
+ # targets list gtest/gmock as a dependency. We can simply
|
|
+ # filter them out here.
|
|
+ filtered_deps = []
|
|
+ foreach (dep, deps) {
|
|
+ newdep = string_replace(dep, "//testing/g", "")
|
|
+ if (newdep == dep) {
|
|
+ filtered_deps += [ dep ]
|
|
+ }
|
|
+ }
|
|
+ deps = []
|
|
+ deps = filtered_deps
|
|
+
|
|
+ # Moving the google build directory requires looking for libwebrtc's
|
|
+ # third_party dependencies under libwebrtc/third_party instead of
|
|
+ # simply third_party.
|
|
+ modified_deps = []
|
|
+ foreach (dep, deps) {
|
|
+ newdep = string_replace(dep, "//third_party/", "//libwebrtc/third_party/")
|
|
+ modified_deps += [ newdep ]
|
|
+ }
|
|
+ deps = []
|
|
+ deps = modified_deps
|
|
+ }
|
|
}
|
|
}
|
|
|