From f808de9d35c95e40146287185d6c224205e2368f Mon Sep 17 00:00:00 2001 From: Jon Griffiths Date: Tue, 30 Jan 2024 13:10:10 +1300 Subject: [PATCH] build: update android ndk to r26b --- README.md | 2 +- contrib/Dockerfile_bullseye | 2 +- contrib/bullseye_deps.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0e6488304..b90455748 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ the Android NDK. The script `tools/android_helpers.sh` can be sourced from the shell or scripts to make it easier to produce builds: ``` -$ export ANDROID_NDK=/opt/android-ndk-r23b # r22 is the minimum supported version +$ export ANDROID_NDK=/opt/android-ndk-r26b # r22 is the minimum supported version $ . ./tools/android_helpers.sh $ android_get_arch_list diff --git a/contrib/Dockerfile_bullseye b/contrib/Dockerfile_bullseye index 3776c3217..63e0c1c89 100644 --- a/contrib/Dockerfile_bullseye +++ b/contrib/Dockerfile_bullseye @@ -9,4 +9,4 @@ COPY bullseye_deps.sh ./deps.sh COPY requirements.txt ./contrib/requirements.txt RUN ./deps.sh && rm ./deps.sh ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64 -ENV ANDROID_NDK=/opt/android-ndk-r23b +ENV ANDROID_NDK=/opt/android-ndk-r26b diff --git a/contrib/bullseye_deps.sh b/contrib/bullseye_deps.sh index b8c18e2fa..e0d4a830a 100755 --- a/contrib/bullseye_deps.sh +++ b/contrib/bullseye_deps.sh @@ -45,8 +45,8 @@ pip3 install valgrind-codequality -r contrib/requirements.txt pushd /opt if [ -z "$skip_ndk" ]; then - curl -L -o ndk.zip https://dl.google.com/android/repository/android-ndk-r23b-linux.zip - echo "c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382 ndk.zip" | sha256sum --check + curl -L -o ndk.zip https://dl.google.com/android/repository/android-ndk-r26b-linux.zip + echo "ad73c0370f0b0a87d1671ed2fd5a9ac9acfd1eb5c43a7fbfbd330f85d19dd632 ndk.zip" | shasum -a 256 -c unzip ndk.zip rm ndk.zip fi