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

NDK r9b is used by only one app (net.gorry.android.input.nicownng) that
was last updated in 2015.

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 3cefcb8d4b2d0e7ce4dccad4f14ef674af662074..42c21a8a7f1b5893d1e64fcd4cf7a8f7636533fe 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/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",

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 5566305eab8272750076afa7de29c38c7cd886f5..e2a9a6516cd5b0659d779e057bd841ab692cceb2 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/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

diff --git a/examples/config.py b/examples/config.py
index a065bbd3780577853f6f8acb2b1e3bb9cabf6914..bd9ebcb234db1b95ead5bca311be05ce0fb05c81 100644 (file)
--- a/examples/config.py
+++ b/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",

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index d97cede329c2a5e8c7a250b59b601a350bbcaba6..391825e8c93fb1c6c1ebc5f240cf4bb54ddd990f 100644 (file)
--- a/fdroidserver/common.py
+++ b/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",

diff --git a/makebuildserver b/makebuildserver
index 37ec514e6356ba85186294c454632e4fdc72f6a2..1f8ad9246e1ad0987b8d2972c98d372f4986c671 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -351,10 +351,6 @@ cachefiles = [
      '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3'),
     ('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',