all: add NDK r12b and set it as default

[fdroidserver.git] / buildserver / provision-android-ndk

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 80411b3498f83cabfeef2c6eff318fb91a5c95ec..030b01594d47035bc989e81366541480c3d15d34 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -1,17 +1,15 @@
 #!/bin/bash
 #
 
+echo $0
 set -e
 
-if [ -z $ANDROID_NDK_HOME ]; then
-    echo "ANDROID_NDK_HOME env var must be set!"
-    exit 1
-fi
+NDK_BASE=$1
 
-test -e $ANDROID_NDK_HOME || mkdir -p $ANDROID_NDK_HOME
-cd $ANDROID_NDK_HOME
+test -e $NDK_BASE || mkdir -p $NDK_BASE
+cd $NDK_BASE
 
-if [ ! -e $ANDROID_NDK_HOME/r9b ]; then
+if [ ! -e $NDK_BASE/r9b ]; then
     if [ `uname -m` == 'x86_64' ] ; then
         SUFFIX='_64'
     else
@@ -22,7 +20,7 @@ if [ ! -e $ANDROID_NDK_HOME/r9b ]; then
     mv android-ndk-r9b r9b
 fi
 
-if [ ! -e $ANDROID_NDK_HOME/r10e ]; then
+if [ ! -e $NDK_BASE/r10e ]; then
     if [ `uname -m` == 'x86_64' ] ; then
        SUFFIX='_64'
     else
@@ -32,5 +30,15 @@ if [ ! -e $ANDROID_NDK_HOME/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
-chmod -R a+rX $ANDROID_NDK_HOME/
-find $ANDROID_NDK_HOME/ -type f -executable -print0 | xargs -0 chmod a+x
+if [ ! -e $NDK_BASE/r12b ]; then
+    if [ `uname -m` == 'x86_64' ] ; then
+       SUFFIX='_64'
+    else
+       SUFFIX=''
+    fi
+    7zr x /vagrant/cache/android-ndk-r12b-linux-x86$SUFFIX.bin > /dev/null
+    mv android-ndk-r12b r12b
+fi
+
+chmod -R a+rX $NDK_BASE/
+find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x