[WIP] Implement requested changes

Author: grendello

ThirdPartyNotices.txt

@@ -14,9 +14,8 @@ The attached notices are provided for information only.
 1. android/platform/tools/base (https://android.googlesource.com/platform/tools/base/+/d41d662dbf89f9b60ca6256415a059c0107749b8/sdk-common/NOTICE)
 2. bazelbuild/bazel (https://github.com/bazelbuild/bazel/)
 3. force-net/crc32.net (https://github.com/force-net/Crc32.NET)
-4. google/bionic (https://android.googlesource.com/platform/bionic/)
-5. nunit/nunitlite (https://github.com/nunit/nunitlite/)
-6. tessil/robin-map (https://github.com/Tessil/robin-map)
+4. nunit/nunitlite (https://github.com/nunit/nunitlite/)
+5. tessil/robin-map (https://github.com/Tessil/robin-map)
 
 %% android/platform/tools/base NOTICES AND INFORMATION BEGIN HERE
 =================================================================
@@ -462,26 +461,6 @@ SOFTWARE.
 =========================================================
 END OF force-net/crc32.net NOTICES AND INFORMATION
 
-%% google/bionic NOTICES AND INFORMATION BEGIN HERE
-===================================================
-Copyright (C) 2006 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-===================================================
-END OF google/bionic NOTICES AND INFORMATION
-
 %% nunit/nunitlite NOTICES AND INFORMATION BEGIN HERE
 =====================================================
 Copyright (c) 2004-2013 Charlie Poole

build-tools/xaprepare/xaprepare/ThirdPartyNotices/bionic.cs

@@ -26,6 +26,6 @@ You may obtain a copy of the License at
 limitations under the License.
 ";
 
-		public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeBuildDeps;
+		public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeExternalDeps;
 	}
 }

src/monodroid/jni/cxx-abi/bionic_futex.hh renamed to src-ThirdParty/bionic/bionic_futex.hh

@@ -115,6 +115,7 @@ endif()
 set(EXTERNAL_DIR "../../external")
 set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
 set(SOURCES_DIR ${CMAKE_SOURCE_DIR}/jni)
+set(BIONIC_SOURCES_DIR "../../src-ThirdParty/bionic")
 set(LZ4_SRC_DIR "${EXTERNAL_DIR}/lz4/lib")
 set(LZ4_INCLUDE_DIR ${LZ4_SRC_DIR})
 set(XA_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/${XA_BUILD_CONFIGURATION}")
@@ -459,7 +460,7 @@ if(ANDROID)
 
   if(NOT USES_LIBSTDCPP)
     list(APPEND XAMARIN_MONODROID_SOURCES
-      ${SOURCES_DIR}/cxx-abi/cxa_guard.cc
+      ${BIONIC_SOURCES_DIR}/cxa_guard.cc
       ${SOURCES_DIR}/cxx-abi/string.cc
       ${SOURCES_DIR}/cxx-abi/terminate.cc
       )

src/monodroid/jni/cxx-abi/cxa_guard.cc renamed to src-ThirdParty/bionic/cxa_guard.cc

@@ -68,7 +68,7 @@ namespace xamarin::android::internal
 		>;
 
 		static constexpr pinvoke_library_map::size_type LIBRARY_MAP_INITIAL_BUCKET_COUNT = 1;
-#endif
+#endif // def NET6
 
 #if defined (DEBUG) && !defined (WINDOWS)
 		struct RuntimeOptions {
@@ -304,10 +304,10 @@ namespace xamarin::android::internal
 		static std::mutex             pinvoke_map_write_lock;
 		static pinvoke_api_map        xa_pinvoke_map;
 		static pinvoke_library_map    other_pinvoke_map;
-#else
+#else // def NET6
 		static std::mutex   api_init_lock;
 		static void        *api_dso_handle;
-#endif
+#endif // !def NET6
 	};
 }
 #endif

src/monodroid/CMakeLists.txt

@@ -1185,7 +1185,7 @@ MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err, [[m
 		return monodroid_dlopen (name, flags, err);
 	}
 
-	size_t len = strlen (name) + DSO_EXTENSION_SIZE; // includes the trailing \0
+	size_t len = ADD_WITH_OVERFLOW_CHECK (size_t, strlen (name), DSO_EXTENSION_SIZE); // includes the trailing \0
 	static_local_string<PATH_MAX> full_name (len);
 
 	full_name.append (name).append (DSO_EXTENSION);

src/monodroid/jni/monodroid-glue-internal.hh

@@ -177,6 +177,14 @@ _monodroid_timezone_get_default_id ()
 	jobject d            = env->CallStaticObjectMethod (monodroidRuntime.get_java_class_TimeZone (), getDefault);
 	jstring id           = reinterpret_cast<jstring> (env->CallObjectMethod (d, getID));
 	const char *mutf8    = env->GetStringUTFChars (id, nullptr);
+
+	if (mutf8 == nullptr) {
+		log_error (LOG_DEFAULT, "Failed to convert Java TimeZone ID to UTF8 (out of memory?)");
+		env->DeleteLocalRef (id);
+		env->DeleteLocalRef (d);
+		return nullptr;
+	}
+
 	char *def_id         = strdup (mutf8);
 
 	env->ReleaseStringUTFChars (id, mutf8);