Include assembly name in hash

Author: simonrozsival

src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/TypeMapping.cs

@@ -38,13 +38,8 @@ internal static bool TryGetType (string javaClassName, [NotNullWhen (true)] out
 
 	internal static bool TryGetJavaClassName (Type type, [NotNullWhen (true)] out string? className)
 	{
-		string? fullName = type.FullName;
-		if (fullName is null) {
-			className = null;
-			return false;
-		}
-
-		ulong hash = Hash (fullName);
+		string name = $"{type.FullName}, {type.Assembly.GetName ().Name}";
+		ulong hash = Hash (name);
 
 		// the hashes array is sorted and all the hashes are unique
 		int javaClassNameIndex = MemoryExtensions.BinarySearch (TypeNameHashes, hash);
@@ -60,17 +55,17 @@ internal static bool TryGetJavaClassName (Type type, [NotNullWhen (true)] out st
 
 		// ensure this is not a hash collision
 		var resolvedType = GetTypeByIndex (JavaClassNameIndexToTypeIndex [javaClassNameIndex]);
-		if (resolvedType?.FullName != type.FullName) {
+		if (resolvedType?.AssemblyQualifiedName != type.AssemblyQualifiedName) {
 			className = null;
 			return false;
 		}
 
 		return true;
 	}
 
-	private static ulong Hash (string javaClassName)
+	private static ulong Hash (string value)
 	{
-		ReadOnlySpan<byte> bytes = MemoryMarshal.AsBytes (javaClassName.AsSpan ());
+		ReadOnlySpan<byte> bytes = MemoryMarshal.AsBytes (value.AsSpan ());
 		ulong hash = XxHash3.HashToUInt64 (bytes);
 
 		// The bytes in the hashes array are stored as little endian. If the target platform is big endian,

src/Microsoft.Android.Sdk.ILLink/TypeMappingStep.cs

@@ -71,12 +71,12 @@ protected override void EndProcess ()
 		GenerateGetTypeByIndex (types);
 
 		// .NET -> Java mapping
-		KeyValuePair<string, List<TypeDefinition>>[] orderedManagedToJavaMapping = TypeMappings.OrderBy (kvp => Hash (SelectTypeDefinition(kvp.Key, kvp.Value).FullName)).ToArray ();
+		var orderedManagedToJavaMapping = TypeMappings.OrderBy (kvp => Hash (GetTypeName (SelectTypeDefinition (kvp.Key, kvp.Value)))).ToArray ();
 
-		var dotnetTypeNameHashes = orderedManagedToJavaMapping.Select (kvp => Hash (SelectTypeDefinition(kvp.Key, kvp.Value).FullName)).ToArray ();
+		var dotnetTypeNameHashes = orderedManagedToJavaMapping.Select (kvp => Hash (GetTypeName (SelectTypeDefinition (kvp.Key, kvp.Value)))).ToArray ();
 		GenerateHashes (dotnetTypeNameHashes, methodName: "get_TypeNameHashes");
 
-		string[] javaClassNames = orderedManagedToJavaMapping.Select (kvp => kvp.Key).ToArray ();
+		var javaClassNames = orderedManagedToJavaMapping.Select (kvp => kvp.Key).ToArray ();
 		GenerateGetJavaClassNameByIndex (javaClassNames);
 
 		// Generate remap arrays
@@ -243,6 +243,13 @@ TypeDefinition GetArrayType (TypeDefinition type, int size)
 
 			return arrayType;
 		}
+
+		string GetTypeName (TypeDefinition type)
+		{
+			var fullName = type.FullName.Replace ('/', '.').Replace ('+', '.');
+			var assemblyName = type.Module.Assembly.Name.Name;
+			return $"{fullName}, {assemblyName}";
+		}
 	}
 
 	TypeDefinition SelectTypeDefinition (string javaName, List<TypeDefinition> list)