From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 25 Jul 2016 11:07:46 +0000 (+0200)
Subject: common: don't insert $ANDROID_NDK to local.props
X-Git-Tag: 0.7.0~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=dee3e850982def59ef657ca8c89f89cc29bb78fd

common: don't insert $ANDROID_NDK to local.props

See the comment.

Updates #171.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e337a7f1..9f7e6c1b 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1373,7 +1373,12 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
             props += "sdk.dir=%s\n" % config['sdk_path']
             props += "sdk-location=%s\n" % config['sdk_path']
         ndk_path = build.ndk_path()
-        if ndk_path:
+        # if it wasn't expanded correctly (because the NDK is not
+        # installed or $ANDROID_NDK not set properly), don't insert it.
+        # even if not actually used, Gradle will error with a cryptic
+        # message.
+        # https://gitlab.com/fdroid/fdroidserver/issues/171
+        if ndk_path and ndk_path[0] != '$':
             # Add ndk location
             props += "ndk.dir=%s\n" % ndk_path
             props += "ndk-location=%s\n" % ndk_path