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

diff --combined buildserver/config.buildserver.py
index d8e7ebda837ce5067e1d5eb316943ec8d6bbe4b9,42c21a8a7f1b5893d1e64fcd4cf7a8f7636533fe..0b0c593fc1adfc97d3744713e5675708db15b78d
--- 1/buildserver/config.buildserver.py
--- 2/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@@ -1,13 -1,12 +1,12 @@@
  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",
      'r13b': "/home/vagrant/android-ndk/r13b",
      'r14b': "/home/vagrant/android-ndk/r14b",
      'r15c': "/home/vagrant/android-ndk/r15c",
 -    'r16': "/home/vagrant/android-ndk/r16",
 +    'r16b': "/home/vagrant/android-ndk/r16b",
  }
  java_paths = {
      '8': "/usr/lib/jvm/java-8-openjdk-amd64",

diff --combined examples/config.py
index 93c3ae3e4cf9f49c9317de90af37a74b8d5797c6,bd9ebcb234db1b95ead5bca311be05ce0fb05c81..f5b088a6de83b9661dcaedd22c47abb136b2eaa2
--- 1/examples/config.py
--- 2/examples/config.py
+++ b/examples/config.py
@@@ -11,14 -11,13 +11,13 @@@
  # 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",
  #     'r13b': None,
  #     'r14b': None,
  #     'r15c': None,
 -#     'r16': None,
 +#     'r16b': None,
  # }
  
  # java_paths = {

diff --combined fdroidserver/common.py
index 6a655d2d300d6cc855bf34a799d85f443c9d7c12,391825e8c93fb1c6c1ebc5f240cf4bb54ddd990f..7f44a4d3d5ebeac1e3ed64cf15165699014a9b71
--- 1/fdroidserver/common.py
--- 2/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -77,14 -77,13 +77,13 @@@ orig_path = Non
  default_config = {
      'sdk_path': "$ANDROID_HOME",
      'ndk_paths': {
-         'r9b': None,
          'r10e': None,
          'r11c': None,
          'r12b': "$ANDROID_NDK",
          'r13b': None,
          'r14b': None,
          'r15c': None,
 -        'r16': None,
 +        'r16b': None,
      },
      'build_tools': MINIMUM_AAPT_VERSION,
      'force_build_tools': False,

diff --combined makebuildserver
index 2fd51b18271a20f5f05803739acd0a3cd71cf8a7,1f8ad9246e1ad0987b8d2972c98d372f4986c671..20cc386c0f32886897b5c9a2690ce2b9d8d8eb21
--- 1/makebuildserver
--- 2/makebuildserver
+++ b/makebuildserver
@@@ -349,14 -349,8 +349,10 @@@ cachefiles = 
       'e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389'),
      ('https://downloads.gradle.org/distributions/gradle-4.5-bin.zip',
       '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3'),
 +    ('https://downloads.gradle.org/distributions/gradle-4.5.1-bin.zip',
 +     '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',
@@@ -367,8 -361,8 +363,8 @@@
       '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
      ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip',
       'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
 -    ('https://dl.google.com/android/repository/android-ndk-r16-linux-x86_64.zip',
 -     'a8550b81771c67cc6ab7b479a6918d29aa78de3482901762b4f9e0132cd9672e'),
 +    ('https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip',
 +     'bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901'),
  ]