From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 16 Jun 2016 20:36:31 +0000 (+0100)
Subject: common: always set android ndk env vars
X-Git-Tag: 0.7.0~50
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=882afebf7674d81833d099ad8d50446afd02739d;p=fdroidserver.git

common: always set android ndk env vars

Also, add the ndk to PATH at the beginning, in case any other ndks are
already in it.

Fixes #176.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 03a8743d..aa673e77 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1805,16 +1805,12 @@ def set_FDroidPopen_env(build=None):
         for k, v in config['java_paths'].items():
             env['JAVA%s_HOME' % k] = v
 
-    # Set up environment vars that depend on each build, only set the
-    # NDK env vars if the NDK is not already in the PATH
     if build is not None:
         path = build.ndk_path()
         paths = orig_path.split(os.pathsep)
-        if path in paths:
-            return
-        paths.append(path)
-        env['PATH'] = os.pathsep.join(paths)
-
+        if path not in paths:
+            paths = [path] + paths
+            env['PATH'] = os.pathsep.join(paths)
         for n in ['ANDROID_NDK', 'NDK', 'ANDROID_NDK_HOME']:
             env[n] = build.ndk_path()