diff --git a/ci_build.sh b/ci_build.sh
index 22b0837..7f84e9e 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-r10e-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip"
+wget -nv -O android-ndk-r15-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r15-linux-x86_64.zip"
 ./extractndk.sh
 ./getlibs.sh
 ./maketoolchain.sh
diff --git a/extractndk.sh b/extractndk.sh
index 7154e27..8b02f41 100755
--- a/extractndk.sh
+++ b/extractndk.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-unzip -q android-ndk-r10e-linux-x86_64.zip
+unzip -q android-ndk-r15-linux-x86_64.zip
diff --git a/maketoolchain.sh b/maketoolchain.sh
index 6b312f9..8888234 100755
--- a/maketoolchain.sh
+++ b/maketoolchain.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-export NDK_HOME=`pwd`/android-ndk-r10e
+export NDK_HOME=`pwd`/android-ndk-r15
   
 $NDK_HOME/build/tools/make-standalone-toolchain.sh \
 	--arch=arm64 \
diff --git a/maketoolchain_x86.sh b/maketoolchain_x86.sh
index db33635..9cdba7f 100755
--- a/maketoolchain_x86.sh
+++ b/maketoolchain_x86.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
+android-ndk-r15/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 674f51c..a8bec4b 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -1,7 +1,7 @@
 # Override GitHub Actions env vars
 
 # if [[ -z "$NDK_HOME" ]]; then
-  export NDK_HOME=`pwd`/android-ndk-r10e
+  export NDK_HOME=`pwd`/android-ndk-r15
 # fi
 
 export NDK=$NDK_HOME
@@ -16,8 +16,8 @@ export LDFLAGS="-L$NDK/platforms/android-21/arch-arm64/usr/lib"
 # Deprecated...
 export AR=$TOOLCHAIN/bin/$TARGET-ar
 export AS=$TOOLCHAIN/bin/$TARGET-as
-export CC=$TOOLCHAIN/bin/$TARGET-gcc
-export CXX=$TOOLCHAIN/bin/$TARGET-g++
+export CC=$TOOLCHAIN/bin/$TARGET-clang
+export CXX=$TOOLCHAIN/bin/$TARGET-clang++
 export LD=$TOOLCHAIN/bin/$TARGET-ld
 export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
 export STRIP=$TOOLCHAIN/bin/$TARGET-strip
diff --git a/setdevkitpath_x86.sh b/setdevkitpath_x86.sh
index a4ab222..087c570 100644
--- a/setdevkitpath_x86.sh
+++ b/setdevkitpath_x86.sh
@@ -1 +1,31 @@
-export ANDROID_DEVKIT=`pwd`/android-ndk-r10e/generated-toolchains/android-x86-toolchain
+# Override GitHub Actions env vars
+
+# if [[ -z "$NDK_HOME" ]]; then
+  export NDK_HOME=`pwd`/android-ndk-r15
+# fi
+
+export NDK=$NDK_HOME
+export ANDROID_DEVKIT=$NDK/generated-toolchains/android-x86-toolchain
+export TOOLCHAIN=$ANDROID_DEVKIT
+export TARGET=i686-linux-android
+
+export CPPFLAGS="-I$NDK/platforms/android-21/arch-x86/usr/include -I/usr/lib"
+export LDFLAGS="-L$NDK/platforms/android-21/arch-x86/usr/lib"
+
+# Configure and build.
+# Deprecated...
+export AR=$TOOLCHAIN/bin/$TARGET-ar
+export AS=$TOOLCHAIN/bin/$TARGET-as
+export CC=$TOOLCHAIN/bin/$TARGET-clang
+export CXX=$TOOLCHAIN/bin/$TARGET-clang++
+export LD=$TOOLCHAIN/bin/$TARGET-ld
+export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
+export STRIP=$TOOLCHAIN/bin/$TARGET-strip
+
+# export BUILD_AR=$AR
+# export BUILD_AS=$AS
+# export BUILD_CC=$CC
+# export BUILD_CXX=$CXX
+# export BUILD_LD=$LD
+# export BUILD_RANLIB=$RANLIB
+# export BUILD_STRIP=$STRIP