Bump to dotnet/java-interop@d62008d1 (#9768)

Changes: dotnet/java-interop@57f7bc8...d62008d

  * dotnet/java-interop@d62008d1: [Java.Interop] GetSimpleReferences(): fallback for GetTypeSignatures() (dotnet/java-interop#1305)

Context: 25d1f00

If you have a Debug build of .NET for Android, and you enable
assembly logging:

	% adb shell setprop debug.mono.log default,assembly

then `adb logcat` will contain messages such as:

	I monodroid-assembly: typemap: unable to find mapping to a Java type from managed type 'Java.Interop.ManagedPeer, Java.Interop'
	W monodroid: typemap: failed to map managed type to Java type: Java.Interop.ManagedPeer, Java.Interop, Version=10.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065 (Module ID
	W monodroid-assembly: typemap: called from
	W monodroid-assembly: at Android.Runtime.JNIEnv.TypemapManagedToJava(Type type)
	W monodroid-assembly:    at Android.Runtime.AndroidTypeManager.GetSimpleReference(Type type)
	W monodroid-assembly:    at Java.Interop.JniRuntime.JniTypeManager.GetTypeSignature(Type type)
	W monodroid-assembly:    at Java.Interop.JniPeerMembers..ctor(String jniPeerTypeName, Type managedPeerType, Boolean checkManagedPeerType, Boolean isInterface)
	W monodroid-assembly:    at Java.Interop.JniPeerMembers..ctor(String jniPeerTypeName, Type managedPeerType)
	W monodroid-assembly:    at Java.Interop.ManagedPeer..cctor()
	W monodroid-assembly:    at Java.Interop.JniRuntime..ctor(CreationOptions options)
	W monodroid-assembly:    at Android.Runtime.AndroidRuntime..ctor(IntPtr jnienv, IntPtr vm, IntPtr classLoader, IntPtr classLoader_loadClass, Boolean jniAddNativeMethodRegistrationAttributePresent)
	W monodroid-assembly:    at Android.Runtime.JNIEnvInit.Initialize(JnienvInitializeArgs* args)
	…
	I monodroid-assembly: typemap: unable to find mapping to a Java type from managed type 'Java.Interop.JavaObject, Java.Interop'
	W monodroid: typemap: failed to map managed type to Java type: Java.Interop.JavaObject, Java.Interop, Version=10.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065 (Module ID: 90427bf1-700a-4676-b23a-fb68e2e2e9da; Type token: 33554439)
	W monodroid-assembly: typemap: called from
	W monodroid-assembly: at Android.Runtime.JNIEnv.TypemapManagedToJava(Type type)
	W monodroid-assembly:    at Android.Runtime.AndroidTypeManager.GetSimpleReference(Type type)
	W monodroid-assembly:    at Java.Interop.JniRuntime.JniTypeManager.GetTypeSignature(Type type)
	W monodroid-assembly:    at Java.Interop.JniPeerMembers..ctor(String jniPeerTypeName, Type managedPeerType, Boolean checkManagedPeerType, Boolean isInterface)
	W monodroid-assembly:    at Java.Interop.JniPeerMembers..ctor(String jniPeerTypeName, Type managedPeerType)
	W monodroid-assembly:    at Java.Interop.JavaObject..cctor()
	W monodroid-assembly:    at Java.Interop.TypeManager.Activate(IntPtr jobject, ConstructorInfo cinfo, Object[] parms)
	W monodroid-assembly:    at Java.Interop.TypeManager.n_Activate(IntPtr jnienv, IntPtr jclass, IntPtr typename_ptr, IntPtr signature_ptr, IntPtr jobject, IntPtr parameters_ptr)
	W monodroid-assembly:    at Android.Runtime.JNINativeWrapper.Wrap_JniMarshal_PPLLLL_V(_JniMarshal_PPLLLL_V callback, IntPtr jnienv, IntPtr klazz, IntPtr p0, IntPtr p1, IntPtr p2, IntPtr p3)

`ManagedPeer` and `JavaObject` are types within `Java.Interop.dll`
which uses `JniPeerMembers`, and [Debug builds of `JniPeerMembers`][0]
try to verify that the typemap entry is consistent:

	partial class JniPeerMembers {
	  JniPeerMembers string jniPeerTypeName, Type managedPeerType, bool checkManagedPeerType, bool isInterface = false)
	  {
	    // …
	#if DEBUG
	    var signatureFromType   = JniEnvironment.Runtime.TypeManager.GetTypeSignature (managedPeerType);
	    if (signatureFromType.SimpleReference != jniPeerTypeName) {
	      Debug.WriteLine ("WARNING-Java.Interop: ManagedPeerType <=> JniTypeName Mismatch! javaVM.GetJniTypeInfoForType(typeof({0})).JniTypeName=\"{1}\" != \"{2}\"",
	          managedPeerType.FullName,
	          signatureFromType.SimpleReference,
	          jniPeerTypeName);
	      Debug.WriteLine (new System.Diagnostics.StackTrace (true));
	    }
	#endif  // DEBUG
	  }
	}

However, `Java.Interop.dll` is not considered to be a .NET for Android
assembly, as it's built with e.g. `$(TargetFramework)=net9.0` and not
`$(TargetFramework)=net9.0-android`.  As such, it is skipped during
typemap processing.

Update `XAJavaTypeScanner.SpecialAssemblies` so that `Java.Interop.dll`
is explicitly processed.  This will ensure that there is a typemap
entry for `ManagedPeer` and that the `JniPeerMembers` checks pass.
This allows typemap entries for `JavaObject` and `ManagedPeer` to be
created, removing the above warning messages.

This also requires updating `XAJavaTypeScanner.GetJavaTypes()` so
that in Debug builds, `Mono.Android.dll` is processed *before* any
other assemblies, ensuring that `java/lang/Object` is typemap'd to
`Java.Lang.Object, Mono.Android.dll`.  See also 25d1f00, which did
the same thing for *Release* builds.

Add a new `ObjectTest.java_lang_Object_Is_Java_Lang_Object()` unit
test which explicitly verifies the mapping for `java/lang/Object`.

[0]: https://github.com/dotnet/java-interop/blob/6bc87e8b55bc00ae1423a5ae92cf5db573fc76ed/src/Java.Interop/Java.Interop/JniPeerMembers.cs#L45-L54

Author: jonpryor

external/Java.Interop

@@ -5,28 +5,28 @@
       "Size": 3036
     },
     "classes.dex": {
-      "Size": 22456
+      "Size": 22484
     },
     "lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
       "Size": 18288
     },
     "lib/arm64-v8a/lib_Java.Interop.dll.so": {
-      "Size": 86264
+      "Size": 86688
     },
     "lib/arm64-v8a/lib_Mono.Android.dll.so": {
-      "Size": 115072
+      "Size": 117712
     },
     "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
