From be65fbbf755d5d787cc5bca5116754e35de2341d Mon Sep 17 00:00:00 2001 From: Christophe Calmejane Date: Tue, 7 Dec 2021 05:15:20 +0100 Subject: [PATCH] Fixed android toolchain with newest NDK (#21465) * Fixed android toolchain with newest NDK ANDROID_NATIVE_API_LEVEL has been removed from NDK cmake toolchain so we now have to use ANDROID_PLATFORM * Fix android toolchain: Maintain backward compatibility for older NDK --- scripts/toolchains/android.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index ff04cb72d8..2a826c78d8 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -2,6 +2,11 @@ set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "") set(CMAKE_SYSTEM_NAME Android CACHE STRING "") set(ANDROID_TOOLCHAIN clang CACHE STRING "") set(ANDROID_NATIVE_API_LEVEL ${CMAKE_SYSTEM_VERSION} CACHE STRING "") +if(CMAKE_SYSTEM_VERSION MATCHES "^[0-9]+$") + set(ANDROID_PLATFORM android-${CMAKE_SYSTEM_VERSION} CACHE STRING "") +else() + set(ANDROID_PLATFORM ${CMAKE_SYSTEM_VERSION} CACHE STRING "") +endif() set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") if (VCPKG_TARGET_TRIPLET MATCHES "^arm64-android")