Never let build['ndk_path'] be None

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index f4083237287bb34c3de2e52aa58336d9e9189719..af8d2ae653b1c52930d36c61e2cdc922c63d88dc 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -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
     for n in ['ANDROID_NDK', 'NDK']:
-        common.env[n] = thisbuild['ndk_path'] or ''
+        common.env[n] = thisbuild['ndk_path']
 
     # Prepare the source code...
     root_dir, srclibpaths = common.prepare_source(vcs, app, thisbuild,

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index db65bcb71715a347ff2ec27394141683dd2c1d38..9f1f1ed53f38f9e9e2f66cb3668827acf6db9213 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -188,8 +188,8 @@ def get_ndk_path(version):
         version = 'r10d'  # latest
     paths = config['ndk_paths']
     if version not in paths:
-        return None
-    return paths[version]
+        return ''
+    return paths[version] or ''
 
 
 def find_sdk_tools_cmd(cmd):