Weblate

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

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 4ce42cc21f508529ede432d01cb0229fed36afd0..8e9724bc57702e5ca2344d651d80bc0089f485b6 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -9,26 +9,17 @@ NDK_BASE=$1
 test -e $NDK_BASE || mkdir -p $NDK_BASE
 cd $NDK_BASE
 
-if [ ! -e $NDK_BASE/r9b ]; then
-    if [ `uname -m` == 'x86_64' ] ; then
-        SUFFIX='_64'
-    else
-        SUFFIX=''
-    fi
-    tar xjf /vagrant/cache/android-ndk-r9b-linux-x86$SUFFIX.tar.bz2
-    tar xjf /vagrant/cache/android-ndk-r9b-linux-x86$SUFFIX-legacy-toolchains.tar.bz2
-    mv android-ndk-r9b r9b
-fi
-
 if [ ! -e $NDK_BASE/r10e ]; then
-    if [ `uname -m` == 'x86_64' ] ; then
-       SUFFIX='_64'
-    else
-       SUFFIX=''
-    fi
-    7zr x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin > /dev/null
+    7zr x /vagrant/cache/android-ndk-r10e-linux-x86_64.bin > /dev/null
     mv android-ndk-r10e r10e
 fi
 
+for version in r11c r12b r13b r14b r15c r16b; do
+    if [ ! -e ${NDK_BASE}/${version} ]; then
+        unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
+        mv android-ndk-${version} ${version}
+    fi
+done
+
 chmod -R a+rX $NDK_BASE/
 find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x