diff options
| author | ruki <[email protected]> | 2021-03-17 17:26:39 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-17 17:26:39 +0800 |
| commit | 995140f2d16f4950c66611b38f06bfaf7c61ea1b (patch) | |
| tree | 0fcd5181c1ae62b64e25bd3da36b07d9d5759dc6 /xmake/rules/qt/deploy/android.lua | |
| parent | 9cee4eb02ae2b45f83045a50d0b46df8a04cd1fe (diff) | |
| parent | d21c2ddddaf93404b9a0f6aedfc939b38fde86ca (diff) | |
Merge pull request #1290 from xmake-io/ndk
Improve android ndk to support r22
Diffstat (limited to 'xmake/rules/qt/deploy/android.lua')
| -rw-r--r-- | xmake/rules/qt/deploy/android.lua | 4 |
1 files changed, 2 insertions, 2 deletions
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 |