From bd0986ee73d811e4e42cf81ea5caae577d190687 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 20 Aug 2023 12:58:10 +0900 Subject: [PATCH] Update NDK to v26 This version of NDK finally comes with updated libc++. The last update to libc++ in NDK was in early 2020. This update brings lots of improvements and bugfixes from upstream libc++. NDK 26 only support SDK 21+, so we bump `minSdkVersion` as well. --- Source/utils/stdcompat/shared_ptr_array.hpp | 2 +- android-project/app/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/utils/stdcompat/shared_ptr_array.hpp b/Source/utils/stdcompat/shared_ptr_array.hpp index 597638dd3..b01be4463 100644 --- a/Source/utils/stdcompat/shared_ptr_array.hpp +++ b/Source/utils/stdcompat/shared_ptr_array.hpp @@ -6,7 +6,7 @@ namespace devilution { // Apple Clang 12 has a buggy implementation that fails to compile `std::shared_ptr(new T[size])`. -#if (__cplusplus >= 201611L && (!defined(__clang_major__) || __clang_major__ >= 13)) && !defined(NXDK) && !defined(__ANDROID__) +#if (__cplusplus >= 201611L && (!defined(__clang_major__) || __clang_major__ >= 13)) && !defined(NXDK) template using ArraySharedPtr = std::shared_ptr; diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index a78a3a596..255795485 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -7,13 +7,13 @@ if (buildAsApplication) { } android { - ndkVersion '25.2.9519653' + ndkVersion '26.0.10792818' compileSdk 33 defaultConfig { if (buildAsApplication) { applicationId "org.diasurgical.devilutionx" } - minSdkVersion 18 + minSdkVersion 21 targetSdkVersion 33 versionCode 28 versionName project.file('../../VERSION').text.trim()