diff options
| author | Dan Albert <danalbert@google.com> | 2019-09-19 13:40:46 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-09-19 13:40:46 -0700 |
| commit | 2913378a8c5f9cb554482da059622e11e03b7c90 (patch) | |
| tree | d5fabd8ebdcbb1ca6350a041e386e5239fb6fbac /build | |
| parent | a3dbc9c2e677d9e9f9968ddef6492559a2d8ee29 (diff) | |
| download | ndk-2913378a8c5f9cb554482da059622e11e03b7c90.tar.gz | |
Define CMAKE_ANDROID_ARCH for compatibility.
Test: ./checkbuild.py && ./run_tests.py
Bug: https://github.com/android/ndk/issues/861
Change-Id: Ic29e998e329804291de914fc032924fc786ab843
Diffstat (limited to 'build')
| -rw-r--r-- | build/cmake/android.toolchain.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake index db2913d88..2658bcda8 100644 --- a/build/cmake/android.toolchain.cmake +++ b/build/cmake/android.toolchain.cmake @@ -687,6 +687,17 @@ if (CMAKE_VERSION VERSION_GREATER 3.7.0) set(CMAKE_ANDROID_ARM_MODE ${ANDROID_ARM_MODE}) endif() + # https://github.com/android/ndk/issues/861 + if(ANDROID_ABI STREQUAL armeabi-v7a) + set(CMAKE_ANDROID_ARCH arm) + elseif(ANDROID_ABI STREQUAL arm64-v8a) + set(CMAKE_ANDROID_ARCH arm64) + elseif(ANDROID_ABI STREQUAL x86) + set(CMAKE_ANDROID_ARCH x86) + elseif(ANDROID_ABI STREQUAL x86_64) + set(CMAKE_ANDROID_ARCH x86_64) + endif() + # https://github.com/android/ndk/issues/1012 set(CMAKE_ASM_ANDROID_TOOLCHAIN_MACHINE "${ANDROID_TOOLCHAIN_NAME}") set(CMAKE_C_ANDROID_TOOLCHAIN_MACHINE "${ANDROID_TOOLCHAIN_NAME}") |