MAUI hello world works now

Author: grendello

src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs

@@ -93,7 +93,7 @@ internal static class RuntimeNativeMethods
 		internal static extern IntPtr clr_typemap_managed_to_java (string fullName, IntPtr mvid);
 
 		[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-		internal static extern string clr_typemap_java_to_managed (string fullName);
+		internal static extern IntPtr clr_typemap_java_to_managed (string fullName);
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		internal static extern void monodroid_unhandled_exception (Exception javaException);

src/Mono.Android/Java.Interop/TypeManager.cs

@@ -223,12 +223,16 @@ static Type monovm_typemap_java_to_managed (string java_type_name)
 		[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Value of java_type_name isn't statically known.")]
 		static Type? clr_typemap_java_to_managed (string java_type_name)
 		{
-			string? managedTypeName = RuntimeNativeMethods.clr_typemap_java_to_managed (java_type_name);
-			if (String.IsNullOrEmpty (managedTypeName)) {
+			IntPtr managedTypeNamePointer = RuntimeNativeMethods.clr_typemap_java_to_managed (java_type_name);
+			if (managedTypeNamePointer == IntPtr.Zero) {
 				return null;
 			}
 
-			return Type.GetType (managedTypeName);
+			string managedTypeName = Marshal.PtrToStringAnsi (managedTypeNamePointer);
+			Logger.Log (LogLevel.Info, "monodroid", $"clr_typemap_java_to_managed ('{java_type_name}') returned '{managedTypeName}'");
+			Type ret = Type.GetType (managedTypeName);
+			Logger.Log (LogLevel.Info, "monodroid", $"Loaded type: {ret}");
+			return ret;
 		}
 
 		internal static Type? GetJavaToManagedType (string class_name)

src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGeneratorCLR.cs

@@ -398,7 +398,7 @@ void InitJavaMap (ConstructionState cs)
 			TypeMapJava map_entry;
 			foreach (TypeMapGenerator.TypeMapReleaseEntry entry in mappingData.JavaTypes) {
 				string assemblyName = mappingData.Modules[entry.ModuleIndex].AssemblyName;
-				string fullManagedTypeName = $"{assemblyName}, {entry.ManagedTypeName}";
+				string fullManagedTypeName = $"{entry.ManagedTypeName}, {assemblyName}";
 				uint managedTypeNameIndex = GetEntryIndex (fullManagedTypeName, seenManagedTypeNames, cs.ManagedTypeNames);
 				cs.JavaNames.Add (entry.JavaName);
 

src/native/clr/host/generate-pinvoke-tables.cc

@@ -79,6 +79,9 @@ const std::vector<std::string> internal_pinvoke_names = {
 //	"recv_uninterrupted",
 //	"send_uninterrupted",
 //	"set_world_accessable",
+
+// We can treat liblog as "internal", since we link against it
+	"__android_log_print",
 };
 
 const std::vector<std::string> dotnet_pinvoke_names = {
@@ -647,6 +650,7 @@ void write_library_name_hashes (Hash (*hasher)(const char*, size_t), std::ostrea
 {
 	write_library_name_hash (hasher, output, "java-interop", "java_interop");
 	write_library_name_hash (hasher, output, "xa-internal-api", "xa_internal_api");
+	write_library_name_hash (hasher, output, "liblog", "android_liblog");
 	write_library_name_hash (hasher, output, "libSystem.Native", "system_native");
 	write_library_name_hash (hasher, output, "libSystem.IO.Compression.Native", "system_io_compression_native");
 	write_library_name_hash (hasher, output, "libSystem.Security.Cryptography.Native.Android", "system_security_cryptography_native_android");

src/native/clr/host/pinvoke-override.cc

@@ -16,7 +16,7 @@ auto PinvokeOverride::monodroid_pinvoke_override (const char *library_name, cons
 	hash_t library_name_hash = xxhash::hash (library_name, strlen (library_name));
 	hash_t entrypoint_hash = xxhash::hash (entrypoint_name, strlen (entrypoint_name));
 
-	if (library_name_hash == java_interop_library_hash || library_name_hash == xa_internal_api_library_hash) {
+	if (library_name_hash == java_interop_library_hash || library_name_hash == xa_internal_api_library_hash || library_name_hash == android_liblog_library_hash) {
 		PinvokeEntry *entry = find_pinvoke_address (entrypoint_hash, internal_pinvokes.data (), internal_pinvokes_count);
 
 		if (entry == nullptr) [[unlikely]] {

src/native/clr/host/pinvoke-tables.include

@@ -11,7 +11,8 @@
 namespace {
 #if INTPTR_MAX == INT64_MAX
 	//64-bit internal p/invoke table
-	std::array<PinvokeEntry, 9> internal_pinvokes {{
+	std::array<PinvokeEntry, 10> internal_pinvokes {{
+		{0x4310c1531ddddc14, "__android_log_print", reinterpret_cast<void*>(&__android_log_print)},
 		{0x4b1956138764939a, "_monodroid_gref_log_new", reinterpret_cast<void*>(&_monodroid_gref_log_new)},
 		{0x9187e6bc6294cacf, "clr_typemap_managed_to_java", reinterpret_cast<void*>(&clr_typemap_managed_to_java)},
 		{0x9a946dfe9916a942, "clr_typemap_java_to_managed", reinterpret_cast<void*>(&clr_typemap_java_to_managed)},
@@ -507,14 +508,16 @@ namespace {
 
 constexpr hash_t java_interop_library_hash = 0x54568ec36068e6b6;
 constexpr hash_t xa_internal_api_library_hash = 0x43fd1b21148361b2;
+constexpr hash_t android_liblog_library_hash = 0x1f2e4bce0544fb0a;
 constexpr hash_t system_native_library_hash = 0x4cd7bd0032e920e1;
 constexpr hash_t system_io_compression_native_library_hash = 0x9190f4cb761b1d3c;
 constexpr hash_t system_security_cryptography_native_android_library_hash = 0x1848c0093f0afd8;
 constexpr hash_t system_globalization_native_library_hash = 0x28b5c8fca080abd5;
 #else
 	//32-bit internal p/invoke table
-	std::array<PinvokeEntry, 9> internal_pinvokes {{
+	std::array<PinvokeEntry, 10> internal_pinvokes {{
 		{0xb7a486a, "monodroid_TypeManager_get_java_class_name", reinterpret_cast<void*>(&monodroid_TypeManager_get_java_class_name)},
+		{0x39e5b5d4, "__android_log_print", reinterpret_cast<void*>(&__android_log_print)},
 		{0x656e00bd, "clr_typemap_managed_to_java", reinterpret_cast<void*>(&clr_typemap_managed_to_java)},
 		{0xa04e5d1c, "monodroid_free", reinterpret_cast<void*>(&monodroid_free)},
 		{0xb02468aa, "_monodroid_gref_get", reinterpret_cast<void*>(&_monodroid_gref_get)},
@@ -1009,12 +1012,13 @@ constexpr hash_t system_globalization_native_library_hash = 0x28b5c8fca080abd5;
 
 constexpr hash_t java_interop_library_hash = 0x6e36e350;
 constexpr hash_t xa_internal_api_library_hash = 0x13c9bd62;
+constexpr hash_t android_liblog_library_hash = 0xa70c9969;
 constexpr hash_t system_native_library_hash = 0x5b9ade60;
 constexpr hash_t system_io_compression_native_library_hash = 0xafe3142c;
 constexpr hash_t system_security_cryptography_native_android_library_hash = 0x93625cd;
 constexpr hash_t system_globalization_native_library_hash = 0xa66f1e5a;
 #endif
 
-constexpr size_t internal_pinvokes_count = 9;
+constexpr size_t internal_pinvokes_count = 10;
 constexpr size_t dotnet_pinvokes_count = 477;
 } // end of anonymous namespace

src/native/clr/host/typemap.cc

@@ -282,9 +282,10 @@ auto TypeMapper::typemap_java_to_managed (const char *typeName) noexcept -> cons
 
 	log_debug (
 		LOG_ASSEMBLY,
-		"Java type '{}' corresponds to managed type '{}'",
+		"Java type '{}' corresponds to managed type '{}' ({:p}",
 		optional_string (typeName),
-		optional_string (managed_type_names[java_entry->managed_type_name_index])
+		optional_string (managed_type_names[java_entry->managed_type_name_index]),
+		reinterpret_cast<const void*>(managed_type_names[java_entry->managed_type_name_index])
 	);
 	return managed_type_names[java_entry->managed_type_name_index];
 }