From bf153ec2475f5c9f5c415fbc906184eae523ff78 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 1 Aug 2016 12:38:52 +0100 Subject: [PATCH 1/1] 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 --- buildserver/config.buildserver.py | 1 - buildserver/provision-android-ndk | 5 ----- docs/fdroid.texi | 6 +++--- examples/config.py | 3 +-- fdroidserver/build.py | 2 +- fdroidserver/common.py | 3 +-- fdroidserver/init.py | 2 +- fdroidserver/metadata.py | 2 +- makebuildserver | 2 -- 9 files changed, 8 insertions(+), 18 deletions(-) diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py index 57ae0b2b..50976dbe 100644 --- 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 4c4f0d54..36aa1a5c 100644 --- 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 d84c59a5..e61d0994 100644 --- 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=[,,...] Build with Gradle instead of Ant, specifying what flavours to use. Flavours diff --git a/examples/config.py b/examples/config.py index 255b9c0c..97628e7e 100644 --- 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 d02947bd..70ad1aee 100644 --- 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 b0a27ac4..d8defcb8 100644 --- 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 f29b2d53..caa77734 100644 --- 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 f20b2230..9ba9b1fd 100644 --- 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 08be3829..6a4793f2 100755 --- 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'), ] -- 2.30.2