mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 10:39:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'android-ndk-r17'

Browse Source 
da294a039d Android: Add support for NDK r17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1976
This commit is contained in:
Brad King
2018-04-18 12:29:55 +00:00
committed by Kitware Robot
parent 9260dedfd2 da294a039d
commit 48b5daaf7c
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Platform/Android-Determine.cmake
+34 -1
View File
@@ -261,7 +261,40 @@ if(NOT CMAKE_ANDROID_ARCH_ABI)
else()
# https://developer.android.com/ndk/guides/application_mk.html
# Default is the oldest ARM ABI.
set(CMAKE_ANDROID_ARCH_ABI "armeabi")
# Lookup the available ABIs among all toolchains.
set(_ANDROID_ABIS "")
file(GLOB _ANDROID_CONFIG_MKS
"${CMAKE_ANDROID_NDK}/build/core/toolchains/*/config.mk"
"${CMAKE_ANDROID_NDK}/toolchains/*/config.mk"
)
foreach(config_mk IN LISTS _ANDROID_CONFIG_MKS)
file(STRINGS "${config_mk}" _ANDROID_TOOL_ABIS REGEX "^TOOLCHAIN_ABIS :=")
string(REPLACE "TOOLCHAIN_ABIS :=" "" _ANDROID_TOOL_ABIS "${_ANDROID_TOOL_ABIS}")
separate_arguments(_ANDROID_TOOL_ABIS UNIX_COMMAND "${_ANDROID_TOOL_ABIS}")
list(APPEND _ANDROID_ABIS ${_ANDROID_TOOL_ABIS})
unset(_ANDROID_TOOL_ABIS)
endforeach()
unset(_ANDROID_CONFIG_MKS)
# Choose the oldest among the available arm ABIs.
if(_ANDROID_ABIS)
list(REMOVE_DUPLICATES _ANDROID_ABIS)
cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW)
foreach(abi armeabi armeabi-v7a arm64-v8a)
if("${abi}" IN_LIST _ANDROID_ABIS)
set(CMAKE_ANDROID_ARCH_ABI "${abi}")
break()
endif()
endforeach()
cmake_policy(POP)
endif()
unset(_ANDROID_ABIS)
if(NOT CMAKE_ANDROID_ARCH_ABI)
set(CMAKE_ANDROID_ARCH_ABI "armeabi")
endif()
endif()
endif()
set(CMAKE_ANDROID_ARCH "${_ANDROID_ABI_${CMAKE_ANDROID_ARCH_ABI}_ARCH}")