Revert "Revert "Merge branch 'ndk21' into 'master'""

This reverts commit 999b15a909.

buildserver/config.buildserver.py

@@ -11,6 +11,7 @@ ndk_paths = {
     'r18b': "/home/vagrant/android-ndk/r18b",
     'r19c': "/home/vagrant/android-ndk/r19c",
     'r20b': "/home/vagrant/android-ndk/r20b",
+    'r21': "/home/vagrant/android-ndk/r21",
 }
 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 r20b; do
+for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21; 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

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

makebuildserver

@@ -384,6 +384,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-r21-linux-x86_64.zip',
+     'b65ea2d5c5b68fb603626adcbcea6e4d12c68eb8a73e373bbb9d23c252fc647b'),
 ]