diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index 72d1178879..336875f309 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -22,7 +22,7 @@ endif() if(ANDROID_ABI) set(ANDROID_BUILD_TOOLS_VERSION "34.0.0" CACHE STRING "Android build-tools version") set(ANDROID_TARGET_PLATFORM 34 CACHE INT "Target Android platform SDK version") - set(ANDROID_PLATFORM 23 CACHE INT "Minimum Android platform SDK version") - set(ANDROID_PLATFORM_INT 23 CACHE INT "Minimum Android platform SDK version") # Used in build.gradle.in + set(ANDROID_PLATFORM 26 CACHE INT "Minimum Android platform SDK version") + set(ANDROID_PLATFORM_INT 26 CACHE INT "Minimum Android platform SDK version") # Used in build.gradle.in set(ANDROID_CPP_FEATURES "rtti exceptions") endif() diff --git a/vcpkg/triplets/arm-android.cmake b/vcpkg/triplets/arm-android.cmake index 779799c532..3418004139 100644 --- a/vcpkg/triplets/arm-android.cmake +++ b/vcpkg/triplets/arm-android.cmake @@ -12,7 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=OFF) -set(VCPKG_CMAKE_SYSTEM_VERSION 23) +set(VCPKG_CMAKE_SYSTEM_VERSION 26) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/arm-neon-android.cmake b/vcpkg/triplets/arm-neon-android.cmake index 6711290abd..d9a0a6a906 100644 --- a/vcpkg/triplets/arm-neon-android.cmake +++ b/vcpkg/triplets/arm-neon-android.cmake @@ -12,7 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON) -set(VCPKG_CMAKE_SYSTEM_VERSION 23) +set(VCPKG_CMAKE_SYSTEM_VERSION 26) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/arm64-android.cmake b/vcpkg/triplets/arm64-android.cmake index 3436139b38..2555e805c6 100644 --- a/vcpkg/triplets/arm64-android.cmake +++ b/vcpkg/triplets/arm64-android.cmake @@ -12,7 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=arm64-v8a) -set(VCPKG_CMAKE_SYSTEM_VERSION 23) +set(VCPKG_CMAKE_SYSTEM_VERSION 26) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/x64-android.cmake b/vcpkg/triplets/x64-android.cmake index 25194128d0..6b5124ba1e 100644 --- a/vcpkg/triplets/x64-android.cmake +++ b/vcpkg/triplets/x64-android.cmake @@ -12,7 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86_64) -set(VCPKG_CMAKE_SYSTEM_VERSION 23) +set(VCPKG_CMAKE_SYSTEM_VERSION 26) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/x86-android.cmake b/vcpkg/triplets/x86-android.cmake index b305f26f13..b816ca4aba 100644 --- a/vcpkg/triplets/x86-android.cmake +++ b/vcpkg/triplets/x86-android.cmake @@ -12,7 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86) -set(VCPKG_CMAKE_SYSTEM_VERSION 23) +set(VCPKG_CMAKE_SYSTEM_VERSION 26) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong")