Add trimmable typemap test plumbing and CI lane

- MonoAndroidTypeMapFlavor=legacy|trimmable MSBuild switch
- CoreCLRTrimmable CI lane in stage-package-tests.yaml
- ExcludeCategories: NativeTypeMap, TrimmableIgnore, SSL
- ExcludedTestNames for Java.Interop-Tests JavaObject-based fixtures
- TrimmableIgnore on NewOpenGenericTypeThrows, ActivatedDirectThrowable, JavaCast_BaseToGenericWrapper

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

Author: simonrozsival

build-tools/automation/yaml-templates/stage-package-tests.yaml

@@ -199,10 +199,20 @@ stages:
         testName: Mono.Android.NET_Tests-CoreCLR
         project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
         testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)CoreCLR.xml
-        extraBuildArgs: -p:TestsFlavor=CoreCLR -p:UseMonoRuntime=false
+        extraBuildArgs: -p:MonoAndroidTypeMapFlavor=legacy
         artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
         artifactFolder: $(DotNetTargetFramework)-CoreCLR
 
+    - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
+      parameters:
+        configuration: $(XA.Build.Configuration)
+        testName: Mono.Android.NET_Tests-CoreCLRTrimmable
+        project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+        testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)CoreCLRTrimmable.xml
+        extraBuildArgs: -p:MonoAndroidTypeMapFlavor=trimmable
+        artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
+        artifactFolder: $(DotNetTargetFramework)-CoreCLRTrimmable
+
     - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
       parameters:
         configuration: $(XA.Build.Configuration)

tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JavaObjectExtensionsTests.cs

@@ -15,7 +15,7 @@ namespace Java.InteropTests {
 	[TestFixture]
 	public class JavaObjectExtensionsTests {
 
-		[Test]
+		[Test, Category ("TrimmableIgnore")]
 		public void JavaCast_BaseToGenericWrapper ()
 		{
 			using (var list = new JavaList (new[]{ 1, 2, 3 }))

tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs

@@ -121,7 +121,7 @@ public void InvokingNullInstanceDoesNotCrashDalvik ()
 			}
 		}
 
-		[Test]
+		[Test, Category ("TrimmableIgnore")]
 		public void NewOpenGenericTypeThrows ()
 		{
 			try {
@@ -301,7 +301,7 @@ public void ActivatedDirectObjectSubclassesShouldBeRegistered ()
 			}
 		}
 
-		[Test]
+		[Test, Category ("TrimmableIgnore")]
 		public void ActivatedDirectThrowableSubclassesShouldBeRegistered ()
 		{
 			if (Build.VERSION.SdkInt <= BuildVersionCodes.GingerbreadMr1)

tests/Mono.Android-Tests/Mono.Android-Tests/Java.Lang/ObjectTest.cs

@@ -72,9 +72,11 @@ public void JnienvCreateInstance_RegistersMultipleInstances ()
 
 				var intermediate  = CreateInstance_OverrideAbsListView_Adapter.Intermediate;
 				var registered    = Java.Lang.Object.GetObject<CreateInstance_OverrideAbsListView_Adapter>(adapter.Handle, JniHandleOwnership.DoNotTransfer);
+				var asBase        = Java.Lang.Object.GetObject<AbsListView>(adapter.Handle, JniHandleOwnership.DoNotTransfer);
 
 				Assert.AreNotSame (adapter, intermediate);
 				Assert.AreSame (adapter, registered);
+				Assert.AreSame (adapter, asBase);
 			}
 		}
 

tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj

@@ -37,6 +37,16 @@
     <ExcludeCategories Condition=" '$(EnableLLVM)' == 'true' ">$(ExcludeCategories):InetAccess:NetworkInterfaces</ExcludeCategories>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MonoAndroidTypeMapFlavor Condition=" '$(MonoAndroidTypeMapFlavor)' == '' "></MonoAndroidTypeMapFlavor>
