diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-20 14:56:52 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-20 14:56:52 -0800 |
| commit | 93ac00106ecc7409dab32366758c75baa9c9bb6a (patch) | |
| tree | 4681a5fd088ab04ce6fb11a1334e163576d698a7 /scripts/toolchains | |
| parent | f64362201923a20111ced9b789286437a8acac13 (diff) | |
| parent | 99b06bba5d86a6982f2491d9f4ea7ef637ff3747 (diff) | |
| download | vcpkg-93ac00106ecc7409dab32366758c75baa9c9bb6a.tar.gz vcpkg-93ac00106ecc7409dab32366758c75baa9c9bb6a.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4994
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()
|