Skip to content

Commit bcbacaa

Browse files
authored
M125 Build and fixes (#25)
* 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
1 parent a8b7dc3 commit bcbacaa

File tree

6 files changed

+132
-274
lines changed

6 files changed

+132
-274
lines changed

build/VERSION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WEBRTC_BUILD_VERSION=114.5735.11.0
2-
WEBRTC_VERSION=114.5735.11
3-
WEBRTC_READABLE_VERSION=M114.5735@{#11}
4-
WEBRTC_COMMIT=9316c0301071f7727fe35ee42cf824a575916f51
1+
WEBRTC_BUILD_VERSION=125.6422.0.0
2+
WEBRTC_VERSION=125.6422.0
3+
WEBRTC_READABLE_VERSION=M125.6422@{#0}
4+
WEBRTC_COMMIT=9225e0498b0457d74cae2a8bb8aa93fbd0e88552

build/android/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RUN /root/scripts/apt_install_x86_64.sh \
1717
&& sudo apt-get install -y build-essential
1818
ENV LC_ALL=C.UTF-8
1919
RUN cd /root && python3 run.py build $PACKAGE_NAME --commit "${COMMIT_HASH}"
20+
ENV PATH="${PATH}:/root/_source/${PACKAGE_NAME}/depot_tools"
2021
RUN cd /root && python3 run.py package $PACKAGE_NAME
2122
RUN mv $PACKAGE_DIR/webrtc.tar.gz /
2223

build/android_prefixed/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RUN /root/scripts/apt_install_x86_64.sh \
1717
&& sudo apt-get install -y build-essential
1818
ENV LC_ALL=C.UTF-8
1919
RUN cd /root && python3 run.py build $PACKAGE_NAME --commit "${COMMIT_HASH}"
20+
ENV PATH="${PATH}:/root/_source/${PACKAGE_NAME}/depot_tools"
2021
RUN cd /root && python3 run.py package $PACKAGE_NAME
2122
RUN mv $PACKAGE_DIR/webrtc.tar.gz /
2223

build/patches/android_webrtc_version.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
22
index 2d511e2eac..637ffa5168 100644
33
--- a/sdk/android/BUILD.gn
44
+++ b/sdk/android/BUILD.gn
5-
@@ -162,6 +162,7 @@ if (is_android) {
5+
@@ -156,6 +156,7 @@ if (is_android) {
66
sources = [
77
"api/org/webrtc/Predicate.java",
88
"api/org/webrtc/RefCounted.java",
99
+ "api/org/webrtc/WebrtcBuildVersion.java",
10+
"src/java/org/webrtc/ApplicationContextProvider.java",
1011
"src/java/org/webrtc/CalledByNative.java",
1112
"src/java/org/webrtc/CalledByNativeUnchecked.java",
12-
"src/java/org/webrtc/Histogram.java",

0 commit comments

Comments
 (0)