kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-07 09:50:07 +02:00
Code Activity

common: extra checks for NDK in local.props

Browse Source 
The previous commit fixed it in local setups, this fixes it in broken
buildservers too and makes it more reliable.
This commit is contained in:
Daniel Martí 2016-07-28 08:26:51 +02:00
parent 957f01f1d6
commit e46debe12e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/common.py
View File

@ -1373,12 +1373,11 @@ 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 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.
# if for any reason the path isn't valid or the directory
# doesn't exist, some versions of Gradle will error with a
# cryptic message (even if the NDK is not even necessary).
# https://gitlab.com/fdroid/fdroidserver/issues/171
if ndk_path and ndk_path[0] != '$':
if ndk_path and os.path.exists(ndk_path):
# Add ndk location
props += "ndk.dir=%s\n" % ndk_path
props += "ndk-location=%s\n" % ndk_path