From 263731e9bc7fdf335e79c525bab3ccbb12f73a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 17 Feb 2014 20:03:55 +0100 Subject: [PATCH] Complain if buildjni is used but the NDK isn't available --- fdroidserver/build.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 3c6f45ee..39fffa29 100644 --- 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)