From 59c09bbd0022ce79ea4168f7cc0614a62ff41a3b Mon Sep 17 00:00:00 2001
From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com>
Date: Tue, 20 Oct 2020 16:50:26 +0700
Subject: [PATCH] Use --with-extra-ldflags for point to dummy libs

---
 buildjdk.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 6d813b0..b907bb4 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -5,7 +5,7 @@ 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+="-I$FREETYPE_DIR -I$CUPS_DIR -DHEADLESS"
+export CPPFLAGS+=" -I$FREETYPE_DIR -I$CUPS_DIR -DHEADLESS"
 
 # It isn't good, but need make it build anyways
 cp -R $CUPS_DIR/* $ANDROID_INCLUDE/
@@ -19,12 +19,13 @@ cp -R /usr/include/fontconfig $ANDROID_INCLUDE/
 mkdir dummy_libs
 ar cru dummy_libs/libpthread.a
 ar cru dummy_libs/libthread_db.a
-export LDFLAGS+="-L`pwd`/dummy_libs"
+export LDFLAGS+=" -L`pwd`/dummy_libs"
 
 cd openjdk
 rm -rf build
 bash ./configure \
 	--with-extra-cflags="$CPPFLAGS" \
+	--with-extra-ldflags="$LDFLAGS" \
 	--enable-option-checking=fatal \
 	--openjdk-target=$TARGET \
 	--with-jdk-variant=normal \