Complain if buildjni is used but the NDK isn't available

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 3c6f45ee07f1d9e2f5180e7f0ad1645d12bfc455..39fffa2913f0b6a435fef807c8931ff4921dc21c 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -373,6 +373,14 @@ def adapt_gradle(build_dir):
 def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver):
     """Do a build locally."""
 
+    if thisbuild.get('buildjni') not in (None, ['no']):
+        if not config['ndk_path']:
+            logging.critical("$ANDROID_NDK is not set!")
+            sys.exit(3)
+        elif not os.path.isdir(config['sdk_path']):
+            logging.critical("$ANDROID_NDK points to a non-existing directory!")
+            sys.exit(3)
+
     # Prepare the source code...
     root_dir, srclibpaths = common.prepare_source(vcs, app, thisbuild,
             build_dir, srclib_dir, extlib_dir, onserver)