Merge branch 'ndk' into 'master'

NDK r14b and r15b

See merge request !293

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

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 20f1b3a22c9500b7c15eb8e719aad86b037d6d8b..de6943b49c1389caa5bb8ad6fabe17eed7f6ef9f 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -35,9 +35,14 @@ if [ ! -e $NDK_BASE/r13b ]; then
     mv android-ndk-r13b r13b
 fi
 
-if [ ! -e $NDK_BASE/r14 ]; then
-    unzip /vagrant/cache/android-ndk-r14-linux-x86_64.zip > /dev/null
-    mv android-ndk-r14 r14
+if [ ! -e $NDK_BASE/r14b ]; then
+    unzip /vagrant/cache/android-ndk-r14b-linux-x86_64.zip > /dev/null
+    mv android-ndk-r14b r14b
+fi
+
+if [ ! -e $NDK_BASE/r15b ]; then
+    unzip /vagrant/cache/android-ndk-r15b-linux-x86_64.zip > /dev/null
+    mv android-ndk-r15b r15b
 fi
 
 chmod -R a+rX $NDK_BASE/

diff --git a/examples/config.py b/examples/config.py
index 974f8ee1562e2d29a8968c43d5c8b6e13d8ad106..d820978ca65fe266d66a442e11f5e60ff06673f5 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -16,7 +16,8 @@
 #     'r11c': None,
 #     'r12b': "$ANDROID_NDK",
 #     'r13b': None,
-#     'r14': None,
+#     'r14b': None,
+#     'r15b': 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 875e43a38dd3984c57e7c32dc70c4159f20e2ecc..c8fdaad529de3f49e1d9bb12b00d649a2da40583 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -74,7 +74,8 @@ default_config = {
         'r11c': None,
         'r12b': "$ANDROID_NDK",
         'r13b': None,
-        'r14': None,
+        'r14b': None,
+        'r15b': None,
     },
     'qt_sdk_path': None,
     'build_tools': "25.0.2",

diff --git a/makebuildserver b/makebuildserver
index dc2ee0ae1c9705d64725d932d555fb0c4c8c0b61..fc4b587289998f55728747ea9c10ea1cf43af0bd 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -320,6 +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://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
      'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
 ]