[PATCH 03/12] android: Update to latest NDK

[Anton Lundin]

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 packaging/android/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index bd24f18..ff58430 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -27,7 +27,7 @@ else
 fi
 
 # Configure where we can find things here
-export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e
+export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r12
 
 if [ -d "$SUBSURFACE_SOURCE/../Qt/5.5" ] ; then
 	export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
@@ -80,7 +80,7 @@ fi
 export QT5_ANDROID_BIN=${QT5_ANDROID}/android_${QT_ARCH}/bin
 
 if [ ! -e ndk-$ARCH ] ; then
-	$ANDROID_NDK_ROOT/build/tools/make-standalone-toolchain.sh --arch=$ARCH --install-dir=ndk-$ARCH --platform=android-14
+	$ANDROID_NDK_ROOT/build/tools/make_standalone_toolchain.py --arch=$ARCH --install-dir=ndk-$ARCH --api=14
 fi
 export BUILDROOT=$PWD
 export PATH=${BUILDROOT}/ndk-$ARCH/bin:$PATH
-- 
2.7.4