Nico Grunbaum
2e3e260bd1
Upstream commit: https://webrtc.googlesource.com/src/+/b2887131ee7872b53724e7b9e7d67aab7b18d9b5 Adds rust version of webrtc::RateTracker This includes some updates to how units FFI is exposed and removes the previous bridge tests as now we have real tests for cxx bridges. Bug: webrtc:416446214 Change-Id: I027e68b4521e14d5a1687dd0f0d03ed16a6a6964 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/470180 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Auto-Submit: Evan Shrubsole <eshr@webrtc.org> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Reviewed-by: Victor Boivie <boivie@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47663}
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 8b43c67c88..7416d4b176 100644
|
|
--- a/webrtc.gni
|
|
+++ b/webrtc.gni
|
|
@@ -536,7 +536,7 @@ template("rtc_test") {
|
|
min_sdk_version = 23
|
|
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",
|
|
@@ -997,11 +997,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
|
|
+ }
|
|
}
|
|
}
|
|
|
|
@@ -1039,7 +1049,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",
|
|
]
|
|
}
|
|
|