Skip to content

Commit

Permalink
M125 Build and fixes (#25)
Browse files Browse the repository at this point in the history
* fix android webrtc version patch

* jni_prefix.patch fixes

* More fix android_webrtc_version.patch

* temp remove jni_generator and rules since they no longer exist

* Reimplement jni prefixing

* Build m125

* Fix build

* Fix build

* Fix build
  • Loading branch information
davidliu committed Jun 11, 2024
1 parent a8b7dc3 commit bcbacaa
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 274 deletions.
8 changes: 4 additions & 4 deletions build/VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WEBRTC_BUILD_VERSION=114.5735.11.0
WEBRTC_VERSION=114.5735.11
WEBRTC_READABLE_VERSION=M114.5735@{#11}
WEBRTC_COMMIT=9316c0301071f7727fe35ee42cf824a575916f51
WEBRTC_BUILD_VERSION=125.6422.0.0
WEBRTC_VERSION=125.6422.0
WEBRTC_READABLE_VERSION=M125.6422@{#0}
WEBRTC_COMMIT=9225e0498b0457d74cae2a8bb8aa93fbd0e88552
1 change: 1 addition & 0 deletions build/android/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN /root/scripts/apt_install_x86_64.sh \
&& sudo apt-get install -y build-essential
ENV LC_ALL=C.UTF-8
RUN cd /root && python3 run.py build $PACKAGE_NAME --commit "${COMMIT_HASH}"
ENV PATH="${PATH}:/root/_source/${PACKAGE_NAME}/depot_tools"
RUN cd /root && python3 run.py package $PACKAGE_NAME
RUN mv $PACKAGE_DIR/webrtc.tar.gz /

Expand Down
1 change: 1 addition & 0 deletions build/android_prefixed/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN /root/scripts/apt_install_x86_64.sh \
&& sudo apt-get install -y build-essential
ENV LC_ALL=C.UTF-8
RUN cd /root && python3 run.py build $PACKAGE_NAME --commit "${COMMIT_HASH}"
ENV PATH="${PATH}:/root/_source/${PACKAGE_NAME}/depot_tools"
RUN cd /root && python3 run.py package $PACKAGE_NAME
RUN mv $PACKAGE_DIR/webrtc.tar.gz /

Expand Down
4 changes: 2 additions & 2 deletions build/patches/android_webrtc_version.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 2d511e2eac..637ffa5168 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -162,6 +162,7 @@ if (is_android) {
@@ -156,6 +156,7 @@ if (is_android) {
sources = [
"api/org/webrtc/Predicate.java",
"api/org/webrtc/RefCounted.java",
+ "api/org/webrtc/WebrtcBuildVersion.java",
"src/java/org/webrtc/ApplicationContextProvider.java",
"src/java/org/webrtc/CalledByNative.java",
"src/java/org/webrtc/CalledByNativeUnchecked.java",
"src/java/org/webrtc/Histogram.java",
Loading

0 comments on commit bcbacaa

Please sign in to comment.