summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-04-13 23:58:45 +0800
committerruki <[email protected]>2020-04-13 17:52:33 +0800
commit923c460910f415b8d4769d92ed21a1f124d28214 (patch)
tree0f7f985b8b2b63306a43144af569dd4f10b0ee8f
parent2aec1cfaa90e1f885410ff3c2eed4f70186c2eb2 (diff)
escape path for qt deploy/android
-rw-r--r--xmake/rules/qt/deploy/android.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua
index 2f4cc40de..f89c08aa1 100644
--- a/xmake/rules/qt/deploy/android.lua
+++ b/xmake/rules/qt/deploy/android.lua
@@ -23,6 +23,11 @@ import("core.theme.theme")
import("core.base.option")
import("core.project.config")
+-- escape path
+function _escape_path(p)
+ return os.args(p, {escape = true})
+end
+
-- deploy application package for android
function main(target, opt)
@@ -118,7 +123,9 @@ function main(target, opt)
"stdcpp-path": "%s",
"useLLVM": true,
"application-binary": "%s"
- }]], qt.sdkdir, android_sdkdir, ndk, android_build_toolver, ndk_toolchains_ver, ndk_host, target_arch, os.projectdir(), stdcpp_path, target:targetfile()))
+ }]], _escape_path(qt.sdkdir), _escape_path(android_sdkdir), _escape_path(ndk),
+ android_build_toolver, ndk_toolchains_ver, ndk_host, target_arch,
+ _escape_path(os.projectdir()), _escape_path(stdcpp_path), _escape_path(target:targetfile())))
-- do deploy
local argv = {"--input", android_deployment_settings,