From ecdb2c685a2b23ced849a02b603212b0f0d3fda2 Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Tue, 4 Jul 2017 10:46:52 +0300
Subject: [PATCH 1/2] makebuildserver: fix NDK r14b provisioning

Replace r14 with r14b after a57bff7.
---
 buildserver/config.buildserver.py | 2 +-
 buildserver/provision-android-ndk | 6 +++---
 examples/config.py                | 2 +-
 fdroidserver/common.py            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index ac978fbe..b0216ed4 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -5,7 +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",
+    'r14b': "/home/vagrant/android-ndk/r14b",
 }
 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 20f1b3a2..378ce53a 100644
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -35,9 +35,9 @@ 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
 
 chmod -R a+rX $NDK_BASE/
diff --git a/examples/config.py b/examples/config.py
index 974f8ee1..c3bf1139 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -16,7 +16,7 @@
 #     'r11c': None,
 #     'r12b': "$ANDROID_NDK",
 #     'r13b': None,
-#     'r14': None,
+#     'r14b': 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 76888cce..0154f6cb 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -74,7 +74,7 @@ default_config = {
         'r11c': None,
         'r12b': "$ANDROID_NDK",
         'r13b': None,
-        'r14': None,
+        'r14b': None,
     },
     'qt_sdk_path': None,
     'build_tools': "25.0.2",

From 86b403b5993c61b2e81b65965885d39f1364a0d3 Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Tue, 4 Jul 2017 11:44:25 +0300
Subject: [PATCH 2/2] makebuildserver: add NDK r15b

---
 buildserver/config.buildserver.py | 1 +
 buildserver/provision-android-ndk | 5 +++++
 examples/config.py                | 1 +
 fdroidserver/common.py            | 1 +
 makebuildserver                   | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index b0216ed4..eded3c8d 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -6,6 +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",
 }
 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 378ce53a..de6943b4 100644
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -40,5 +40,10 @@ if [ ! -e $NDK_BASE/r14b ]; then
     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/
 find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x
diff --git a/examples/config.py b/examples/config.py
index c3bf1139..d820978c 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -17,6 +17,7 @@
 #     'r12b': "$ANDROID_NDK",
 #     'r13b': 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 0154f6cb..f84ea0f1 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -75,6 +75,7 @@ default_config = {
         'r12b': "$ANDROID_NDK",
         'r13b': None,
         'r14b': None,
+        'r15b': None,
     },
     'qt_sdk_path': None,
     'build_tools': "25.0.2",
diff --git a/makebuildserver b/makebuildserver
index dc2ee0ae..fc4b5872 100755
--- 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'),
 ]