From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 8 Apr 2012 12:00:07 +0000 (+0100)
Subject: Allow sdk and ndk path substitution in init command too
X-Git-Tag: 0.1~814
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=20450eaaaf7ebc308216121d30052dc0d93a50b5;p=fdroidserver.git

Allow sdk and ndk path substitution in init command too
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e0204dc2..c514f614 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -720,6 +720,8 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
     # Run an init command if one is required...
     if build.has_key('init'):
         init = build['init']
+        init = init.replace('$$SDK$$', sdk_path)
+        init = init.replace('$$NDK$$', ndk_path)
         if verbose: print "Doing init: exec '%s' in '%s'"%(init,root_dir)
         if subprocess.call(init, cwd=root_dir, shell=True) != 0:
             raise BuildException("Error running init command")