mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-11 15:13:27 +02:00
common: extra checks for NDK in local.props
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:
parent
957f01f1d6
commit
e46debe12e
@ -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.dir=%s\n" % config['sdk_path']
|
||||||
props += "sdk-location=%s\n" % config['sdk_path']
|
props += "sdk-location=%s\n" % config['sdk_path']
|
||||||
ndk_path = build.ndk_path()
|
ndk_path = build.ndk_path()
|
||||||
# if it wasn't expanded correctly (because the NDK is not
|
# if for any reason the path isn't valid or the directory
|
||||||
# installed or $ANDROID_NDK not set properly), don't insert it.
|
# doesn't exist, some versions of Gradle will error with a
|
||||||
# even if not actually used, Gradle will error with a cryptic
|
# cryptic message (even if the NDK is not even necessary).
|
||||||
# message.
|
|
||||||
# https://gitlab.com/fdroid/fdroidserver/issues/171
|
# 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
|
# Add ndk location
|
||||||
props += "ndk.dir=%s\n" % ndk_path
|
props += "ndk.dir=%s\n" % ndk_path
|
||||||
props += "ndk-location=%s\n" % ndk_path
|
props += "ndk-location=%s\n" % ndk_path
|
||||||
|
Loading…
Reference in New Issue
Block a user