diff options
| author | Nicolas Fella <nicolas.fella@gmx.de> | 2021-10-13 23:37:39 +0200 |
|---|---|---|
| committer | Nicolas Fella <nicolas.fella@gmx.de> | 2021-10-13 23:37:42 +0200 |
| commit | e62246c5ee18649e4e89eb69a4cf51b2586ced83 (patch) | |
| tree | b4eeb45c71278c4730492064d39e40870ad22baa /toolchain | |
| parent | e8a4dc157936397f938561c6bc0f38df981f7509 (diff) | |
| download | extra-cmake-modules-e62246c5ee18649e4e89eb69a4cf51b2586ced83.tar.gz extra-cmake-modules-e62246c5ee18649e4e89eb69a4cf51b2586ced83.tar.bz2 | |
[android] Extend NDK workaround to version 22
The relevant issue is only fixed in 23
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Android.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 513884c3..5a48464c 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -192,9 +192,9 @@ set(ANDROID_PLATFORM "android-${CMAKE_ANDROID_API}") set(ANDROID_STL ${CMAKE_ANDROID_STL_TYPE}) include(${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake REQUIRED) -## HACK: Remove when we can depend on NDK r22 +## HACK: Remove when we can depend on NDK r23 # Workaround issue https://github.com/android/ndk/issues/929 -if(ANDROID_NDK_MAJOR VERSION_LESS 22) +if(ANDROID_NDK_MAJOR VERSION_LESS 23) unset(CMAKE_SYSROOT) set(ANDROID_SYSROOT_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr") |