diff options
| author | ruki <[email protected]> | 2020-03-27 22:46:18 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-27 10:37:53 +0800 |
| commit | 472d1c7a36650f113d0c9fc2f66ea2c129c1e565 (patch) | |
| tree | e683b625473d8f7ceb7507eb9ce3a8ebb3a9b843 /xmake/platforms | |
| parent | cc6c658afd45b154be37382c8a99ff46748d48b3 (diff) | |
improve android abi again
Diffstat (limited to 'xmake/platforms')
| -rw-r--r-- | xmake/platforms/android/load.lua | 12 | ||||
| -rw-r--r-- | xmake/platforms/android/xmake.lua | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index e19c62c23..5e6077746 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -55,7 +55,8 @@ function main(platform) , ["armv7-a"] = "armv7-none-linux-androideabi" -- deprecated , ["armeabi-v7a"] = "armv7-none-linux-androideabi" , ["arm64-v8a"] = "aarch64-none-linux-android" - , ["i386"] = "i686-none-linux-android" + , ["i386"] = "i686-none-linux-android" -- deprecated + , ["x86"] = "i686-none-linux-android" , ["x86_64"] = "x86_64-none-linux-android" , ["mips"] = "mipsel-none-linux-android" -- removed in ndk r17 , ["mips64"] = "mips64el-none-linux-android" -- removed in ndk r17 @@ -105,7 +106,8 @@ function main(platform) , ["armeabi"] = "arch-arm" -- removed in ndk r17 , ["armeabi-v7a"] = "arch-arm" , ["arm64-v8a"] = "arch-arm64" - , i386 = "arch-x86" + , i386 = "arch-x86" -- deprecated + , x86 = "arch-x86" , x86_64 = "arch-x86_64" , mips = "arch-mips" -- removed in ndk r17 , mips64 = "arch-mips64" -- removed in ndk r17 @@ -140,7 +142,8 @@ function main(platform) , ["armeabi"] = "arm-linux-androideabi" -- removed in ndk r17 , ["armeabi-v7a"] = "arm-linux-androideabi" , ["arm64-v8a"] = "aarch64-linux-android" - , i386 = "i686-linux-android" + , i386 = "i686-linux-android" -- deprecated + , x86 = "i686-linux-android" , x86_64 = "x86_64-linux-android" , mips = "mips-linux-android" -- removed in ndk r17 , mips64 = "mips64-linux-android" -- removed in ndk r17 @@ -214,7 +217,8 @@ function main(platform) , ["armeabi"] = "armeabi" -- removed in ndk r17 , ["armeabi-v7a"] = "armeabi-v7a" , ["arm64-v8a"] = "arm64-v8a" - , i386 = "x86" + , i386 = "x86" -- deprecated + , x86 = "x86" , x86_64 = "x86_64" , mips = "mips" -- removed in ndk r17 , mips64 = "mips64" -- removed in ndk r17 diff --git a/xmake/platforms/android/xmake.lua b/xmake/platforms/android/xmake.lua index 8d60b8373..f591cc062 100644 --- a/xmake/platforms/android/xmake.lua +++ b/xmake/platforms/android/xmake.lua @@ -29,12 +29,12 @@ platform("android") -- set archs, we use the latest android abi provided in android ndk now. -- we will continue to support the old abi architectures for old version ndk. - -- e.g. armv5te(armeabi), armv7-a(armeabi-v7a), mips, mips64 + -- e.g. armv5te(armeabi), armv7-a(armeabi-v7a), mips, mips64, i386 -- -- @see https://developer.android.google.cn/ndk/guides/abis -- @note The NDK previously supported ARMv5 (armeabi) and 32-bit and 64-bit MIPS, but this support has been removed in NDK r17. -- - set_archs("armeabi", "armeabi-v7a", "arm64-v8a", "i386", "x86_64", "mips", "mip64") + set_archs("armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mip64") -- set formats set_formats {static = "lib$(name).a", object = "$(name).o", shared = "lib$(name).so", symbol = "$(name).sym"} |