diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
| commit | 7a67785e14130170679d19be832f2e1ba2530560 (patch) | |
| tree | 49196cc5252f2e800a18802548006977da276447 /scripts/toolchains | |
| parent | 524a1414fc395fdc60951d63f4a66683309fd630 (diff) | |
| parent | b2996e1fd48842446a64443d057c576f819bda00 (diff) | |
| download | vcpkg-7a67785e14130170679d19be832f2e1ba2530560.tar.gz vcpkg-7a67785e14130170679d19be832f2e1ba2530560.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/roschuma/4988
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()
|