From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 4 Jan 2015 19:41:22 +0000 (+0100)
Subject: Never let build['ndk_path'] be None
X-Git-Tag: 0.4.0~173
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3645471a1c50c4f82fae245e66a019fcd9e9560f;p=fdroidserver.git

Never let build['ndk_path'] be None
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index f4083237..af8d2ae6 100644
--- 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 db65bcb7..9f1f1ed5 100644
--- 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):