From a431fa4432635b01816c6d47686cb4df3cf6de6f Mon Sep 17 00:00:00 2001
From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com>
Date: Sat, 24 Oct 2020 12:07:50 +0700
Subject: [PATCH] Update buildjdk.sh

---
 buildjdk.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 6b0a3ef..79ec042 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -5,7 +5,8 @@ export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-${TARGET_SHORT}
 export CUPS_DIR=`pwd`/cups-2.2.4
 
 # simplest to force headless:)
-export CPPFLAGS+=" -DHEADLESS=1" # -I$FREETYPE_DIR -I$CUPS_DIR
+# export CPPFLAGS+=" -DHEADLESS=1" # -I$FREETYPE_DIR -I$CUPS_DIR
+export LDFLAGS+=" -L`pwd`/dummy_libs -Wl,--warn-unresolved-symbols"
 
 # It isn't good, but need make it build anyways
 # cp -R $CUPS_DIR/* $ANDROID_INCLUDE/
@@ -25,14 +26,16 @@ mv openjdk/jdk/src/share/native/sun/font/layout/unicode/* openjdk/jdk/src/share/
 mkdir dummy_libs
 ar cru dummy_libs/libpthread.a
 ar cru dummy_libs/libthread_db.a
-export LDFLAGS+=" -L`pwd`/dummy_libs -Wl,--warn-unresolved-symbols"
 
 cd openjdk
 rm -rf build
+
+rm common/autoconf/generated_configure.sh
+
 #	--with-extra-cxxflags="$CXXFLAGS -Dchar16_t=uint16_t -Dchar32_t=uint32_t" \
+#	--with-extra-cflags="$CPPFLAGS" \
 bash ./configure \
 	--disable-headful \
-	--with-extra-cflags="$CPPFLAGS" \
 	--with-extra-ldflags="$LDFLAGS" \
 	--enable-option-checking=fatal \
 	--openjdk-target=$TARGET \