From: relan <email@hidden>
Date: Tue, 4 Jul 2017 07:46:52 +0000 (+0300)
Subject: makebuildserver: fix NDK r14b provisioning
X-Git-Tag: 0.8~24^2~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ecdb2c685a2b23ced849a02b603212b0f0d3fda2;p=fdroidserver.git

makebuildserver: fix NDK r14b provisioning

Replace r14 with r14b after a57bff7.
---

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",