Use NDK 14

README.md

@@ -0,0 +1,50 @@
+Based on http://openjdk.java.net/projects/mobile/android.html
+
+Download Android NDK r14 from https://developer.android.com/ndk/downloads/older_releases.html and place it in this directory
+
+(Can't automatically download because of EULA)
+
+## Building
+
+### Environment variables
+<table>
+      <thead>
+        <tr>
+          <th></th>
+          <th align="center" colspan="7">Architectures</th>
+        </tr>
+        <tr>
+          <th>Env var</th>
+          <th align="center">TARGET</th>
+          <th align="center">TARGET_JDK</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>armv8/aarch64</td>
+          <td align="center">aarch64-linux-android</td>
+          <td align="center">aarch64</td>
+        </tr>
+        <tr>
+          <td>armv7/aarch32</td>
+          <td align="center">arm-linux-androideabi</td>
+          <td align="center">arm</td>
+        </tr>
+        <tr>
+          <td>x86/i686</td>
+          <td align="center">i686-linux-android</td>
+          <td align="center">x86</td>
+        </tr>
+        <tr>
+          <td>x86_64/amd64</td>
+          <td align="center">x86_64-linux-android</td>
+          <td align="center">x86_64</td>
+        </tr>
+      </tbody>
+	</table>
+
+### Run in this directory:
+```
+bash ci_build_global.sh
+```
+

README.txt

@@ -1,22 +0,0 @@
-Based on http://openjdk.java.net/projects/mobile/android.html
-
-Download Android NDK r10e from https://developer.android.com/ndk/downloads/older_releases.html and place it in this directory
-
-(Can't automatically download because of EULA)
-
-Run in this directory:
-
-./extractndk.sh
-./getlibs.sh
-./maketoolchain.sh
-./clonejdk.sh
-./buildlibs.sh
-./buildjdk.sh
-./removejdkdebuginfo.sh
-./tarjdk.sh
-
-For x86:
-./maketoolchain_x86.sh
-./reextractlibs_x86.sh
-./buildlibs_x86.sh
-./buildjdk_x86.sh

ci_build_arch_aarch32.sh

@@ -2,7 +2,6 @@
 set -e
 
 export TARGET=arm-linux-androideabi
-export TARGET_SHORT=arm
 export TARGET_JDK=arm
 
 bash ci_build_global.sh

ci_build_arch_aarch64.sh

@@ -2,7 +2,6 @@
 set -e
 
 export TARGET=aarch64-linux-android
-export TARGET_SHORT=arm64
 export TARGET_JDK=aarch64
 
 bash ci_build_global.sh

ci_build_arch_x86.sh

@@ -2,7 +2,6 @@
 set -e
 
 export TARGET=i686-linux-android
-export TARGET_SHORT=x86
 export TARGET_JDK=x86
 
 bash ci_build_global.sh

ci_build_arch_x86_64.sh

@@ -2,7 +2,6 @@
 set -e
 
 export TARGET=x86_64-linux-android
-export TARGET_SHORT=x86_64
 export TARGET_JDK=x86_64
 
 bash ci_build_global.sh

ci_build_global.sh

@@ -1,7 +1,14 @@
 #!/bin/bash
 set -e
 
-wget -nc -nv -O android-ndk-r10e-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip"
+if [ $TARGET_JDK == "aarch64" ]
+then
+  export TARGET_SHORT=arm64
+else
+  export TARGET_SHORT=$TARGET_JDK
+fi
+
+wget -nc -nv -O android-ndk-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip"
 ./extractndk.sh
 ./getlibs.sh
 ./maketoolchain.sh

extractndk.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-unzip -q android-ndk-r10e-linux-x86_64.zip
+unzip -q android-ndk-linux-x86_64.zip

setdevkitpath.sh

@@ -1,5 +1,5 @@
 # Override GitHub Actions env vars
-export NDK_HOME=`pwd`/android-ndk-r10e
+export NDK_HOME=`pwd`/android-ndk-r*
 
 export NDK=$NDK_HOME
 export ANDROID_DEVKIT=$NDK/generated-toolchains/android-${TARGET_SHORT}-toolchain