Merge branch 'ndk_r20' into 'master'

makebuildserver: add ndk r20

See merge request fdroid/fdroidserver!663

buildserver/config.buildserver.py

@@ -10,6 +10,7 @@ ndk_paths = {
     'r17c': "/home/vagrant/android-ndk/r17c",
     'r18b': "/home/vagrant/android-ndk/r18b",
     'r19c': "/home/vagrant/android-ndk/r19c",
+    'r20': "/home/vagrant/android-ndk/r20",
 }
 java_paths = {
     '8': "/usr/lib/jvm/java-8-openjdk-amd64",

buildserver/provision-android-ndk

@@ -15,7 +15,7 @@ if [ ! -e $NDK_BASE/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
-for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c; do
+for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20; do
     if [ ! -e ${NDK_BASE}/${version} ]; then
         unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
         mv android-ndk-${version} ${version}

examples/config.py

@@ -21,6 +21,7 @@
 #     'r17c': None,
 #     'r18b': None,
 #     'r19c': None,
+#     'r20': None,
 # }
 
 # Directory to store downloaded tools in (i.e. gradle versions)

makebuildserver

@@ -374,6 +374,8 @@ CACHE_FILES = [
      '4f61cbe4bbf6406aa5ef2ae871def78010eed6271af72de83f8bd0b07a9fd3fd'),
     ('https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip',
      '4c62514ec9c2309315fd84da6d52465651cdb68605058f231f1e480fcf2692e1'),
+    ('https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip',
+     '57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0'),
 ]