-      "Size": 22432
+      "Size": 22384
     },
     "lib/arm64-v8a/lib_System.Console.dll.so": {
-      "Size": 24400
+      "Size": 24392
     },
     "lib/arm64-v8a/lib_System.Linq.dll.so": {
-      "Size": 25368
+      "Size": 25336
     },
     "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
-      "Size": 628960
+      "Size": 628216
     },
     "lib/arm64-v8a/lib_System.Runtime.dll.so": {
       "Size": 20056
@@ -38,16 +38,16 @@
       "Size": 20024
     },
     "lib/arm64-v8a/libarc.bin.so": {
-      "Size": 18832
+      "Size": 18872
     },
     "lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
       "Size": 36440
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 1524624
+      "Size": 1524752
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3101160
+      "Size": 3101112
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 71976
@@ -62,10 +62,10 @@
       "Size": 165000
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 18064
+      "Size": 19536
     },
     "META-INF/BNDLTOOL.RSA": {
-      "Size": 1223
+      "Size": 1221
     },
     "META-INF/BNDLTOOL.SF": {
       "Size": 3266
@@ -98,5 +98,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 3074581
+  "PackageSize": 3078677
 }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-
+using System.Linq;
 using Java.Interop.Tools.Cecil;
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
@@ -17,6 +17,7 @@ class XAJavaTypeScanner
 	// Names of assemblies which don't have Mono.Android.dll references, or are framework assemblies, but which must
 	// be scanned for Java types.
 	static readonly HashSet<string> SpecialAssemblies = new HashSet<string> (StringComparer.OrdinalIgnoreCase) {
+		"Java.Interop.dll",
 		"Mono.Android.dll",
 		"Mono.Android.Runtime.dll",
 	};
@@ -37,11 +38,15 @@ public XAJavaTypeScanner (AndroidTargetArch targetArch, TaskLoggingHelper log, T
 	public List<TypeDefinition> GetJavaTypes (ICollection<ITaskItem> inputAssemblies, XAAssemblyResolver resolver)
 	{
 		var types = new List<TypeDefinition> ();
-		foreach (ITaskItem asmItem in inputAssemblies) {
-			if (!ShouldScan (asmItem)) {
-				log.LogDebugMessage ($"[{targetArch}] Skipping Java type scanning in assembly '{asmItem.ItemSpec}'");
-				continue;
-			}
+		var inputItems  = inputAssemblies
+			.Where (a => ShouldScan (a))
+			.ToList ();
+		var monoAndroid = inputItems.FirstOrDefault (a => Path.GetFileName (a.ItemSpec) == "Mono.Android.dll");
+		if (monoAndroid != null) {
+			inputItems.Remove (monoAndroid);
+			inputItems.Insert (0, monoAndroid);
+		}
+		foreach (ITaskItem asmItem in inputItems) {
 			log.LogDebugMessage ($"[{targetArch}] Scanning assembly '{asmItem.ItemSpec}' for Java types");
 
 			AndroidTargetArch arch = MonoAndroidHelper.GetTargetArch (asmItem);

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

@@ -10,6 +10,8 @@
 using Android.Runtime;
 using Android.Widget;
 
+using Java.Interop;
+
 using NUnit.Framework;
 
 namespace Java.LangTests
@@ -83,6 +85,14 @@ public void NestedDisposeInvocations ()
 			value.Dispose ();
 			value.Dispose ();
 		}
+
+		[Test]
+		public void java_lang_Object_Is_Java_Lang_Object ()
+		{
+			var jloType = global::Java.Interop.JniEnvironment.Runtime.TypeManager.GetType (new JniTypeSignature ("java/lang/Object"));
+			Assert.AreSame (typeof (Java.Lang.Object), jloType,
+					$"`java/lang/Object` is typemap'd to `{jloType}`, not `Java.Lang.Object, Mono.Android`!");
+		}
 	}
 
 	/*