Use NDK r17

ZiMeng-Firefly · Oct 31, 2020 · 8b2612c · 8b2612c
1 parent 3b36ce1
commit 8b2612c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/buildjdk.sh b/buildjdk.sh
@@ -36,7 +36,7 @@ bash ./configure \
 	--openjdk-target=$TARGET \
 	--with-jdk-variant=normal \
 	--with-cups-include=$CUPS_DIR \
-	--with-devkit=$ANDROID_DEVKIT \
+	--with-devkit=$TOOLCHAIN \
 	--with-debug-level=$JDK_DEBUG_LEVEL \
 	--with-fontconfig-include=$ANDROID_INCLUDE \
 	--with-freetype-lib=$FREETYPE_DIR/lib \

diff --git a/buildlibs.sh b/buildlibs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 . setdevkitpath.sh
-export PATH=$ANDROID_DEVKIT/bin:$PATH
+export PATH=$TOOLCHAIN/bin:$PATH
 
 echo "Building Freetype"
 

diff --git a/maketoolchain.sh b/maketoolchain.sh
@@ -6,5 +6,5 @@ set -e
 $NDK/build/tools/make-standalone-toolchain.sh \
 	--arch=${TARGET_SHORT} \
 	--platform=android-21 \
-	--install-dir=$NDK_HOME/generated-toolchains/android-${TARGET_SHORT}-toolchain
-cp devkit.info.${TARGET_SHORT} $NDK_HOME/generated-toolchains/android-${TARGET_SHORT}-toolchain/
+	--install-dir=$NDK/generated-toolchains/android-${TARGET_SHORT}-toolchain
+cp devkit.info.${TARGET_SHORT} $NDK/generated-toolchains/android-${TARGET_SHORT}-toolchain/
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
@@ -1,7 +1,7 @@
 
 if [ -z "$NDK_VERSION" ]
 then
-  export NDK_VERSION=r18
+  export NDK_VERSION=r17
 fi
 
 if [ -z "$JDK_DEBUG_LEVEL" ]
@@ -16,16 +16,11 @@ else
   export TARGET_SHORT=$TARGET_JDK
 fi
 
-# Override GitHub Actions env var
-export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
-export NDK_HOME=$ANDROID_NDK_HOME
-
+# Set NDK
 export API=21
-
-export NDK=$NDK_HOME
-# export ANDROID_DEVKIT=$NDK/toolchains/android-${TARGET_SHORT}-toolchain
-export ANDROID_DEVKIT=$NDK/toolchains/llvm/prebuilt/linux-x86_64
-export TOOLCHAIN=$ANDROID_DEVKIT
+export NDK=`pwd`/android-ndk-$NDK_VERSION
+export TOOLCHAIN=$NDK/generated-toolchains/android-${TARGET_SHORT}-toolchain
+# export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/linux-x86_64
 
 export ANDROID_INCLUDE=$TOOLCHAIN/sysroot/usr/include