From 52c2ca1fe7cd7a80d84b16172805ac257df83603 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 18 Jun 2015 17:05:48 +0200 Subject: [PATCH] Replace NDK r10d with r10e --- buildserver/config.buildserver.py | 2 +- buildserver/cookbooks/android-ndk/recipes/default.rb | 10 +++++----- docs/fdroid.texi | 2 +- examples/config.py | 2 +- fdroidserver/common.py | 4 ++-- fdroidserver/init.py | 2 +- makebuildserver | 12 ++++++------ 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py index 6e29ff52..98aa69c1 100644 --- a/buildserver/config.buildserver.py +++ b/buildserver/config.buildserver.py @@ -1,7 +1,7 @@ sdk_path = "/home/vagrant/android-sdk" ndk_paths = { 'r9b': "/home/vagrant/android-ndk/r9b", - 'r10d': "/home/vagrant/android-ndk/r10d" + 'r10e': "/home/vagrant/android-ndk/r10e" } build_tools = "22.0.1" ant = "ant" diff --git a/buildserver/cookbooks/android-ndk/recipes/default.rb b/buildserver/cookbooks/android-ndk/recipes/default.rb index 2d8cadfc..6fe9e11f 100644 --- a/buildserver/cookbooks/android-ndk/recipes/default.rb +++ b/buildserver/cookbooks/android-ndk/recipes/default.rb @@ -35,7 +35,7 @@ script "setup-android-ndk-r9b" do end end -script "setup-android-ndk-r10d" do +script "setup-android-ndk-r10e" do timeout 14400 interpreter "bash" user node[:settings][:user] @@ -46,12 +46,12 @@ script "setup-android-ndk-r10d" do else SUFFIX='' fi - chmod u+x /vagrant/cache/android-ndk-r10d-linux-x86$SUFFIX.bin - /vagrant/cache/android-ndk-r10d-linux-x86$SUFFIX.bin x - mv android-ndk-r10d #{ndk_loc}/r10d + chmod u+x /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin + /vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin x + mv android-ndk-r10e #{ndk_loc}/r10e " not_if do - File.exists?("#{ndk_loc}/r10d") + File.exists?("#{ndk_loc}/r10e") end end diff --git a/docs/fdroid.texi b/docs/fdroid.texi index 2efd34c3..7de197ec 100644 --- a/docs/fdroid.texi +++ b/docs/fdroid.texi @@ -1008,7 +1008,7 @@ 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, r10d. You may add support for more versions by +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=[,,...] diff --git a/examples/config.py b/examples/config.py index e87363f0..ccd0a5ed 100644 --- a/examples/config.py +++ b/examples/config.py @@ -11,7 +11,7 @@ sdk_path = "$ANDROID_HOME" # If a version is missing or assigned to None, it is assumed not installed ndk_paths = { 'r9b': None, - 'r10d': "$ANDROID_NDK" + 'r10e': "$ANDROID_NDK" } # Build tools version to be used diff --git a/fdroidserver/common.py b/fdroidserver/common.py index ec543faf..9e51ffdf 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -51,7 +51,7 @@ default_config = { 'sdk_path': "$ANDROID_HOME", 'ndk_paths': { 'r9b': None, - 'r10d': "$ANDROID_NDK" + 'r10e': "$ANDROID_NDK" }, 'build_tools': "22.0.1", 'ant': "ant", @@ -194,7 +194,7 @@ def read_config(opts, config_file='config.py'): def get_ndk_path(version): if version is None: - version = 'r10d' # latest + version = 'r10e' # latest paths = config['ndk_paths'] if version not in paths: return '' diff --git a/fdroidserver/init.py b/fdroidserver/init.py index c49cb303..1e77e2fe 100644 --- a/fdroidserver/init.py +++ b/fdroidserver/init.py @@ -228,7 +228,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 r10d (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/makebuildserver b/makebuildserver index ca9afdc5..ba1ff993 100755 --- a/makebuildserver +++ b/makebuildserver @@ -108,9 +108,9 @@ cachefiles = [ if config['arch64']: cachefiles.extend([ - ('android-ndk-r10d-linux-x86_64.bin', - 'https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin', - '812949f9299afd4b91890863054dc42f6547b6d485211d5f0faca9f286685df6'), + ('android-ndk-r10e-linux-x86_64.bin', + 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin', + '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'), ('android-ndk-r9b-linux-x86_64.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2', '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'), @@ -119,9 +119,9 @@ if config['arch64']: 'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')]) else: cachefiles.extend([ - ('android-ndk-r10d-linux-x86.bin', - 'https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86.bin', - 'c0d07e5ce2fff13b5eb456c10e99527184c9139e798cb7fd1adfadafa65cb696'), + ('android-ndk-r10e-linux-x86.bin', + 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin', + '92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5'), ('android-ndk-r9b-linux-x86.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2', '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'), -- 2.30.2