mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 82d09560c6.

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
This commit is contained in:
Ciaran Gultnieks 2016-08-01 12:38:52 +01:00
parent e99454868a
commit bf153ec247
9 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
buildserver/config.buildserver.py
View file

@ -2,7 +2,6 @@ sdk_path = "/home/vagrant/android-sdk"
ndk_paths = { ndk_paths = {
'r9b': "/home/vagrant/android-ndk/r9b", 'r9b': "/home/vagrant/android-ndk/r9b",
'r10e': "/home/vagrant/android-ndk/r10e", 'r10e': "/home/vagrant/android-ndk/r10e",
'r12b': "/home/vagrant/android-ndk/r12b",
} }
java_paths = { java_paths = {
'8': "/usr/lib/jvm/java-8-openjdk-i386", '8': "/usr/lib/jvm/java-8-openjdk-i386",

5
buildserver/provision-android-ndk
View file

@ -20,10 +20,5 @@ if [ ! -e $NDK_BASE/r10e ]; then
mv android-ndk-r10e r10e mv android-ndk-r10e r10e
fi 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/ chmod -R a+rX $NDK_BASE/
find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x

6
docs/fdroid.texi
View file

@ -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 that included legacy toolchains, so as to not break builds that require
toolchains no longer included in current versions of the NDK. 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 and the latest release
latest release as of writing this document, r12b. You may add support as of writing this document, r10e. You may add support for more versions by
for more versions by adding them to 'ndk_paths' in your config file. adding them to 'ndk_paths' in your config file.
@item gradle=<flavour1>[,<flavour2>,...] @item gradle=<flavour1>[,<flavour2>,...]
Build with Gradle instead of Ant, specifying what flavours to use. Flavours Build with Gradle instead of Ant, specifying what flavours to use. Flavours

3
examples/config.py
View file

@ -12,8 +12,7 @@
# not installed. # not installed.
# ndk_paths = { # ndk_paths = {
# 'r9b': None, # 'r9b': None,
# 'r10e': None, # 'r10e': "$ANDROID_NDK",
# 'r12b': "$ANDROID_NDK",
# } # }
# java_paths = { # java_paths = {

2
fdroidserver/build.py
View file

@ -460,7 +460,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
ndk_path = build.ndk_path() ndk_path = build.ndk_path()
if build.ndk or (build.buildjni and build.buildjni != ['no']): if build.ndk or (build.buildjni and build.buildjni != ['no']):
if not ndk_path: 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:") logging.critical("Configured versions:")
for k, v in config['ndk_paths'].items(): for k, v in config['ndk_paths'].items():
if k.endswith("_orig"): if k.endswith("_orig"):

3
fdroidserver/common.py
View file

@ -56,8 +56,7 @@ default_config = {
'sdk_path': "$ANDROID_HOME", 'sdk_path': "$ANDROID_HOME",
'ndk_paths': { 'ndk_paths': {
'r9b': None, 'r9b': None,
'r10e': None, 'r10e': "$ANDROID_NDK",
'r12b': "$ANDROID_NDK",
}, },
'build_tools': "24.0.0", 'build_tools': "24.0.0",
'force_build_tools': False, 'force_build_tools': False,

2
fdroidserver/init.py
View file

@ -235,7 +235,7 @@ def main():
logging.info(' Android SDK:\t\t\t' + config['sdk_path']) logging.info(' Android SDK:\t\t\t' + config['sdk_path'])
if aapt: if aapt:
logging.info(' Android SDK Build Tools:\t' + os.path.dirname(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) logging.info(' Keystore for signing key:\t' + keystore)
if repo_keyalias is not None: if repo_keyalias is not None:
logging.info(' Alias for key in store:\t' + repo_keyalias) logging.info(' Alias for key in store:\t' + repo_keyalias)

2
fdroidserver/metadata.py
View file

@ -348,7 +348,7 @@ class Build():
def ndk_path(self): def ndk_path(self):
version = self.ndk version = self.ndk
if not version: if not version:
version = 'r12b' # falls back to latest version = 'r10e' # falls back to latest
paths = fdroidserver.common.config['ndk_paths'] paths = fdroidserver.common.config['ndk_paths']
if version not in paths: if version not in paths:
return '' return ''

2
makebuildserver
View file

@ -245,8 +245,6 @@ cachefiles = [
'8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'), '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2', ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'), 'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
] ]