makebuildserver: upgrade NDK r15b to r15c

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index eded3c8d8398448054b2564c1975cbf4e746e59c..2ac78979310807b1543f1b2013c769bc08087913 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -6,7 +6,7 @@ ndk_paths = {
     'r12b': "/home/vagrant/android-ndk/r12b",
     'r13b': "/home/vagrant/android-ndk/r13b",
     'r14b': "/home/vagrant/android-ndk/r14b",
-    'r15b': "/home/vagrant/android-ndk/r15b",
+    'r15c': "/home/vagrant/android-ndk/r15c",
 }
 qt_sdk_path = "/home/vagrant/qt-sdk/5.7.0/5.7"
 java_paths = {

diff --git a/examples/config.py b/examples/config.py
index d820978ca65fe266d66a442e11f5e60ff06673f5..82f77431997ef2ccc220fdbc771cde78ee23b61b 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -17,7 +17,7 @@
 #     'r12b': "$ANDROID_NDK",
 #     'r13b': None,
 #     'r14b': None,
-#     'r15b': None,
+#     'r15c': None,
 # }
 
 # Path to the Qt SDK. It is of the form "/path/to/Qt5.7.0/5.7"

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9800955fda09d686c153f5547063c857032b694d..95b1b06c0a97e34a67a222dff9dac9cdd8e08a4d 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -75,7 +75,7 @@ default_config = {
         'r12b': "$ANDROID_NDK",
         'r13b': None,
         'r14b': None,
-        'r15b': None,
+        'r15c': None,
     },
     'qt_sdk_path': None,
     'build_tools': "25.0.2",

diff --git a/makebuildserver b/makebuildserver
index fc4b587289998f55728747ea9c10ea1cf43af0bd..6b1606d3f8548d628199db03c5892b47f3865bb3 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -320,8 +320,8 @@ cachefiles = [
      '3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
     ('https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip',
      '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
-    ('https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip',
-     'd1ce63f68cd806b5a992d4e5aa60defde131c243bf523cdfc5b67990ef0ee0d3'),
+    ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip',
+     'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
     ('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
      'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
 ]