From ecc81277baa81b68342b2e377cb1e00ebe6d9c1a Mon Sep 17 00:00:00 2001 From: Christophe Calmejane Date: Tue, 16 Nov 2021 16:41:36 +0100 Subject: [PATCH 1/2] 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 --- scripts/toolchains/android.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index c721c2c4267e5b..a9a2afb7b6215a 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -1,7 +1,7 @@ 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 "") +set(ANDROID_PLATFORM ${CMAKE_SYSTEM_VERSION} CACHE STRING "") set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") if (VCPKG_TARGET_TRIPLET MATCHES "^arm64-android") From fa90074571e04e0eed68f146213daac3c8576f3d Mon Sep 17 00:00:00 2001 From: Christophe Calmejane Date: Wed, 1 Dec 2021 15:48:34 +0100 Subject: [PATCH 2/2] Fix android toolchain: Maintain backward compatibility for older NDK --- scripts/toolchains/android.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index a9a2afb7b6215a..df1640e447b143 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -1,7 +1,12 @@ set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "") set(CMAKE_SYSTEM_NAME Android CACHE STRING "") set(ANDROID_TOOLCHAIN clang CACHE STRING "") -set(ANDROID_PLATFORM ${CMAKE_SYSTEM_VERSION} 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")