Merge branch 'ndk-r16b' into 'master'

makebuildserver: upgrade NDK r16 to r16b

See merge request fdroid/fdroidserver!458

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 3cefcb8d4b2d0e7ce4dccad4f14ef674af662074..d8e7ebda837ce5067e1d5eb316943ec8d6bbe4b9 100644 (file)
--- 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 a065bbd3780577853f6f8acb2b1e3bb9cabf6914..93c3ae3e4cf9f49c9317de90af37a74b8d5797c6 100644 (file)
--- 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 d97cede329c2a5e8c7a250b59b601a350bbcaba6..6a655d2d300d6cc855bf34a799d85f443c9d7c12 100644 (file)
--- 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 80b794dc908540d3ecc249f5be87dc23c407e7c3..2fd51b18271a20f5f05803739acd0a3cd71cf8a7 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -367,8 +367,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'),
 ]