From 00b10315731a79bec3d062f11340fddfde6a4637 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Wed, 22 Jul 2020 11:20:00 +0700
Subject: [PATCH] Some updates

---
 buildjdk.sh                | 6 +++---
 makejdkwithoutconfigure.sh | 6 +++---
 setdevkitpath.sh           | 8 ++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 119d4dc..daec159 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -2,8 +2,8 @@
 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
+export CUPS_DIR=`pwd`/cups-2.2.4/include
+# /build_android-aarch64/include
 
 # 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
@@ -13,7 +13,7 @@ then
 fi
 
 cd openjdk
-rm -rf build
+# rm -rf build
 bash ./configure \
 	--enable-option-checking=fatal \
 	--build=x86_64-unknown-linux-gnu \
diff --git a/makejdkwithoutconfigure.sh b/makejdkwithoutconfigure.sh
index d69db7b..3c99070 100755
--- a/makejdkwithoutconfigure.sh
+++ b/makejdkwithoutconfigure.sh
@@ -2,13 +2,13 @@
 # duplicate of buildjdk.sh that avoids reconfiguring. Used for making changes to openjdk code.
 
 set -e
-. setdevkitpath.sh
-export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-arm
+bash setdevkitpath.sh
+export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-arm64
 export CUPS_DIR=`pwd`/cups-2.2.4
 
 # My system's JDK is too old (7.0), so we add an Oracle boot JDK.
 export PATH=`pwd`/jdk-9.0.4/bin:$PATH
 
 cd openjdk
-cd build/android-arm-normal-server-release
+cd build/android-aarch64-normal-server-release
 make JOBS=4 images
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index df569bb..02cd8ad 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -11,3 +11,11 @@ export CXX=$TOOLCHAIN/bin/$TARGET-g++
 export LD=$TOOLCHAIN/bin/$TARGET-ld
 export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
 export STRIP=$TOOLCHAIN/bin/$TARGET-strip
+
+# export BUILD_AR=$AR
+# export BUILD_AS=$AS
+# export BUILD_CC=$CC
+# export BUILD_CXX=$CXX
+# export BUILD_LD=$LD
+# export BUILD_RANLIB=$RANLIB
+# export BUILD_STRIP=$STRIP