From 825867bd8870f118fd052d8a8407fce839e158ed Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 30 Aug 2020 11:21:50 +0800 Subject: update changelog --- CHANGELOG.md | 2 ++ xmake/toolchains/ndk/load.lua | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b9431a2a..abd8f6851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ * Improve CMake project generator * [#931](https://github.com/xmake-io/xmake/issues/931): Support to export packages with all dependences * [#930](https://github.com/xmake-io/xmake/issues/930): Support to download package without version list directly +* [#927](https://github.com/xmake-io/xmake/issues/927): Support to switch arm/thumb mode for android ndk ### Bugs fixed @@ -823,6 +824,7 @@ * 改进 CMake 工程文件生成器 * [#931](https://github.com/xmake-io/xmake/issues/931): 改进导出包，支持导出所有依赖包 * [#930](https://github.com/xmake-io/xmake/issues/930): 如果私有包定义没有版本定义，支持直接尝试下载包 +* [#927](https://github.com/xmake-io/xmake/issues/927): 改进android ndk，支持arm/thumb指令模式切换 ### Bugs修复 diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua index 80a7f1bb5..31f9dc06d 100644 --- a/xmake/toolchains/ndk/load.lua +++ b/xmake/toolchains/ndk/load.lua @@ -317,6 +317,7 @@ function main(toolchain) -- init flags for target local target_on_xxflags = function (target) if arm32 then + -- @see https://github.com/xmake-io/xmake/issues/927 if target:values("ndk.arm_mode") == "arm" then return "-marm" else -- cgit v1.3.1