From b8b4fe7ab380d94ebe050c45cc2ca347efe19425 Mon Sep 17 00:00:00 2001 From: Boulay Mathias Date: Mon, 1 May 2023 00:57:13 +0200 Subject: [PATCH] test: update ndk version --- ci_build_global.sh | 2 +- setdevkitpath.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci_build_global.sh b/ci_build_global.sh index 2e262a2..821fa56 100755 --- a/ci_build_global.sh +++ b/ci_build_global.sh @@ -8,7 +8,7 @@ if [ "$BUILD_IOS" != "1" ]; then sudo apt update sudo apt -y install autoconf python unzip zip - wget -nc -nv -O android-ndk-$NDK_VERSION-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip" + wget -nc -nv -O android-ndk-$NDK_VERSION-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux.zip" ./extractndk.sh ./maketoolchain.sh else diff --git a/setdevkitpath.sh b/setdevkitpath.sh index c4eac4e..96451e2 100755 --- a/setdevkitpath.sh +++ b/setdevkitpath.sh @@ -1,6 +1,6 @@ # Use the old NDK r10e to not get internal compile error at # https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u/blob/aarch64-shenandoah-jdk8u272-b10/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c -export NDK_VERSION=r10e +export NDK_VERSION=r25c if [ -z "$BUILD_FREETYPE_VERSION" ] then