+    <UseMonoRuntime Condition=" '$(MonoAndroidTypeMapFlavor)' != '' and '$(UseMonoRuntime)' == '' and '$(PublishAot)' != 'true' ">false</UseMonoRuntime>
+    <_AndroidTypeMapImplementation Condition=" '$(MonoAndroidTypeMapFlavor)' == 'legacy' and '$(_AndroidTypeMapImplementation)' == '' ">llvm-ir</_AndroidTypeMapImplementation>
+    <_AndroidTypeMapImplementation Condition=" '$(MonoAndroidTypeMapFlavor)' == 'trimmable' and '$(_AndroidTypeMapImplementation)' == '' ">trimmable</_AndroidTypeMapImplementation>
+    <TestsFlavor Condition=" '$(TestsFlavor)' == '' and '$(MonoAndroidTypeMapFlavor)' == 'legacy' ">CoreCLR</TestsFlavor>
+    <TestsFlavor Condition=" '$(TestsFlavor)' == '' and '$(MonoAndroidTypeMapFlavor)' == 'trimmable' ">CoreCLRTrimmable</TestsFlavor>
+    <ExcludeCategories Condition=" '$(MonoAndroidTypeMapFlavor)' == 'trimmable' ">$(ExcludeCategories):NativeTypeMap:TrimmableIgnore:SSL</ExcludeCategories>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Mono.Linq.Expressions" Version="2.0.0" />
   </ItemGroup>
@@ -260,6 +270,18 @@
     </TestAab>
   </ItemGroup>
 
+  <Target Name="_ValidateMonoAndroidTypeMapFlavor"
+      BeforeTargets="Build">
+    <Error Condition=" '$(MonoAndroidTypeMapFlavor)' != '' and '$(MonoAndroidTypeMapFlavor)' != 'legacy' and '$(MonoAndroidTypeMapFlavor)' != 'trimmable' "
+        Text="Invalid value for MonoAndroidTypeMapFlavor: '$(MonoAndroidTypeMapFlavor)'. Valid values are: legacy, trimmable." />
+    <Error Condition=" '$(MonoAndroidTypeMapFlavor)' != '' and '$(PublishAot)' == 'true' "
+        Text="MonoAndroidTypeMapFlavor only supports the Mono.Android.NET-Tests CoreCLR configurations." />
+    <Error Condition=" '$(MonoAndroidTypeMapFlavor)' != '' and '$(UseMonoRuntime)' == 'true' "
+        Text="MonoAndroidTypeMapFlavor requires CoreCLR. Remove UseMonoRuntime=true." />
+    <Error Condition=" '$(MonoAndroidTypeMapFlavor)' == 'trimmable' and '$(_AndroidTypeMapImplementation)' != 'trimmable' "
+        Text="MonoAndroidTypeMapFlavor=trimmable requires _AndroidTypeMapImplementation=trimmable." />
+  </Target>
+
   <Import Project="$(XamarinAndroidSourcePath)build-tools\scripts\TestApks.targets" />
 
 </Project>

tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs

@@ -25,6 +25,20 @@ protected override string LogTag
         protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
             : base(handle, transfer)
         {
+            if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
+                // Java.Interop-Tests fixtures that use JavaObject types (not Java.Lang.Object)
+                // don't have JCW Java classes in the trimmable APK, and method remapping
+                // tests require Java-side support not present in the trimmable path.
+                // Exclude these entire fixtures to prevent ClassNotFoundException crashes.
+                ExcludedTestNames = new [] {
+                    "Java.InteropTests.JavaObjectTest",
+                    "Java.InteropTests.InvokeVirtualFromConstructorTests",
+                    "Java.InteropTests.JniPeerMembersTests",
+                    "Java.InteropTests.JniTypeManagerTests",
+                    "Java.InteropTests.JniValueMarshaler_object_ContractTests",
+                    "Java.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy",
+                };
+            }
         }
 
         protected override IList<TestAssemblyInfo> GetTestAssemblies()