From ea214886d84a73595441c5562e8eb896362d4df6 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Thu, 25 Jun 2026 15:26:16 -0700
Subject: [PATCH] Fix Android NativeAOT test crypto JNI export

Keep the Android crypto trust-manager JNI callback rooted and exported for runtime NativeAOT test APKs, and re-enable the tests disabled for the missing export.

Assisted-by: Copilot:gpt-5.5

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/testing/tests.android.targets | 5 +++++
 src/libraries/tests.proj          | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eng/testing/tests.android.targets b/eng/testing/tests.android.targets
index 7b20463c9e9330..f20521db7770bc 100644
--- a/eng/testing/tests.android.targets
+++ b/eng/testing/tests.android.targets
@@ -28,6 +28,11 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <_SuppressNativeLibEventSourceWarning>true</_SuppressNativeLibEventSourceWarning>
   </PropertyGroup>
+  <ItemGroup Condition="'$(TestNativeAOT)' == 'true'">
+    <!-- Android test APKs link the crypto archive directly; keep the Java native trust-manager callback visible. -->
+    <IlcArg Include="--export-dynamic-symbol:Java_net_dot_android_crypto_DotnetProxyTrustManager_verifyRemoteCertificate" />
+    <LinkerArg Include="-Wl,-u,Java_net_dot_android_crypto_DotnetProxyTrustManager_verifyRemoteCertificate" />
+  </ItemGroup>
 
   <!-- Target that kicks off the whole test build and run flow -->
   <Target Name="BundleTestAndroidApp" DependsOnTargets="$(BundleTestAndroidAppDependsOn)" />
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 51a1fad79f154b..bad62a0d5fed3c 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -611,10 +611,6 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Security\tests\UnitTests\System.Net.Security.Unit.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.IO.FileSystem.Tests\DisabledFileLockingTests\System.IO.FileSystem.DisabledFileLocking.Tests.csproj" />
 
-    <!-- https://github.com/dotnet/runtime/issues/120959 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Requests\tests\System.Net.Requests.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.WebSockets.Client\tests\System.Net.WebSockets.Client.Tests.csproj" />
-
     <SmokeTestProject Include="$(RepoRoot)src\tests\FunctionalTests\Android\Device_Emulator\NativeAOT\*.Test.csproj"/>
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Tests\System.Globalization.Tests.csproj" />
     <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Security.Cryptography\tests\System.Security.Cryptography.Tests.csproj" />