From d683a40f96ac000b13b9690137585a591e5a195c Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 10 Mar 2021 16:36:14 +0200 Subject: [PATCH] Add NDK 21e --- buildserver/config.buildserver.yml | 2 +- buildserver/provision-android-ndk | 2 +- examples/config.yml | 2 +- makebuildserver | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildserver/config.buildserver.yml b/buildserver/config.buildserver.yml index 4d9b76ce..0f05888d 100644 --- a/buildserver/config.buildserver.yml +++ b/buildserver/config.buildserver.yml @@ -11,7 +11,7 @@ ndk_paths: r18b: /home/vagrant/android-ndk/r18b r19c: /home/vagrant/android-ndk/r19c r20b: /home/vagrant/android-ndk/r20b - r21d: /home/vagrant/android-ndk/r21d + r21e: /home/vagrant/android-ndk/r21e r22: /home/vagrant/android-ndk/r22 java_paths: diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk index e778cedc..d57a8692 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 r21d r22; do +for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21e r22; 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.yml b/examples/config.yml index eee0bd0f..74447a54 100644 --- a/examples/config.yml +++ b/examples/config.yml @@ -21,7 +21,7 @@ # r18b: None # r19c: None # r20b: None -# r21d: None +# r21e: None # r22: None # Directory to store downloaded tools in (i.e. gradle versions) diff --git a/makebuildserver b/makebuildserver index e896c1fc..c0a5bcfb 100755 --- a/makebuildserver +++ b/makebuildserver @@ -431,8 +431,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-r21d-linux-x86_64.zip', - 'dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd'), + ('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip', + 'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e'), ('https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip', 'd37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718'), ]