From bba4a8813c150ebe5b399b9ce7a633292b88e608 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 23 Jul 2026 17:03:18 -0500
Subject: [PATCH] [tests] Restore Java.Interop value manager coverage

Condition the value manager test exclusions on the runtime and typemap implementations that cannot execute them.

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

Copilot-Session: 4892bbc2-de90-442c-b18d-984fd1b165d2
---
 .../Java.Interop-Tests/Java.Interop-Tests.NET.csproj   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
index 79ccfecab84..2a3298e5f18 100644
--- a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
+++ b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
@@ -42,11 +42,13 @@
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\InvokeVirtualFromConstructorTests.cs" />
   </ItemGroup>
 
-  <!-- Some of tests included in the files below fail on CoreCLR. This is PROBABLY caused by managed typemaps, which 
-       will be replaced at some point by a different implementation. Until then, these tests can remain disabled. -->
-  <!-- TODO: put these back when new typemap implementation is available -->
-  <ItemGroup>
+  <!-- AndroidValueManager is the MonoVM value manager; CoreCLR and NativeAOT use different implementations. -->
+  <ItemGroup Condition=" '$(UseMonoRuntime)' != 'true' ">
     <Compile Remove="Java.InteropTests\AndroidValueManagerContractTests.cs" />
+  </ItemGroup>
+
+  <!-- ReflectionJniValueManager is unsupported by the trimmable typemap value manager. See dotnet/android#12221. -->
+  <ItemGroup Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' ">
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniRuntime.JniValueManagerTests.cs" />
   </ItemGroup>