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 f9be33acc..22f5d3948 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 29 versionName project.file('../../VERSION').text.trim()