makebs: add ndk r14

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 3719a4b8378ca34a2da92d7b97005cb3e754fa62..e7a4f4162c4ed5aa23ffa3d7636d90e36905c541 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -5,6 +5,7 @@ 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",
 }
 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 1be60a227e3d1455c37b8bebed3e40d7bf929bfb..20f1b3a22c9500b7c15eb8e719aad86b037d6d8b 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -35,5 +35,10 @@ 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
+fi
+
 chmod -R a+rX $NDK_BASE/
 find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x

diff --git a/examples/config.py b/examples/config.py
index 615cd14e348412e01d6ab261fc0e434760c9746f..9d0b8d0456b7f4b43de8b9bd3b7e4c62702b634e 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -16,6 +16,7 @@
 #     'r11c': None,
 #     'r12b': "$ANDROID_NDK",
 #     'r13b': None,
+#     'r14': 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 85f7eac0e59d02d8a678c95e9d712f06f33d2dd0..31c97380a8859dd68bfd471cca8870f61408ccac 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -62,6 +62,7 @@ default_config = {
         'r11c': None,
         'r12b': "$ANDROID_NDK",
         'r13b': None,
+        'r14': None,
     },
     'qt_sdk_path': None,
     'build_tools': "25.0.2",

diff --git a/makebuildserver b/makebuildserver
index 0446be56ee7f5a10a9396736f5e8c766c5edbbf4..f1bd696f7fb5e515383f214f61c83ea9eda936eb 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -305,6 +305,8 @@ cachefiles = [
      'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
     ('https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip',
      '3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
+    ('https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip',
+     '3e622c2c9943964ea44cd56317d0769ed4c811bb4b40dc45b1f6965e4db9aa44'),
     ('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
      'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
 ]