From edd41b3c5824611d36e530ff2ebf65050fc208b2 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 29 May 2020 16:23:20 -0400 Subject: [PATCH] Upgrade NDK r21b to r21c --- buildserver/config.buildserver.py | 2 +- buildserver/provision-android-ndk | 2 +- examples/config.py | 2 +- makebuildserver | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py index 66aaaf2b..ce848482 100644 --- a/buildserver/config.buildserver.py +++ b/buildserver/config.buildserver.py @@ -11,7 +11,7 @@ ndk_paths = { 'r18b': "/home/vagrant/android-ndk/r18b", 'r19c': "/home/vagrant/android-ndk/r19c", 'r20b': "/home/vagrant/android-ndk/r20b", - 'r21b': "/home/vagrant/android-ndk/r21b", + 'r21c': "/home/vagrant/android-ndk/r21c", } java_paths = { '8': "/usr/lib/jvm/java-8-openjdk-amd64", diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk index 32dd230b..69bfd7d5 100644 --- a/buildserver/provision-android-ndk +++ b/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 r20b r21b; do +for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21c; do if [ ! -e ${NDK_BASE}/${version} ]; then unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null mv android-ndk-${version} ${version} diff --git a/examples/config.py b/examples/config.py index e2fa05d7..77edf2b6 100644 --- a/examples/config.py +++ b/examples/config.py @@ -22,7 +22,7 @@ # 'r18b': None, # 'r19c': None, # 'r20b': None, -# 'r21b': None, +# 'r21c': None, # } # Directory to store downloaded tools in (i.e. gradle versions) diff --git a/makebuildserver b/makebuildserver index dc5a689d..7c5d3ce4 100755 --- a/makebuildserver +++ b/makebuildserver @@ -394,8 +394,8 @@ CACHE_FILES = [ '4c62514ec9c2309315fd84da6d52465651cdb68605058f231f1e480fcf2692e1'), ('https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip', '8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'), - ('https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip', - '0c7af5dd23c5d2564915194e71b1053578438ac992958904703161c7672cbed7'), + ('https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip', + '214ebfcfa5108ba78f5b2cc8db4d575068f9c973ac7f27d2fa1987dfdb76c9e7'), ]