Add ndk r11c

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 57ae0b2b6e5e8a52ea56d48d64fcc4f26823ce29..c5fc8d7ec872c8e4b4a706f4f0da57ec0ec154a0 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -2,6 +2,7 @@ sdk_path = "/home/vagrant/android-sdk"
 ndk_paths = {
     'r9b': "/home/vagrant/android-ndk/r9b",
     'r10e': "/home/vagrant/android-ndk/r10e",
+    'r11c': "/home/vagrant/android-ndk/r11c",
     'r12b': "/home/vagrant/android-ndk/r12b",
 }
 java_paths = {

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index ce1a8683bc8f46039cc34f5007e822639d12c6ee..215f01399032be6360ef526a1d295511e0118b67 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -20,6 +20,11 @@ if [ ! -e $NDK_BASE/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
+if [ ! -e $NDK_BASE/r11c ]; then
+    unzip /vagrant/cache/android-ndk-r11c-linux-x86_64.zip > /dev/null
+    mv android-ndk-r11c r11c
+fi
+
 if [ ! -e $NDK_BASE/r12b ]; then
     unzip /vagrant/cache/android-ndk-r12b-linux-x86_64.zip > /dev/null
     mv android-ndk-r12b r12b

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index d84c59a5b620697a81d001d689379b2ed91a464d..4c7fb0fbeb8bb76018ff08bb560b24f0b6e57353 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1125,7 +1125,7 @@ Version of the NDK to use in this build. Defaults to the latest NDK release
 that included legacy toolchains, so as to not break builds that require
 toolchains no longer included in current versions of the NDK.
 
-The buildserver supports r9b with its legacy toolchains, r10e and the
+The buildserver supports r9b with its legacy toolchains, r10e, r11c and the
 latest release as of writing this document, r12b. You may add support
 for more versions by adding them to 'ndk_paths' in your config file.
 

diff --git a/examples/config.py b/examples/config.py
index 464528db682ed42a3c2c68cc6ea89c3687897b83..d2c0105eb73b2bc98005870201f4240622d62e2f 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -6,13 +6,14 @@
 # Custom path to the Android SDK, defaults to $ANDROID_HOME
 # sdk_path = "$ANDROID_HOME"
 
-# Custom paths to various versions of the Android NDK, defaults to 'r10e' set
+# Custom paths to various versions of the Android NDK, defaults to 'r12b' set
 # to $ANDROID_NDK. Most users will have the latest at $ANDROID_NDK, which is
 # used by default. If a version is missing or assigned to None, it is assumed
 # not installed.
 # ndk_paths = {
 #     'r9b': None,
 #     'r10e': None,
+#     'r11c': None,
 #     'r12b': "$ANDROID_NDK",
 # }
 

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 593bab2da947abc1686dbea301066fc5a10c3754..6f12b60bd078f6e5f6688c614483287229a11983 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -57,6 +57,7 @@ default_config = {
     'ndk_paths': {
         'r9b': None,
         'r10e': None,
+        'r11c': None,
         'r12b': "$ANDROID_NDK",
     },
     'build_tools': "24.0.1",

diff --git a/makebuildserver b/makebuildserver
index 6a3acfe72cf1df283f578eff56edec2e73de9c38..bd9a46a0b8a3eacce1391c4ce558f90fab041123 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -247,6 +247,8 @@ cachefiles = [
      '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
      'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
+    ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
+     'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
     ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
      'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
 ]