mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
See the comment.

Updates #171.
This commit is contained in:
Daniel Martí 2016-07-25 13:07:46 +02:00
parent 11f30223d6
commit dee3e85098
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/common.py
View file

@ -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.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 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 # 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