From cc6c658afd45b154be37382c8a99ff46748d48b3 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 27 Mar 2020 22:44:59 +0800 Subject: update changelog and readme --- CHANGELOG.md | 2 ++ README.md | 2 +- README_zh.md | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fa83e68b..cf7cf328a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * Improve the ninja/cmake generator * [#728](https://github.com/xmake-io/xmake/issues/728): Improve os.cp to support reserve source directory structure * [#732](https://github.com/xmake-io/xmake/issues/732): Improve find_package to support `homebrew/cmake` pacakges +* [#695](https://github.com/xmake-io/xmake/issues/695): Improve android abi ### Bugs fixed @@ -714,6 +715,7 @@ * 改进ninja/cmake工程文件生成器插件 * [#728](https://github.com/xmake-io/xmake/issues/728): 改进os.cp支持保留源目录结构层级的递归复制 * [#732](https://github.com/xmake-io/xmake/issues/732): 改进find_package支持查找homebrew/cmake安装的包 +* [#695](https://github.com/xmake-io/xmake/issues/695): 改进采用android ndk最新的abi命名 ### Bugs修复 diff --git a/README.md b/README.md index 1e33299af..8c03ebea4 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, armv5te, armv7-a, armv8-a, arm64-v8a, mips) +* Android (i386, 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 4e82846f9..03f865a4b 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, armv5te, armv7-a, armv8-a, arm64-v8a, mips) +* Android (i386, x86_64, armeabi, armeabi-v7a, arm64-v8a) * iOS (armv7, armv7s, arm64, i386, x86_64) * WatchOS (armv7k, i386) * MSYS (i386, x86_64) -- cgit v1.3.1