all: remove 32-bit buildserver code

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

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 4ce42cc21f508529ede432d01cb0229fed36afd0..4c4f0d54b4817432cb9a2d01ec231bfc709f7d91 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -10,25 +10,20 @@ 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
+    tar xjf /vagrant/cache/android-ndk-r9b-linux-x86_64.tar.bz2
+    tar xjf /vagrant/cache/android-ndk-r9b-linux-x86_64-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
 
+if [ ! -e $NDK_BASE/r12b ]; then
+    7zr x /vagrant/cache/android-ndk-r12b-linux-x86_64.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