summaryrefslogtreecommitdiff
path: root/xmake/rules/qt/deploy/android.lua
diff options
context:
space:
mode:
authorJérôme Leclercq <[email protected]>2022-05-19 18:51:17 +0200
committerGitHub <[email protected]>2022-05-19 18:51:17 +0200
commitf2cfa5714f67e3d0e7700ebaf84d5c1958e6f93f (patch)
tree6bb20d0701184a2a9e8af482cc7b16d971e647ec /xmake/rules/qt/deploy/android.lua
parent31fea661bb212636b9eca92fd18e6caf80cc2ee3 (diff)
Update android.lua
Diffstat (limited to 'xmake/rules/qt/deploy/android.lua')
-rw-r--r--xmake/rules/qt/deploy/android.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua
index d5793ad93..c5bc810c4 100644
--- a/xmake/rules/qt/deploy/android.lua
+++ b/xmake/rules/qt/deploy/android.lua
@@ -25,6 +25,7 @@ import("core.base.semver")
import("core.project.config")
import("core.project.depend")
import("core.tool.toolchain")
+import("lib.detect.find_file")
import("utils.progress")
-- escape path
@@ -166,9 +167,9 @@ function main(target, opt)
if os.isexec(rcc) then
settings_file:print(' "rcc-binary": "%s",', _escape_path(rcc))
end
- local platformplugin = os.files(path.join(qt.sdkdir, "plugins", "platforms", "libplugins_platforms_qtforandroid_" .. target_arch .. "*"))
- if #platformplugin > 0 then
- settings_file:print(' "deployment-dependencies": {"%s":"%s"},', target_arch, _escape_path(platformplugin[1]))
+ local platformplugin = find_file("libplugins_platforms_qtforandroid_" .. target_arch .. "*", path.join(qt.sdkdir, "plugins", "platforms"))
+ if platformplugin then
+ settings_file:print(' "deployment-dependencies": {"%s":"%s"},', target_arch, _escape_path(platformplugin))
end
local minsdkversion = target:values("qt.android.minsdkversion")