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
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 10 Oct 2024 13:42:00 +0000
|
|
Subject: Bug 1921707 - add filtering for new build directory location in
|
|
third_party/libwebrtc/webrtc.gni r=ng,webrtc-reviewers
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D224545
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f18c05287ce831369f44715a4174facff4f12652
|
|
---
|
|
webrtc.gni | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/webrtc.gni b/webrtc.gni
|
|
index 7e6602dfd7..fe68d3317d 100644
|
|
--- a/webrtc.gni
|
|
+++ b/webrtc.gni
|
|
@@ -542,7 +542,7 @@ template("rtc_test") {
|
|
min_sdk_version = 21
|
|
target_sdk_version = 24
|
|
deps += [
|
|
- "//build/android/gtest_apk:native_test_instrumentation_test_runner_java",
|
|
+ "//chromium/build/android/gtest_apk:native_test_instrumentation_test_runner_java",
|
|
webrtc_root + "sdk/android:native_test_jni_onload",
|
|
webrtc_root + "sdk/android:base_java",
|
|
webrtc_root + "test:native_test_java",
|
|
@@ -991,11 +991,21 @@ template("rtc_library") {
|
|
modified_deps = []
|
|
foreach (dep, deps) {
|
|
newdep = string_replace(dep, "//third_party/", "//libwebrtc/third_party/")
|
|
+ newdep = string_replace(newdep, "//build", "//chromium/build")
|
|
modified_deps += [ newdep ]
|
|
}
|
|
deps = []
|
|
deps = modified_deps
|
|
}
|
|
+ if (build_with_mozilla && defined(data_deps)) {
|
|
+ modified_deps = []
|
|
+ foreach (dep, data_deps) {
|
|
+ newdep = string_replace(dep, "//build/", "//chromium/build/")
|
|
+ modified_deps += [ newdep ]
|
|
+ }
|
|
+ data_deps = []
|
|
+ data_deps = modified_deps
|
|
+ }
|
|
}
|
|
}
|
|
|
|
@@ -1033,7 +1043,7 @@ template("rtc_executable") {
|
|
if (is_win) {
|
|
deps += [
|
|
# Give executables the default manifest on Windows (a no-op elsewhere).
|
|
- "//build/win:default_exe_manifest",
|
|
+ "//chromium/build/win:default_exe_manifest",
|
|
]
|
|
}
|
|
|