Updatee based on feedback

dotnet · Nov 7, 2022 · d7ed3e4 · d7ed3e4
1 parent 741fe34
commit d7ed3e4
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
@@ -271,7 +271,6 @@ void Run (DirectoryAssemblyResolver res, bool useMarshalMethods)
 
 			using (var acw_map = MemoryStreamPool.Shared.CreateStreamWriter ()) {
 				foreach (TypeDefinition type in javaTypes) {
-					string mvid = type.Module.Mvid.ToString ();
 					string managedKey = type.FullName.Replace ('/', '.');
 					string javaKey = JavaNativeTypeManager.ToJniName (type, cache).Replace ('/', '.');
 
@@ -283,15 +282,15 @@ void Run (DirectoryAssemblyResolver res, bool useMarshalMethods)
 					TypeDefinition conflict;
 					bool hasConflict = false;
 					if (managed.TryGetValue (managedKey, out conflict)) {
-						if (!conflict.Module.Mvid.Equals(mvid)) {
+						if (!conflict.Module.Mvid.Equals(type.Module.Mvid)) {
 							if (!managedConflicts.TryGetValue (managedKey, out var list))
 								managedConflicts.Add (managedKey, list = new List<string> { conflict.GetPartialAssemblyName (cache) });
 							list.Add (type.GetPartialAssemblyName (cache));
 						}
 						hasConflict = true;
 					}
 					if (java.TryGetValue (javaKey, out conflict)) {
-						if (!conflict.Module.Mvid.Equals(mvid)) {
+						if (!conflict.Module.Mvid.Equals(type.Module.Mvid)) {
 							if (!javaConflicts.TryGetValue (javaKey, out var list))
 								javaConflicts.Add (javaKey, list = new List<string> { conflict.GetAssemblyQualifiedName (cache) });
 							list.Add (type.GetAssemblyQualifiedName (cache));