From 126f6bf8392737a993a07671c137e5b84c58715c Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Mon, 16 Dec 2019 00:07:03 +0000
Subject: [PATCH] Add NDK r20b

---
 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 7edf693c..3b5a5c1f 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -10,7 +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",
+    'r20b': "/home/vagrant/android-ndk/r20b",
 }
 java_paths = {
     '8': "/usr/lib/jvm/java-8-openjdk-amd64",
diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 7e137d48..1836e2cb 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 r20; do
+for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b; 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 c766eab2..b400af6c 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -21,7 +21,7 @@
 #     'r17c': None,
 #     'r18b': None,
 #     'r19c': None,
-#     'r20': None,
+#     'r20b': None,
 # }
 
 # Directory to store downloaded tools in (i.e. gradle versions)
diff --git a/makebuildserver b/makebuildserver
index 0d742fa8..b4cf56c1 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -382,8 +382,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'),
+    ('https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip',
+     '8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'),
 ]