1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00

Merge branch 'ndk-error' into 'master'

build: error properly if an invalid ndk is used



See merge request !146
This commit is contained in:
Hans-Christoph Steiner 2016-07-18 14:47:45 +00:00
commit ad966c5bd9

View File

@ -458,7 +458,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
"""Do a build locally."""
ndk_path = build.ndk_path()
if build.buildjni and build.buildjni != ['no']:
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("Configured versions:")