From d21c2ddddaf93404b9a0f6aedfc939b38fde86ca Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Mar 2021 23:48:17 +0800 Subject: fix some ndk sysroot --- xmake/rules/qt/deploy/android.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xmake/rules/qt/deploy/android.lua') diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua index 6c61c7baa..97f97ea7a 100644 --- a/xmake/rules/qt/deploy/android.lua +++ b/xmake/rules/qt/deploy/android.lua @@ -135,8 +135,8 @@ function main(target, opt) -- get stdcpp path local stdcpp_path = path.join(ndk, "sources/cxx-stl/llvm-libc++/libs", target_arch, "libc++_shared.so") if qt_sdkver and qt_sdkver:ge("5.14") then - local toolchain = path.directory(assert(toolchain_ndk:bindir(), "toolchain/bin directory not found!")) - stdcpp_path = path.join(toolchain, "sysroot", "usr", "lib") + local ndk_sysroot = assert(toolchain_ndk:config("ndk_sysroot"), "NDK sysroot directory not found!") + stdcpp_path = path.join(ndk_sysroot, "usr", "lib") end -- get toolchain version -- cgit v1.3.1