commit 44c5e08d3f21cac853b89f136586875c8860f620 parent 4be0606fef1bb812473db68342c63ff5344dd0f2 Author: Michael Froman <mfroman@mozilla.com> Date: Thu, 9 Oct 2025 23:36:13 -0500 Bug 1993083 - Vendor libwebrtc from 4f787cd5a3 Upstream commit: https://webrtc.googlesource.com/src/+/4f787cd5a3f9a7a27a9143d5f6065733d1fd6a41 Reland "Remove jni_generator_helper.h from WebRTC" This is a reland of commit b690d7eb3521c90ae78c0abf5e7454201855b953 Original change's description: > Remove jni_generator_helper.h from WebRTC > > Bug: b/325408567, b/319078685, b/351773023 > Change-Id: I84c168b4ef8c6936e2644ad85edda8687c6c491a > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/401480 > Reviewed-by: Jeremy Leconte <jleconte@google.com> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#45191} Bug: b/325408567, b/319078685, b/351773023 Change-Id: I62a2f0f8cb3c7f8b05c1938665d0dd8f9e1cf1a7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/401601 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Jeremy Leconte <jleconte@google.com> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45221} Diffstat:
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-10T04:34:58.875915+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-10T04:36:03.801562+00:00. # base of lastest vendoring -c966155b15 +4f787cd5a3 diff --git a/third_party/libwebrtc/examples/androidnativeapi/BUILD.gn b/third_party/libwebrtc/examples/androidnativeapi/BUILD.gn @@ -31,7 +31,6 @@ if (is_android) { testonly = true sources = [ "java/org/webrtc/examples/androidnativeapi/CallClient.java" ] namespace = "webrtc_examples" - jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } rtc_shared_library("examples_androidnativeapi_jni") { diff --git a/third_party/libwebrtc/examples/androidvoip/BUILD.gn b/third_party/libwebrtc/examples/androidvoip/BUILD.gn @@ -40,7 +40,6 @@ if (is_android) { testonly = true sources = [ "java/org/webrtc/examples/androidvoip/VoipClient.java" ] namespace = "webrtc_examples" - jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" } rtc_shared_library("examples_androidvoip_jni") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -382,10 +382,10 @@ index b671239bae..e545b2cde3 100644 android_java_prebuilt("autobanh_java") { jar_path = "lib/autobanh.jar" diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn -index d0f9014a66..ae918e57eb 100644 +index 64cd43e923..6d36129869 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn -@@ -42,8 +42,8 @@ if (is_android) { +@@ -41,8 +41,8 @@ if (is_android) { "jni/onload.cc", ] @@ -397,10 +397,10 @@ index d0f9014a66..ae918e57eb 100644 deps = [ ":generated_jni", diff --git a/examples/androidvoip/BUILD.gn b/examples/androidvoip/BUILD.gn -index 3f517b73c0..edf214e0c4 100644 +index be28f08b3c..dad74bd8dc 100644 --- a/examples/androidvoip/BUILD.gn +++ b/examples/androidvoip/BUILD.gn -@@ -51,8 +51,8 @@ if (is_android) { +@@ -50,8 +50,8 @@ if (is_android) { "jni/onload.cc", ]