mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ndk-error' into 'master'

Browse source 
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
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/build.py
View file

@ -458,7 +458,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
"""Do a build locally.""" """Do a build locally."""
ndk_path = build.ndk_path() 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: 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 'r10e')
logging.critical("Configured versions:") logging.critical("Configured versions:")