mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Never let build['ndk_path'] be None

Browse source
This commit is contained in:
Daniel Martí 2015-01-04 20:41:22 +01:00
parent e9be413d3c
commit 3645471a1c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/build.py
View file

@ -466,7 +466,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
# Set up environment vars that depend on each build # Set up environment vars that depend on each build
for n in ['ANDROID_NDK', 'NDK']: for n in ['ANDROID_NDK', 'NDK']:
common.env[n] = thisbuild['ndk_path'] or '' common.env[n] = thisbuild['ndk_path']
# Prepare the source code... # Prepare the source code...
root_dir, srclibpaths = common.prepare_source(vcs, app, thisbuild, root_dir, srclibpaths = common.prepare_source(vcs, app, thisbuild,

4
fdroidserver/common.py
View file

@ -188,8 +188,8 @@ def get_ndk_path(version):
version = 'r10d' # latest version = 'r10d' # latest
paths = config['ndk_paths'] paths = config['ndk_paths']
if version not in paths: if version not in paths:
return None return ''
return paths[version] return paths[version] or ''
def find_sdk_tools_cmd(cmd): def find_sdk_tools_cmd(cmd):