[TrimmableTypeMap] Fix CoreCLR test plumbing

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

Author: simonrozsival

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets

@@ -36,11 +36,14 @@
   <!--
     Generate TypeMap assemblies and JCW files.
     AfterTargets="CoreCompile" so it runs after compilation.
+    BeforeTargets="_GenerateJavaStubs" so the generated manifest + Java sources
+    are available when _GenerateJavaStubs copies typemap sources into android/src.
     Uses @(ReferencePath) as the primary input (available after compilation).
   -->
   <Target Name="_GenerateTrimmableTypeMap"
       Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' and '@(ReferencePath->Count())' != '0' "
       AfterTargets="CoreCompile"
+      BeforeTargets="_GenerateJavaStubs"
       Inputs="@(ReferencePath);$(IntermediateOutputPath)$(TargetFileName);$(_AndroidManifestAbs)"
       Outputs="$(_TypeMapOutputDirectory)$(_TypeMapAssemblyName).dll">
 

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

@@ -25,6 +25,8 @@
     <Compile Include="$(JavaInteropTestDirectory)**\*.cs" Exclude="$(JavaInteropTestDirectory)obj\**;$(JavaInteropTestDirectory)bin\**" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JavaVMFixture.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniReferenceSafeHandleTest.cs" />
+    <!-- Uses FEATURE_JNIENVIRONMENT_JI_FUNCTION_POINTERS-only APIs that are not exposed by the Android product assembly -->
+    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniTypeUtf8Test.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)obj\Release\net7.0-android/designtime/Resource.designer.cs" />
   </ItemGroup>
 

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

@@ -25,7 +25,7 @@ protected override string LogTag
         protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
             : base(handle, transfer)
         {
-            if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
+            if (AppContext.TryGetSwitch ("Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap", out bool trimmableTypeMap) && 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.
@@ -53,4 +53,4 @@ protected override IList<TestAssemblyInfo> GetTestAssemblies()
             };
         }
     }
-}
+}