Bump NDK to r26

Changes: https://github.com/android/ndk/wiki/Changelog-r26#announcements NDK r26 has the following changes which are interesting to us: * libc++ has been updated. The NDK's libc++ now comes directly from our LLVM toolchain, so every future LLVM update is also a libc++ update. * Updated LLVM to clang-r487747c, based on LLVM 17 development The `libc++` update brings internal implementation changes, and as the result we no longer need to partially instantiate a couple of classes previously underlying the `vector<T>` and `basic_string<T>` implementations.
grendello · Jul 24, 2023 · 028709c · 028709c
1 parent 215ab4d
commit 028709c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -5,8 +5,8 @@ namespace Xamarin.Android.Prepare
 {
 	class BuildAndroidPlatforms
 	{
-		public const string AndroidNdkVersion = "25c";
-		public const string AndroidNdkPkgRevision = "25.2.9519653";
+		public const string AndroidNdkVersion = "26-beta1";
+		public const string AndroidNdkPkgRevision = "26.0.10404224-beta1";
 		public const int NdkMinimumAPI = 21;
 		public const int NdkMinimumAPILegacy32 = 19;
 

diff --git a/src/monodroid/CMakeLists.txt b/src/monodroid/CMakeLists.txt
@@ -521,7 +521,6 @@ if(ANDROID)
       ${BIONIC_SOURCES_DIR}/cxa_guard.cc
       ${SOURCES_DIR}/cxx-abi/string.cc
       ${SOURCES_DIR}/cxx-abi/terminate.cc
-      ${SOURCES_DIR}/cxx-abi/vector.cc
       )
   endif()
 else()

diff --git a/src/monodroid/jni/cxx-abi/string.cc b/src/monodroid/jni/cxx-abi/string.cc
@@ -7,7 +7,6 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-template class __attribute__ ((__visibility__("hidden"))) __basic_string_common<true>;
 template class __attribute__ ((__visibility__("hidden"))) basic_string<char>;
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/src/monodroid/jni/cxx-abi/vector.cc b/src/monodroid/jni/cxx-abi/vector.cc