From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 8 Apr 2012 08:07:39 +0000 (+0100)
Subject: Allow SDK and NDK paths to be subsituted into prebuild commands
X-Git-Tag: 0.1~816
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2da03a3940123163103ff288dcab9a40337962bb;p=fdroidserver.git

Allow SDK and NDK paths to be subsituted into prebuild commands
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2d0c868c..e0204dc2 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -895,6 +895,8 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
         for name, libpath in srclibpaths:
             libpath = os.path.relpath(libpath, root_dir)
             prebuild = prebuild.replace('$$' + name + '$$', libpath)
+        prebuild = prebuild.replace('$$SDK$$', sdk_path)
+        prebuild = prebuild.replace('$$NDK$$', ndk_path)
         if subprocess.call(prebuild, cwd=root_dir, shell=True) != 0:
             raise BuildException("Error running pre-build command")