Try dotnet/java-interop#1181

jonpryor · jonpryor · commit 9798fb889ee2 · 2024-01-26T14:48:13.000-05:00
Context: dotnet/java-interop#1181 Context: #8625 Context: dotnet/java-interop@005c914 Does It Build™? PR #8625 has turned into a cluster, *probably* because of dotnet/java-interop@005c9141, which implicitly requires typemap support for *non*-`Java.Lang.Object` subclasses such as the `CallVirtualFromConstructorDerived` test type. Java.Interop#1181 updates typemap and JCW generation to support `Java.Interop.JavaObject` and `Java.Interop.JavaException` subclasses, which will *hopefully* allow the `CallVirtualFromConstructorDerived`-using tests to work.
diff --git a/.gitmodules b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
     url = https://github.com/xamarin/java.interop.git
-    branch = main
+    branch = dev/jonp/ji-typemap-support
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/xamarin/lz4
diff --git a/external/Java.Interop b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 8b85462e5f304d9aa2d91c02966d7dc9751516c7
+Subproject commit 3e583fea597ffb169a4df1313edc2259a00ceb22
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs b/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs
@@ -77,7 +77,7 @@ public List<JavaType> GetJavaTypes (ICollection<ITaskItem> inputAssemblies, XAAs
 
 	void AddJavaType (TypeDefinition type, Dictionary<string, TypeData> types, AndroidTargetArch arch)
 	{
-		if (type.IsSubclassOf ("Java.Lang.Object", cache) || type.IsSubclassOf ("Java.Lang.Throwable", cache) || (type.IsInterface && type.ImplementsInterface ("Java.Interop.IJavaPeerable", cache))) {
+		if (type.HasJavaPeer (cache)) {
 			// For subclasses of e.g. Android.App.Activity.
 			string typeName = type.GetPartialAssemblyQualifiedName (cache);
 			if (!types.TryGetValue (typeName, out TypeData typeData)) {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public List<JavaType> GetJavaTypes (ICollection<ITaskItem> inputAssemblies, XAAs`
`77`	`77`
`78`	`78`	`void AddJavaType (TypeDefinition type, Dictionary<string, TypeData> types, AndroidTargetArch arch)`
`79`	`79`	`{`
`80`		`- if (type.IsSubclassOf ("Java.Lang.Object", cache) \|\| type.IsSubclassOf ("Java.Lang.Throwable", cache) \|\| (type.IsInterface && type.ImplementsInterface ("Java.Interop.IJavaPeerable", cache))) {`
	`80`	`+ if (type.HasJavaPeer (cache)) {`
`81`	`81`	`// For subclasses of e.g. Android.App.Activity.`
`82`	`82`	`string typeName = type.GetPartialAssemblyQualifiedName (cache);`
`83`	`83`	`if (!types.TryGetValue (typeName, out TypeData typeData)) {`