From 00cd21c74495422fed574b6572e301391d50b983 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Sat, 23 Jan 2021 06:05:58 +0700
Subject: [PATCH] [aarch32] build as client variant

---
 README.md   |  1 +
 buildjdk.sh | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 213f416..1e85b23 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Based on http://openjdk.java.net/projects/mobile/android.html
 ```
 export BUILD_FREETYPE_VERSION=[2.6.2/.../2.10.0] # default: 2.10.0
 export JDK_DEBUG_LEVEL=[release/fastdebug/debug] # default: release
+export JDK_VARIANT=[client/server] # default: client (aarch32), server (other architectures)
 ./extractndk.sh
 ./getlibs.sh
 ./maketoolchain.sh
diff --git a/buildjdk.sh b/buildjdk.sh
index 98d613b..ac664ac 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -5,6 +5,15 @@ set -e
 if [ "$TARGET_JDK" == "arm" ]
 then
   export TARGET_JDK=aarch32
+  if [ -z "$JDK_VARIANT"]
+  then
+    export JDK_VARIANT=client
+  fi
+else
+  if [ -z "$JDK_VARIANT"]
+  then
+    export JDK_VARIANT=server
+  fi
 fi
 
 sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev
@@ -42,7 +51,7 @@ bash ./configure \
 	--with-extra-ldflags="$LDFLAGS" \
 	--enable-option-checking=fatal \
 	--openjdk-target=$TARGET \
-	--with-jdk-variant=normal \
+	--with-jdk-variant=$JDK_VARIANT \
 	--with-cups-include=$CUPS_DIR \
 	--with-devkit=$TOOLCHAIN \
 	--with-debug-level=$JDK_DEBUG_LEVEL \