diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-21 00:36:36 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-21 00:36:36 -0800 |
| commit | 09c3cc0d88562083949357e1499130e68c5706c5 (patch) | |
| tree | c848583011035ab21b43f523b23533055a017723 /scripts/toolchains | |
| parent | 0d1229d34babdc9c8fbfe2e1b43b38e657519093 (diff) | |
| parent | 4afe20fc123d794cd066d1dc19b8873b3a2a3645 (diff) | |
| download | vcpkg-09c3cc0d88562083949357e1499130e68c5706c5.tar.gz vcpkg-09c3cc0d88562083949357e1499130e68c5706c5.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4990
Diffstat (limited to 'scripts/toolchains')
| -rw-r--r-- | scripts/toolchains/android.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 893463056..69192aeca 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -1,11 +1,22 @@ set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "")
set(CMAKE_SYSTEM_NAME Android CACHE STRING "")
-set(ANDROID_ABI x86_64 CACHE STRING "")
set(ANDROID_TOOLCHAIN clang CACHE STRING "")
set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "")
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "")
+if (VCPKG_TARGET_TRIPLET STREQUAL "arm64-android")
+ set(ANDROID_ABI arm64-v8a CACHE STRING "")
+elseif(VCPKG_TARGET_TRIPLET STREQUAL "arm-android")
+ set(ANDROID_ABI armeabi-v7a CACHE STRING "")
+elseif(VCPKG_TARGET_TRIPLET STREQUAL "x64-android")
+ set(ANDROID_ABI x86_64 CACHE STRING "")
+elseif(VCPKG_TARGET_TRIPLET STREQUAL "x86-android")
+ set(ANDROID_ABI x86 CACHE STRING "")
+else()
+ message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}")
+endif()
+
if(DEFINED ENV{ANDROID_NDK_HOME})
set(ANDROID_NDK_HOME $ENV{ANDROID_NDK_HOME})
else()
|