Fix trimmable export rebase fallout

Use the Java.Interop activation constructor style when creating interface invokers, and align export UCO wrapper tests with the catch/finally shape emitted by export dispatch.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: simonrozsival

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs

@@ -613,4 +613,3 @@ void AddUnmanagedCallersOnlyAttribute (MethodDefinitionHandle handle)
 	}
 
 }
-

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs

@@ -654,25 +654,26 @@ void EmitCreateInstance (JavaPeerProxyData proxy)
 			return;
 		}
 
-		// JavaInterop-style activation ctors (ref JniObjectReference, JniObjectReferenceOptions)
-		// require parameter conversion from (IntPtr, JniHandleOwnership).
-		if (proxy.ActivationCtor?.Style == ActivationCtorStyle.JavaInterop) {
-			if (proxy.InvokerType != null) {
-				EmitCreateInstanceViaJavaInteropNewobj (_pe.ResolveTypeRef (proxy.InvokerType));
+		if (proxy.InvokerType != null) {
+			var invokerTypeRef = _pe.ResolveTypeRef (proxy.InvokerType);
+			if (proxy.InvokerActivationCtorStyle == ActivationCtorStyle.JavaInterop) {
+				EmitCreateInstanceViaJavaInteropNewobj (invokerTypeRef);
 			} else {
-				var targetRef = _pe.ResolveTypeRef (proxy.TargetType);
-				var jiCtor = proxy.ActivationCtor ?? throw new InvalidOperationException ("ActivationCtor should not be null");
-				if (jiCtor.IsOnLeafType) {
-					EmitCreateInstanceViaJavaInteropNewobj (targetRef);
-				} else {
-					EmitCreateInstanceInheritedJavaInteropCtor (targetRef, jiCtor);
-				}
+				EmitCreateInstanceViaNewobj (invokerTypeRef);
 			}
 			return;
 		}
 
-		if (proxy.InvokerType != null) {
-			EmitCreateInstanceViaNewobj (_pe.ResolveTypeRef (proxy.InvokerType));
+		// JavaInterop-style activation ctors (ref JniObjectReference, JniObjectReferenceOptions)
+		// require parameter conversion from (IntPtr, JniHandleOwnership).
+		if (proxy.ActivationCtor?.Style == ActivationCtorStyle.JavaInterop) {
+			var targetRef = _pe.ResolveTypeRef (proxy.TargetType);
+			var jiCtor = proxy.ActivationCtor ?? throw new InvalidOperationException ("ActivationCtor should not be null");
+			if (jiCtor.IsOnLeafType) {
+				EmitCreateInstanceViaJavaInteropNewobj (targetRef);
+			} else {
+				EmitCreateInstanceInheritedJavaInteropCtor (targetRef, jiCtor);
+			}
 			return;
 		}
 

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs

@@ -793,9 +793,9 @@ public void Generate_UcoMethod_BooleanParam_WrapperUsesByte_CallbackUsesSByte ()
 	}
 
 	[Fact]
-	public void Generate_UcoMethod_HasCatchRegionWithoutFinally ()
+	public void Generate_ExportUcoMethod_HasCatchAndFinallyRegions ()
 	{
-		var peer = FindFixtureByJavaName ("my/app/TouchHandler");
+		var peer = FindFixtureByJavaName ("my/app/ExportExample");
 		using var stream = GenerateAssembly (new [] { peer }, "UcoLegacyWrapperShape");
 		using var pe = new PEReader (stream);
 		var reader = pe.GetMetadataReader ();
@@ -804,13 +804,13 @@ public void Generate_UcoMethod_HasCatchRegionWithoutFinally ()
 			.First (h => {
 				var method = reader.GetMethodDefinition (h);
 				var name = reader.GetString (method.Name);
-				return name.Contains ("onTouch") && name.Contains ("_uco_");
+				return name.Contains ("myExportedMethod") && name.Contains ("_uco_");
 			});
 		var ucoMethod = reader.GetMethodDefinition (ucoMethodHandle);
 		var body = pe.GetMethodBody (ucoMethod.RelativeVirtualAddress);
 		Assert.NotNull (body);
 		Assert.Contains (body.ExceptionRegions, r => r.Kind == ExceptionRegionKind.Catch);
-		Assert.DoesNotContain (body.ExceptionRegions, r => r.Kind == ExceptionRegionKind.Finally);
+		Assert.Contains (body.ExceptionRegions, r => r.Kind == ExceptionRegionKind.Finally);
 	}
 
 	[Fact]