From e62246c5ee18649e4e89eb69a4cf51b2586ced83 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Wed, 13 Oct 2021 23:37:39 +0200 Subject: [android] Extend NDK workaround to version 22 The relevant issue is only fixed in 23 --- toolchain/Android.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolchain/Android.cmake') 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") -- cgit v1.2.1