build: upgrade to ndk r25

buildjdk.sh

@@ -109,6 +109,10 @@ bash ./configure \
     --with-debug-level=$JDK_DEBUG_LEVEL \
     --with-fontconfig-include=$ANDROID_INCLUDE \
     $AUTOCONF_x11arg $AUTOCONF_EXTRA_ARGS \
+    OBJCOPY=${OBJCOPY} \
+    RANLIB=${RANLIB} \
+    AR=${AR} \
+    STRIP=${STRIP} \
     --x-libraries=/usr/lib \
         $platform_args || \
 error_code=$?

ci_build_global.sh

@@ -5,7 +5,7 @@ set -e
 export JDK_DEBUG_LEVEL=release
 
 if [[ "$BUILD_IOS" != "1" ]]; then
-  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

maketoolchain.sh

@@ -3,8 +3,8 @@ set -e
 
 . setdevkitpath.sh
   
-$NDK/build/tools/make-standalone-toolchain.sh \
+$NDK/build/tools/make_standalone_toolchain.py \
 	--arch=${TARGET_SHORT} \
-	--platform=android-21 \
+	--api=21 \
 	--install-dir=$NDK/generated-toolchains/android-${TARGET_SHORT}-toolchain
 cp devkit.info.${TARGET_SHORT} $NDK/generated-toolchains/android-${TARGET_SHORT}-toolchain/

setdevkitpath.sh

@@ -1,6 +1,6 @@
 # Use the old NDK r10e to not get internal compile error at (still?)
 # https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u/blob/aarch64-shenandoah-jdk8u272-b10/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c
-export NDK_VERSION=r21
+export NDK_VERSION=r25c
 
 if [[ -z "$BUILD_FREETYPE_VERSION" ]]
 then
@@ -60,12 +60,12 @@ export thecc=$TOOLCHAIN/bin/$TARGET-gcc
 export thecxx=$TOOLCHAIN/bin/$TARGET-g++
 
 # Configure and build.
-export AR=$TOOLCHAIN/bin/$TARGET-ar
-export AS=$TOOLCHAIN/bin/$TARGET-as
+export AR=$TOOLCHAIN/bin/llvm-ar
+export AS=$TOOLCHAIN/bin/llvm-as
 export CC=$PWD/android-wrapped-clang
 export CXX=$PWD/android-wrapped-clang++
-export LD=$TOOLCHAIN/bin/$TARGET-ld
-export OBJCOPY=$TOOLCHAIN/bin/$TARGET-objcopy
-export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
-export STRIP=$TOOLCHAIN/bin/$TARGET-strip
+export LD=$TOOLCHAIN/bin/ld
+export OBJCOPY=$TOOLCHAIN/bin/llvm-objcopy
+export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
+export STRIP=$TOOLCHAIN/bin/llvm-strip
 fi