Merge branch 'remove-ndk-r9b' into 'master'

makebuildserver: remove NDK r9b to save 1.6 GB of disk space

See merge request fdroid/fdroidserver!459

buildserver/config.buildserver.py

@@ -1,6 +1,5 @@
 sdk_path = "/home/vagrant/android-sdk"
 ndk_paths = {
-    'r9b': "/home/vagrant/android-ndk/r9b",
     'r10e': "/home/vagrant/android-ndk/r10e",
     'r11c': "/home/vagrant/android-ndk/r11c",
     'r12b': "/home/vagrant/android-ndk/r12b",

buildserver/provision-android-ndk

@@ -9,12 +9,6 @@ NDK_BASE=$1
 test -e $NDK_BASE || mkdir -p $NDK_BASE
 cd $NDK_BASE
 
-if [ ! -e $NDK_BASE/r9b ]; then
-    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
     7zr x /vagrant/cache/android-ndk-r10e-linux-x86_64.bin > /dev/null
     mv android-ndk-r10e r10e

examples/config.py

@@ -11,7 +11,6 @@
 # used by default. If a version is missing or assigned to None, it is assumed
 # not installed.
 # ndk_paths = {
-#     'r9b': None,
 #     'r10e': None,
 #     'r11c': None,
 #     'r12b': "$ANDROID_NDK",

fdroidserver/common.py

@@ -77,7 +77,6 @@ orig_path = None
 default_config = {
     'sdk_path': "$ANDROID_HOME",
     'ndk_paths': {
-        'r9b': None,
         'r10e': None,
         'r11c': None,
         'r12b': "$ANDROID_NDK",

makebuildserver

@@ -353,10 +353,6 @@ cachefiles = [
      '3e2ea0d8b96605b7c528768f646e0975bd9822f06df1f04a64fd279b1a17805e'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
-    ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
-     '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
-    ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
-     'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
     ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
      'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
     ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',