all: add NDK r12b and set it as default

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 50976dbe9ba8302061593451c6e3b312072e9b69..57ae0b2b6e5e8a52ea56d48d64fcc4f26823ce29 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",
+    'r12b': "/home/vagrant/android-ndk/r12b",
 }
 java_paths = {
     '8': "/usr/lib/jvm/java-8-openjdk-i386",

diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 4ce42cc21f508529ede432d01cb0229fed36afd0..030b01594d47035bc989e81366541480c3d15d34 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -30,5 +30,15 @@ if [ ! -e $NDK_BASE/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
+if [ ! -e $NDK_BASE/r12b ]; then
+    if [ `uname -m` == 'x86_64' ] ; then
+       SUFFIX='_64'
+    else
+       SUFFIX=''
+    fi
+    7zr x /vagrant/cache/android-ndk-r12b-linux-x86$SUFFIX.bin > /dev/null
+    mv android-ndk-r12b r12b
+fi
+
 chmod -R a+rX $NDK_BASE/
 find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index c3588d55dd3bc4af3eeaa2e07c57ba3c3c1c6204..cf744c48996446bc67e6e5a152ce8534b96e4214 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1125,9 +1125,9 @@ 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 and the latest release
-as of writing this document, r10e. You may add support for more versions by
-adding them to 'ndk_paths' in your config file.
+The buildserver supports r9b with its legacy toolchains, r10e 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.
 
 @item gradle=<flavour1>[,<flavour2>,...]
 Build with Gradle instead of Ant, specifying what flavours to use. Flavours

diff --git a/examples/config.py b/examples/config.py
index 97628e7e0ad8f97d394c75ac1dae9262d667716b..255b9c0cb02459ce5d72b6991ed1569d28dd05e0 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -12,7 +12,8 @@
 # not installed.
 # ndk_paths = {
 #     'r9b': None,
-#     'r10e': "$ANDROID_NDK",
+#     'r10e': None,
+#     'r12b': "$ANDROID_NDK",
 # }
 
 # java_paths = {

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index eea35f0a8aa07a580ca19648635cf512508ddba2..fbdfbf8db44a6a53ea5e252bce6601d2eff7d983 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -460,7 +460,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
     ndk_path = build.ndk_path()
     if build.buildjni and build.buildjni != ['no']:
         if not ndk_path:
-            logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r10e')
+            logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r12b')
             logging.critical("Configured versions:")
             for k, v in config['ndk_paths'].items():
                 if k.endswith("_orig"):

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ce81b3855ba2f901690afc07d5a6284d4e3d189e..e337a7f13a94205ea0981e9d93898321db83605b 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -56,7 +56,8 @@ default_config = {
     'sdk_path': "$ANDROID_HOME",
     'ndk_paths': {
         'r9b': None,
-        'r10e': "$ANDROID_NDK",
+        'r10e': None,
+        'r12b': "$ANDROID_NDK",
     },
     'build_tools': "24.0.0",
     'force_build_tools': False,

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index caa777346fbd29393fce069541d2eaa2f6993e78..f29b2d53891057e33bf117363c177092f677865f 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -235,7 +235,7 @@ def main():
     logging.info('  Android SDK:\t\t\t' + config['sdk_path'])
     if aapt:
         logging.info('  Android SDK Build Tools:\t' + os.path.dirname(aapt))
-    logging.info('  Android NDK r10e (optional):\t$ANDROID_NDK')
+    logging.info('  Android NDK r12b (optional):\t$ANDROID_NDK')
     logging.info('  Keystore for signing key:\t' + keystore)
     if repo_keyalias is not None:
         logging.info('  Alias for key in store:\t' + repo_keyalias)

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 9ba9b1fdef17d8a1ecb0acb9c2a9c5dd418d80c6..f20b22303ef8291e2bb3db3df073001dc09be614 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -348,7 +348,7 @@ class Build():
     def ndk_path(self):
         version = self.ndk
         if not version:
-            version = 'r10e'  # falls back to latest
+            version = 'r12b'  # falls back to latest
         paths = fdroidserver.common.config['ndk_paths']
         if version not in paths:
             return ''

diff --git a/makebuildserver b/makebuildserver
index 173ca747291379b80abd4fd060b896034ecbe279..439910cf7c403d5210695e3d45fcc35295cbf3a3 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -244,6 +244,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-r12b-linux-x86_64.zip',
+     'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
 ]