diff options
| author | ruki <[email protected]> | 2020-03-27 22:39:53 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-27 09:59:22 +0800 |
| commit | bbf30dbc869965a523ba20a0ca65be163fd80d06 (patch) | |
| tree | d7b290a342daed2b02922e843973e92e2d682438 /xmake/modules/detect | |
| parent | eb477c19a1e5f4cf7cd8320dcca30d1562c285fc (diff) | |
improve android abi
Diffstat (limited to 'xmake/modules/detect')
| -rw-r--r-- | xmake/modules/detect/sdks/find_ndk.lua | 14 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_qt.lua | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua index 70801d697..f88d54693 100644 --- a/xmake/modules/detect/sdks/find_ndk.lua +++ b/xmake/modules/detect/sdks/find_ndk.lua @@ -103,13 +103,15 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver) -- get cross local crosses = { - ["armv5te"] = "arm-linux-androideabi-" - , ["armv7-a"] = "arm-linux-androideabi-" + ["armv5te"] = "arm-linux-androideabi-" -- deprecated + , ["armv7-a"] = "arm-linux-androideabi-" -- deprecated + , ["armeabi"] = "arm-linux-androideabi-" -- removed in ndk r17 + , ["armeabi-v7a"] = "arm-linux-androideabi-" , ["arm64-v8a"] = "aarch64-linux-android-" , i386 = "i686-linux-android-" , x86_64 = "x86_64-linux-android-" - , mips = "mips-linux-android-" - , mips64 = "mips64-linux-android-" + , mips = "mips-linux-android-" -- removed in ndk r17 + , mips64 = "mips64-linux-android-" -- removed in ndk r17 } local cross = crosses[arch] @@ -118,6 +120,8 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver) { ["armv5te"] = "arm-linux-androideabi-*" , ["armv7-a"] = "arm-linux-androideabi-*" + , ["armeabi"] = "arm-linux-androideabi-*" + , ["armeabi-v7a"] = "arm-linux-androideabi-*" , ["arm64-v8a"] = "aarch64-linux-android-*" , i386 = "x86-*" , x86_64 = "x86_64-*" @@ -174,7 +178,7 @@ end -- -- @param sdkdir the ndk directory -- @param opt the argument options --- e.g. {arch = "[armv5te|armv6|armv7-a|armv8-a|arm64-v8a]", verbose = true, force = false, sdkver = 19, toolchains_ver = "4.9"} +-- e.g. {arch = "[armeabi|armeabi-v7a|arm64-v8a]", verbose = true, force = false, sdkver = 19, toolchains_ver = "4.9"} -- -- @return the ndk toolchains. e.g. {bindir = .., cross = ..} -- diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index e6c77ebf5..9062a9212 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -49,7 +49,7 @@ function _find_sdkdir(sdkdir, sdkver) local subdir = "android_*" if is_arch("arm64-v8a") then subdir = "android_arm64_v8a" - elseif is_arch("armv7-a") then + elseif is_arch("armeabi-v7a", "armeabi", "armv7-a", "armv5te") then -- armv7-a/armv5te are deprecated subdir = "android_armv7" elseif is_arch("i386") then subdir = "android_x86" |