From 2c411a03c66822f35a78a873b4db81b2b101e960 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran0@users.noreply.github.com>
Date: Fri, 15 Jan 2021 17:11:56 +0700
Subject: [PATCH] aarch32 instead of arm maybe?

---
 .github/workflows/build_aarch32.yml | 2 +-
 .github/workflows/build_aarch64.yml | 2 +-
 .github/workflows/build_x86.yml     | 2 +-
 .github/workflows/build_x86_64.yml  | 2 +-
 buildjdk.sh                         | 5 +++++
 ci_build_arch_aarch32.sh            | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_aarch32.yml b/.github/workflows/build_aarch32.yml
index 3553691..268ea6f 100644
--- a/.github/workflows/build_aarch32.yml
+++ b/.github/workflows/build_aarch32.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
diff --git a/.github/workflows/build_aarch64.yml b/.github/workflows/build_aarch64.yml
index 82ec490..d768815 100644
--- a/.github/workflows/build_aarch64.yml
+++ b/.github/workflows/build_aarch64.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
diff --git a/.github/workflows/build_x86.yml b/.github/workflows/build_x86.yml
index 41a4236..1af0187 100644
--- a/.github/workflows/build_x86.yml
+++ b/.github/workflows/build_x86.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
diff --git a/.github/workflows/build_x86_64.yml b/.github/workflows/build_x86_64.yml
index 0c4386c..c32cd9b 100644
--- a/.github/workflows/build_x86_64.yml
+++ b/.github/workflows/build_x86_64.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
diff --git a/buildjdk.sh b/buildjdk.sh
index 0685ac7..98d613b 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -2,6 +2,11 @@
 set -e
 . setdevkitpath.sh
 
+if [ "$TARGET_JDK" == "arm" ]
+then
+  export TARGET_JDK=aarch32
+fi
+
 sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev
 
 export FREETYPE_DIR=`pwd`/freetype-$BUILD_FREETYPE_VERSION/build_android-${TARGET_SHORT}
diff --git a/ci_build_arch_aarch32.sh b/ci_build_arch_aarch32.sh
index 3e4cee3..9729f93 100644
--- a/ci_build_arch_aarch32.sh
+++ b/ci_build_arch_aarch32.sh
@@ -2,7 +2,7 @@
 set -e
 
 export TARGET=arm-linux-androideabi
-export TARGET_JDK=aarch32
+export TARGET_JDK=arm
 
 bash ci_build_global.sh