Allow SDK and NDK paths to be subsituted into prebuild commands

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2d0c868cef91a61f147be723e0325e2f71ee5c02..e0204dc2188de02e8e5e80ef8c47e6aa8e439d11 100644 (file)
--- 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")