Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

M125 Build and fixes #25

Merged
merged 9 commits into from
Jun 11, 2024
Merged

M125 Build and fixes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4371134
fix android webrtc version patch
davidliu Jun 9, 2024
2fbcd8b
jni_prefix.patch fixes
davidliu Jun 10, 2024
72e2ecf
More fix android_webrtc_version.patch
davidliu Jun 10, 2024
3d96890
temp remove jni_generator and rules since they no longer exist
davidliu Jun 10, 2024
63703d3
Reimplement jni prefixing
davidliu Jun 10, 2024
dc89b1f
Build m125
davidliu Jun 10, 2024
c172e3b
Fix build
davidliu Jun 11, 2024
b0375a4
Fix build
davidliu Jun 11, 2024
8bf3cd8
Fix build
davidliu Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build/VERSION
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading