improve android abi again

7 files changed, 19 insertions, 11 deletions

diff --git a/README.md b/README.md
index 8c03ebea4..f3aa688da 100644
--- a/README.md
+++ b/README.md
@@ -159,7 +159,7 @@ The test project: [xmake-core](https://github.com/xmake-io/xmake/tree/master/cor
 * Windows (x86, x64)
 * macOS (i386, x86_64)
 * Linux (i386, x86_64, cross-toolchains ..)
-* Android (i386, x86_64, armeabi, armeabi-v7a, arm64-v8a)
+* Android (x86, x86_64, armeabi, armeabi-v7a, arm64-v8a)
 * iOS (armv7, armv7s, arm64, i386, x86_64)
 * WatchOS (armv7k, i386)
 * MSYS (i386, x86_64)
diff --git a/README_zh.md b/README_zh.md
index 03f865a4b..9ec8ca18c 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -166,7 +166,7 @@ $ xmake f --menu
 * Windows (x86, x64)
 * macOS (i386, x86_64)
 * Linux (i386, x86_64, cross-toolchains ..)
-* Android (i386, x86_64, armeabi, armeabi-v7a, arm64-v8a)
+* Android (x86, x86_64, armeabi, armeabi-v7a, arm64-v8a)
 * iOS (armv7, armv7s, arm64, i386, x86_64)
 * WatchOS (armv7k, i386)
 * MSYS (i386, x86_64)
diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua
index f88d54693..ae60c4dc1 100644
--- a/xmake/modules/detect/sdks/find_ndk.lua
+++ b/xmake/modules/detect/sdks/find_ndk.lua
@@ -108,7 +108,8 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver)
     ,   ["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
@@ -124,6 +125,7 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver)
     ,   ["armeabi-v7a"] = "arm-linux-androideabi-*"
     ,   ["arm64-v8a"]   = "aarch64-linux-android-*"
     ,   i386            = "x86-*"
+    ,   x86             = "x86-*"
     ,   x86_64          = "x86_64-*"
     ,   mips            = "mipsel-linux-android-*"
     ,   mips64          = "mips64el-linux-android-*"
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index c029b3d54..f67032d7c 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -50,7 +50,8 @@ function _get_configs(package, configs)
                 ["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
diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autotools.lua
index 54f81d18d..379007d3c 100644
--- a/xmake/modules/private/action/trybuild/autotools.lua
+++ b/xmake/modules/private/action/trybuild/autotools.lua
@@ -134,7 +134,8 @@ function _get_configs(artifacts_dir)
                 ["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
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"}