Merge branch 'ndk11' into 'master'

Add ndk r11c

NDK11 is required by some apps (some versions of VLC) which will not build with r10e or r12b. As always, please test this before merging: I havent added a NDK before.

See merge request !155

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 = {

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

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.
 

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

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

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'),
 ]