From: relan <email@hidden>
Date: Sun, 11 Feb 2018 07:20:42 +0000 (+0300)
Subject: makebuildserver: upgrade NDK r16 to r16b
X-Git-Tag: 1.0.1~20^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6f295cb3d3285d836d36d4ba8b5457cc781297fc;p=fdroidserver.git

makebuildserver: upgrade NDK r16 to r16b
---

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 3cefcb8d..d8e7ebda 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -7,7 +7,7 @@ ndk_paths = {
     'r13b': "/home/vagrant/android-ndk/r13b",
     'r14b': "/home/vagrant/android-ndk/r14b",
     'r15c': "/home/vagrant/android-ndk/r15c",
-    'r16': "/home/vagrant/android-ndk/r16",
+    'r16b': "/home/vagrant/android-ndk/r16b",
 }
 java_paths = {
     '8': "/usr/lib/jvm/java-8-openjdk-amd64",
diff --git a/examples/config.py b/examples/config.py
index a065bbd3..93c3ae3e 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -18,7 +18,7 @@
 #     'r13b': None,
 #     'r14b': None,
 #     'r15c': None,
-#     'r16': None,
+#     'r16b': None,
 # }
 
 # java_paths = {
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index d97cede3..6a655d2d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -84,7 +84,7 @@ default_config = {
         'r13b': None,
         'r14b': None,
         'r15c': None,
-        'r16': None,
+        'r16b': None,
     },
     'build_tools': MINIMUM_AAPT_VERSION,
     'force_build_tools': False,
diff --git a/makebuildserver b/makebuildserver
index 37ec514e..e6d30eb1 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -365,8 +365,8 @@ cachefiles = [
      '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
     ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip',
      'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
-    ('https://dl.google.com/android/repository/android-ndk-r16-linux-x86_64.zip',
-     'a8550b81771c67cc6ab7b479a6918d29aa78de3482901762b4f9e0132cd9672e'),
+    ('https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip',
+     'bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901'),
 ]