From 7a88de6c227529dfd4d34f8b1d20127acda3fa82 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Sat, 5 Jun 2021 09:51:21 +0700
Subject: [PATCH] update to ndk r21, use clang

---
 buildjdk.sh      | 1 +
 setdevkitpath.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 8108d25..b15d9f5 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -65,6 +65,7 @@ bash ./configure \
     --with-extra-cxxflags="$CFLAGS" \
     --with-extra-ldflags="$LDFLAGS" \
     --enable-option-checking=fatal \
+    --with-toolchain-type=clang \
     --with-jvm-variants=$JVM_VARIANTS \
     --with-cups-include=$CUPS_DIR \
     --with-devkit=$TOOLCHAIN \
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index f7ba6ee..b302fe9 100755
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -1,6 +1,6 @@
-# Use the old NDK r10e to not get internal compile error at
+# 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=r10e
+export NDK_VERSION=r21e
 
 if [ -z "$BUILD_FREETYPE_VERSION" ]
 then