From d17965d3fe5db4986d2a14335a46b1af12a0a4d9 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Tue, 21 Jul 2020 06:59:08 +0700
Subject: [PATCH] Update script arm64

---
 buildjdk.sh      |  1 +
 setdevkitpath.sh | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 2819336..119d4dc 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -3,6 +3,7 @@ set -e
 . setdevkitpath.sh
 export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-aarch64
 export CUPS_DIR=`pwd`/cups-2.2.4
+# /build_android-aarch64
 
 # My system's JDK is too old (7.0), so we add an Oracle boot JDK.
 # Set "USE_SYSTEM_JDK_8=1" to use system jdk instead
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 156de8a..df569bb 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -1 +1,13 @@
-export ANDROID_DEVKIT=`pwd`/android-ndk-r10e/generated-toolchains/android-arm-toolchain
+export NDK=`pwd`/android-ndk-r10e
+export ANDROID_DEVKIT=$NDK/generated-toolchains/android-arm64-toolchain
+export TOOLCHAIN=$NDK/generated-toolchains/android-arm64-toolchain
+export TARGET=aarch64-linux-android
+
+# Configure and build.
+export AR=$TOOLCHAIN/bin/$TARGET-ar
+export AS=$TOOLCHAIN/bin/$TARGET-as
+export CC=$TOOLCHAIN/bin/$TARGET-gcc
+export CXX=$TOOLCHAIN/bin/$TARGET-g++
+export LD=$TOOLCHAIN/bin/$TARGET-ld
+export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
+export STRIP=$TOOLCHAIN/bin/$TARGET-strip