build: error properly if an invalid ndk is used

Currently, if buildjni is not used but ndk is set to an invalid value,
the build would start but $ANDROID_NDK would be empty. This is happening
in VLC, which results in very confusing errors.

If a build uses a ndk= value that is not set up, such as r11/r12 which
we do not have yet, it should error with "NDK version could not be
found". It does with this change.

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index eea35f0a8aa07a580ca19648635cf512508ddba2..70ad1aee6a9460afcc023aeaa98009cddeb6f27a 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -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:")