Revert "all: add NDK r12b and set it as default"

This reverts commit 82d09560c63ea282222b319437494ad6837be026.

It doesn't work - the setup scripts are expecting a ".bin" file (which
is apparently a 7z archive), but what's actually got is a ".zip".

Conflicts:
	buildserver/provision-android-ndk

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 57ae0b2b6e5e8a52ea56d48d64fcc4f26823ce29..50976dbe9ba8302061593451c6e3b312072e9b69 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -2,7 +2,6 @@ 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 4c4f0d54b4817432cb9a2d01ec231bfc709f7d91..36aa1a5c9e03f724bacd9bb0e8ef6ebe31e08339 100644 (file)
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -20,10 +20,5 @@ if [ ! -e $NDK_BASE/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
-if [ ! -e $NDK_BASE/r12b ]; then
-    7zr x /vagrant/cache/android-ndk-r12b-linux-x86_64.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 d84c59a5b620697a81d001d689379b2ed91a464d..e61d0994caba66dba7591383c3e89bb1c081231b 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, 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.
+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.
 
 @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 255b9c0cb02459ce5d72b6991ed1569d28dd05e0..97628e7e0ad8f97d394c75ac1dae9262d667716b 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -12,8 +12,7 @@
 # not installed.
 # ndk_paths = {
 #     'r9b': None,
-#     'r10e': None,
-#     'r12b': "$ANDROID_NDK",
+#     'r10e': "$ANDROID_NDK",
 # }
 
 # java_paths = {

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index d02947bdb5aaa4583bfc41ce9cec5c1dc10106ce..70ad1aee6a9460afcc023aeaa98009cddeb6f27a 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.ndk or (build.buildjni and build.buildjni != ['no']):
         if not ndk_path:
-            logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r12b')
+            logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r10e')
             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 b0a27ac4634b8e1d824fe03f3e1b0e9743eb58a6..d8defcb8c0ec6e599e0d2966255d34b160d3254b 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -56,8 +56,7 @@ default_config = {
     'sdk_path': "$ANDROID_HOME",
     'ndk_paths': {
         'r9b': None,
-        'r10e': None,
-        'r12b': "$ANDROID_NDK",
+        'r10e': "$ANDROID_NDK",
     },
     'build_tools': "24.0.0",
     'force_build_tools': False,

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index f29b2d53891057e33bf117363c177092f677865f..caa777346fbd29393fce069541d2eaa2f6993e78 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 r12b (optional):\t$ANDROID_NDK')
+    logging.info('  Android NDK r10e (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 f20b22303ef8291e2bb3db3df073001dc09be614..9ba9b1fdef17d8a1ecb0acb9c2a9c5dd418d80c6 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 = 'r12b'  # falls back to latest
+            version = 'r10e'  # falls back to latest
         paths = fdroidserver.common.config['ndk_paths']
         if version not in paths:
             return ''

diff --git a/makebuildserver b/makebuildserver
index 08be3829d45da67618622326efcb85f4227ccb1a..6a4793f24164ae76971d467303d704c0ea851333 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -245,8 +245,6 @@ 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'),
 ]