From bfd87815b7f4614f21186c1e348533445aa67fcb Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Tue, 15 Sep 2020 13:17:23 +0700
Subject: [PATCH] Fallback to NDK r10e

---
 ci_build.sh                |  2 +-
 extractndk.sh              |  2 +-
 makejdkwithoutconfigure.sh |  2 +-
 maketoolchain.sh           |  4 ++--
 maketoolchain_x86.sh       |  3 ++-
 setdevkitpath.sh           | 11 +++--------
 setdevkitpath_x86.sh       |  2 +-
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ci_build.sh b/ci_build.sh
index 7f84e9e..22b0837 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -2,7 +2,7 @@
 set -e
 # We have OpenJDK 8, good enough
 export USE_SYSTEM_JDK_8=1
-wget -nv -O android-ndk-r15-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r15-linux-x86_64.zip"
+wget -nv -O android-ndk-r10e-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip"
 ./extractndk.sh
 ./getlibs.sh
 ./maketoolchain.sh
diff --git a/extractndk.sh b/extractndk.sh
index 8b02f41..7154e27 100755
--- a/extractndk.sh
+++ b/extractndk.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-unzip -q android-ndk-r15-linux-x86_64.zip
+unzip -q android-ndk-r10e-linux-x86_64.zip
diff --git a/makejdkwithoutconfigure.sh b/makejdkwithoutconfigure.sh
index 3c99070..a29aafe 100755
--- a/makejdkwithoutconfigure.sh
+++ b/makejdkwithoutconfigure.sh
@@ -2,7 +2,7 @@
 # duplicate of buildjdk.sh that avoids reconfiguring. Used for making changes to openjdk code.
 
 set -e
-bash setdevkitpath.sh
+. setdevkitpath.sh
 export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-arm64
 export CUPS_DIR=`pwd`/cups-2.2.4
 
diff --git a/maketoolchain.sh b/maketoolchain.sh
index 8888234..6163c5b 100755
--- a/maketoolchain.sh
+++ b/maketoolchain.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-export NDK_HOME=`pwd`/android-ndk-r15
+. setdevkitpath.sh
   
-$NDK_HOME/build/tools/make-standalone-toolchain.sh \
+$NDK/build/tools/make-standalone-toolchain.sh \
 	--arch=arm64 \
 	--platform=android-21 \
 	--install-dir=$NDK_HOME/generated-toolchains/android-arm64-toolchain
diff --git a/maketoolchain_x86.sh b/maketoolchain_x86.sh
index 9cdba7f..1f56660 100755
--- a/maketoolchain_x86.sh
+++ b/maketoolchain_x86.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
-android-ndk-r15/build/tools/make-standalone-toolchain.sh \
+. setdevkitpath_x86.sh
+$NDK/build/tools/make-standalone-toolchain.sh \
 	--arch=x86 \
 	--platform=android-21 \
 	--install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-x86-toolchain
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 5b92f98..a2e3e29 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -1,18 +1,13 @@
 # Override GitHub Actions env vars
-
-# if [[ -z "$NDK_HOME" ]]; then
-  export NDK_HOME=`pwd`/android-ndk-r15
-# fi
+export NDK_HOME=`pwd`/android-ndk-r10e
 
 export NDK=$NDK_HOME
 export ANDROID_DEVKIT=$NDK/generated-toolchains/android-arm64-toolchain
 export TOOLCHAIN=$ANDROID_DEVKIT
 export TARGET=aarch64-linux-android
 
-ANDROID_API_FLAGS="-D__ANDROID_API__=21"
-export CFLAGS="$ANDROID_API_FLAGS"
-export CPPFLAGS="$ANDROID_API_FLAGS -I$NDK/platforms/android-21/arch-arm64/usr/include -I/usr/lib"
-export LDFLAGS="$ANDROID_API_FLAGS -L$NDK/platforms/android-21/arch-arm64/usr/lib"
+export CPPFLAGS="-I$NDK/platforms/android-21/arch-arm64/usr/include -I/usr/lib"
+export LDFLAGS="-L$NDK/platforms/android-21/arch-arm64/usr/lib"
 
 # Configure and build.
 # Deprecated...
diff --git a/setdevkitpath_x86.sh b/setdevkitpath_x86.sh
index 087c570..05f7a2b 100644
--- a/setdevkitpath_x86.sh
+++ b/setdevkitpath_x86.sh
@@ -1,7 +1,7 @@
 # Override GitHub Actions env vars
 
 # if [[ -z "$NDK_HOME" ]]; then
-  export NDK_HOME=`pwd`/android-ndk-r15
+  export NDK_HOME=`pwd`/android-ndk-r10e
 # fi
 
 export NDK=$NDK_HOME