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
ndk_paths = {
'r9b': "/home/vagrant/android-ndk/r9b",
'r10e': "/home/vagrant/android-ndk/r10e",
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",
}
java_paths = {
'8': "/usr/lib/jvm/java-8-openjdk-i386",
mv android-ndk-r10e r10e
fi
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
chmod -R a+rX $NDK_BASE/
find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x
that included legacy toolchains, so as to not break builds that require
toolchains no longer included in current versions of the NDK.
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
@item gradle=<flavour1>[,<flavour2>,...]
Build with Gradle instead of Ant, specifying what flavours to use. Flavours
# not installed.
# ndk_paths = {
# 'r9b': None,
# not installed.
# ndk_paths = {
# 'r9b': None,
-# 'r10e': None,
-# 'r12b': "$ANDROID_NDK",
+# 'r10e': "$ANDROID_NDK",
ndk_path = build.ndk_path()
if build.ndk or (build.buildjni and build.buildjni != ['no']):
if not ndk_path:
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"):
logging.critical("Configured versions:")
for k, v in config['ndk_paths'].items():
if k.endswith("_orig"):
'sdk_path': "$ANDROID_HOME",
'ndk_paths': {
'r9b': None,
'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,
},
'build_tools': "24.0.0",
'force_build_tools': False,
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 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)
logging.info(' Keystore for signing key:\t' + keystore)
if repo_keyalias is not None:
logging.info(' Alias for key in store:\t' + repo_keyalias)
def ndk_path(self):
version = self.ndk
if not version:
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 ''
paths = fdroidserver.common.config['ndk_paths']
if version not in paths:
return ''
'8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
'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'),