Commit 059d216a authored by Daniel Martí's avatar Daniel Martí

Re-add NDK r12b, now fixed.

parent bf153ec2
......@@ -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",
......
......@@ -20,5 +20,10 @@ if [ ! -e $NDK_BASE/r10e ]; then
mv android-ndk-r10e r10e
fi
if [ ! -e $NDK_BASE/r12b ]; then
unzip /vagrant/cache/android-ndk-r12b-linux-x86_64.zip > /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
......@@ -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
......
......@@ -12,7 +12,8 @@
# not installed.
# ndk_paths = {
# 'r9b': None,
# 'r10e': "$ANDROID_NDK",
# 'r10e': None,
# 'r12b': "$ANDROID_NDK",
# }
# java_paths = {
......
......@@ -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 '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"):
......
......@@ -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,
......
......@@ -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)
......
......@@ -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 ''
......
......@@ -245,6 +245,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'),
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment