From 0107f79460aeb114eb60bd82b623f38d170c9d94 Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Fri, 6 May 2022 22:21:51 +0300
Subject: [PATCH 1/5] Force client and -O2 on arm32

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

diff --git a/buildjdk.sh b/buildjdk.sh
index 881e957..9554c81 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -5,9 +5,10 @@ set -e
 export FREETYPE_DIR=$PWD/freetype-$BUILD_FREETYPE_VERSION/build_android-$TARGET_SHORT
 export CUPS_DIR=$PWD/cups-2.2.4
 export CFLAGS+=" -DLE_STANDALONE -DANDROID" # -I$FREETYPE_DIR -I$CUPS_DI
-if [ "$TARGET_JDK" == "aarch32" ]
+if [ "$TARGET_JDK" == "arm" ]
 then
   export CFLAGS+=" -O2"
+  export JVM_VARIANTS=client
 else
   export CFLAGS+=" -O3"
 fi

From 7f26a3804767496a5eb6baab6c63da97f42b711b Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Fri, 6 May 2022 23:07:29 +0300
Subject: [PATCH 2/5] Update removejdkdebuginfo.sh

---
 removejdkdebuginfo.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/removejdkdebuginfo.sh b/removejdkdebuginfo.sh
index d46cf18..61435a3 100755
--- a/removejdkdebuginfo.sh
+++ b/removejdkdebuginfo.sh
@@ -3,6 +3,11 @@ set -e
 
 . setdevkitpath.sh
 
+if [ "$TARGET_JDK" == "arm" ]
+then
+  export JVM_VARIANTS=client
+fi
+
 imagespath=openjdk/build/${JVM_PLATFORM}-${TARGET_JDK}-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images
 
 rm -rf dizout jreout jdkout

From a8ae0200795235f9435404ed3d201902581dd147 Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Wed, 11 May 2022 21:09:07 +0300
Subject: [PATCH 3/5] Build with thumb

---
 buildjdk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 9554c81..6052682 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -7,7 +7,7 @@ export CUPS_DIR=$PWD/cups-2.2.4
 export CFLAGS+=" -DLE_STANDALONE -DANDROID" # -I$FREETYPE_DIR -I$CUPS_DI
 if [ "$TARGET_JDK" == "arm" ]
 then
-  export CFLAGS+=" -O2"
+  export CFLAGS+=" -O2 -mthumb -D__thumb__"
   export JVM_VARIANTS=client
 else
   export CFLAGS+=" -O3"

From 4107d9bdb71f82014116c3fc385717c8177608c1 Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Thu, 12 May 2022 15:26:00 +0300
Subject: [PATCH 4/5] Update buildjdk.sh

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

diff --git a/buildjdk.sh b/buildjdk.sh
index 6052682..3945e5a 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -7,8 +7,7 @@ export CUPS_DIR=$PWD/cups-2.2.4
 export CFLAGS+=" -DLE_STANDALONE -DANDROID" # -I$FREETYPE_DIR -I$CUPS_DI
 if [ "$TARGET_JDK" == "arm" ]
 then
-  export CFLAGS+=" -O2 -mthumb -D__thumb__"
-  export JVM_VARIANTS=client
+  export CFLAGS+=" -O3 -D__thumb__"
 else
   export CFLAGS+=" -O3"
 fi

From f34766eda264705efddfd5b118a6765e5ccc8681 Mon Sep 17 00:00:00 2001
From: ArtDev <45949002+artdeell@users.noreply.github.com>
Date: Thu, 12 May 2022 15:27:20 +0300
Subject: [PATCH 5/5] Update removejdkdebuginfo.sh

---
 removejdkdebuginfo.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/removejdkdebuginfo.sh b/removejdkdebuginfo.sh
index 61435a3..d46cf18 100755
--- a/removejdkdebuginfo.sh
+++ b/removejdkdebuginfo.sh
@@ -3,11 +3,6 @@ set -e
 
 . setdevkitpath.sh
 
-if [ "$TARGET_JDK" == "arm" ]
-then
-  export JVM_VARIANTS=client
-fi
-
 imagespath=openjdk/build/${JVM_PLATFORM}-${TARGET_JDK}-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images
 
 rm -rf dizout jreout jdkout