Add NativeAOT on Android tests for Globalization, Interop, and Cryptography

eng/testing/tests.android.targets

@@ -12,10 +12,18 @@
     <BundleTestAndroidAppDependsOn>AndroidBuild</BundleTestAndroidAppDependsOn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR'">
+  <PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(IsFunctionalTest)' != 'true'">
     <DefineConstants>$(DefineConstants);SINGLE_FILE_TEST_RUNNER</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TestNativeAOT)' == 'true'">
+    <Compile Include="$(RepoTasksDir)AndroidAppBuilder\Templates\monodroid-nativeaot.cs" />
+  </ItemGroup>
+  <PropertyGroup Condition="'$(TestNativeAOT)' == 'true'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <_UseNativeLibPrefix>true</_UseNativeLibPrefix>
+  </PropertyGroup>
+
   <!-- Target that kicks off the whole test build and run flow -->
   <Target Name="BundleTestAndroidApp" DependsOnTargets="$(BundleTestAndroidAppDependsOn)" />
 
@@ -25,7 +33,8 @@
     <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
 
     <PropertyGroup>
-      <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
+      <MainLibraryFileName Condition="'$(MainLibraryFileName)' == '' and '$(TestNativeAOT)' != 'true'">AndroidTestRunner.dll</MainLibraryFileName>
+      <MainLibraryFileName Condition="'$(MainLibraryFileName)' == '' and '$(TestNativeAOT)' == 'true'">lib$(TargetName).so</MainLibraryFileName>
 
       <AndroidBuildDir>$(PublishDir)</AndroidBuildDir>
     </PropertyGroup>

eng/testing/tests.mobile.targets

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- OutDir is not set early enough to set this property in .props file. -->
-    <BundleDir>$([MSBuild]::NormalizeDirectory('$(OutDir)', 'AppBundle'))</BundleDir>
+    <BundleDir Condition="'$(BundleDir)' == ''">$([MSBuild]::NormalizeDirectory('$(OutDir)', 'AppBundle'))</BundleDir>
     <PublishDir Condition="'$(UseAppBundleRootForBuildingTests)' == 'true' and '$(IgnoreForCI)' != 'true' and '$(IsFunctionalTest)' != 'true'">$(AppBundleRoot)tests\$(AssemblyName)</PublishDir>
     <PublishDir Condition="'$(UseAppBundleRootForBuildingTests)' == 'true' and '$(IgnoreForCI)' != 'true' and '$(IsFunctionalTest)' == 'true'">$(AppBundleRoot)runonly\$(AssemblyName)</PublishDir>
     <BundleDir Condition="'$(UseAppBundleRootForBuildingTests)' == 'true' and '$(IgnoreForCI)' != 'true'">$([MSBuild]::NormalizeDirectory('$(PublishDir)', 'AppBundle'))</BundleDir>

eng/testing/tests.singlefile.targets

@@ -32,7 +32,7 @@
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(PublishSingleFile)' == 'true' or '$(TestNativeAot)' == 'true'">
+  <PropertyGroup Condition="('$(PublishSingleFile)' == 'true' or '$(TestNativeAot)' == 'true') and '$(IsFunctionalTest)' != 'true'">
     <DefineConstants>$(DefineConstants);SINGLE_FILE_TEST_RUNNER</DefineConstants>
   </PropertyGroup>
 

src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/CompositeMLDsa/CompositeMLDsaFactoryTests.cs

@@ -4,6 +4,7 @@
 using System.Formats.Asn1;
 using System.Linq;
 using Microsoft.DotNet.RemoteExecutor;
+using Microsoft.DotNet.XUnitExtensions;
 using Xunit;
 using Xunit.Sdk;
 
@@ -60,6 +61,7 @@ public static void ImportBadPrivateKey_ShortTradKey(CompositeMLDsaAlgorithm algo
         }
 
         [Theory]
+        [SkipOnPlatform(TestPlatforms.Android, "Not supported on Android")]
         [MemberData(nameof(CompositeMLDsaTestData.SupportedAlgorithmIetfVectorsTestData), MemberType = typeof(CompositeMLDsaTestData))]
         public static void ImportBadPrivateKey_TrailingData(CompositeMLDsaTestData.CompositeMLDsaTestVector vector)
         {
@@ -311,6 +313,7 @@ public static void ImportBadPublicKey_ShortTradKey(CompositeMLDsaAlgorithm algor
         }
 
         [Theory]
+        [SkipOnPlatform(TestPlatforms.Android, "Not supported on Android")]
         [MemberData(nameof(CompositeMLDsaTestData.SupportedAlgorithmIetfVectorsTestData), MemberType = typeof(CompositeMLDsaTestData))]
         public static void ImportBadPublicKey_TrailingData(CompositeMLDsaTestData.CompositeMLDsaTestVector vector)
         {
@@ -321,6 +324,7 @@ public static void ImportBadPublicKey_TrailingData(CompositeMLDsaTestData.Compos
         }
 
         [Theory]
+        [SkipOnPlatform(TestPlatforms.Android, "Not supported on Android")]
         [MemberData(nameof(CompositeMLDsaTestData.SupportedECDsaAlgorithmIetfVectorsTestData), MemberType = typeof(CompositeMLDsaTestData))]
         public static void ImportBadPublicKey_ECDsa_Uncompressed(CompositeMLDsaTestData.CompositeMLDsaTestVector vector)
         {
@@ -419,6 +423,7 @@ public static void AlgorithmMatches_GenerateKey(CompositeMLDsaAlgorithm algorith
         }
 
         [Theory]
+        [SkipOnPlatform(TestPlatforms.Android, "Not supported on Android")]
         [MemberData(nameof(CompositeMLDsaTestData.SupportedAlgorithmIetfVectorsTestData), MemberType = typeof(CompositeMLDsaTestData))]
         public static void AlgorithmMatches_Import(CompositeMLDsaTestData.CompositeMLDsaTestVector vector)
         {

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs

@@ -288,7 +288,7 @@ public static bool IsMetadataTokenSupported
         public static bool IsDomainJoinedMachine => !Environment.MachineName.Equals(Environment.UserDomainName, StringComparison.OrdinalIgnoreCase);
         public static bool IsNotDomainJoinedMachine => !IsDomainJoinedMachine;
 
-        public static bool IsOpenSslSupported => IsLinux || IsFreeBSD || Isillumos || IsSolaris;
+        public static bool IsOpenSslSupported => (IsLinux && !IsAndroid) || IsFreeBSD || Isillumos || IsSolaris;
         public static bool OpenSslNotPresentOnSystem => !OpenSslPresentOnSystem;
 
         public static bool UsesAppleCrypto => IsOSX || IsMacCatalyst || IsiOS || IstvOS;

src/libraries/System.Security.Cryptography/tests/DefaultECDsaProvider.Android.cs

@@ -52,8 +52,8 @@ internal static partial class Interop
 {
     internal static partial class AndroidCrypto
     {
-        [DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_EcKeyCreateByOid")]
-        internal static extern System.IntPtr EcKeyCreateByOid(string oid);
+        [LibraryImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_EcKeyCreateByOid", StringMarshalling = StringMarshalling.Utf8)]
+        internal static partial System.IntPtr EcKeyCreateByOid(string oid);
 
         [DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_EcKeyDestroy")]
         internal static extern void EcKeyDestroy(System.IntPtr r);

src/libraries/System.Security.Cryptography/tests/Rfc2898OneShotTests.cs

@@ -285,7 +285,7 @@ public static void Pbkdf2_Rfc6070(string password, string salt, int iterations,
             Assert.Equal(expected, actual);
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsOpenSslSupported))]
         [MemberData(nameof(Pbkdf2_OpenSsl_Vectors))]
         public static void Pbkdf2_OpenSsl(string hashAlgorithm, string password, string salt, int iterations, string expectedHex)
         {

src/libraries/System.Security.Cryptography/tests/X509Certificates/CertificateCreation/CrlBuilderTests.cs

@@ -297,6 +297,7 @@ public static void BuildWithEmptyHashAlgorithm(CertKind certKind)
 
         [Theory]
         [MemberData(nameof(NoHashAlgorithmCertKinds))]
+        [SkipOnPlatform(TestPlatforms.Android, "No algorithms are supported")]
         public static void BuildPqcWithHashAlgorithm(CertKind certKind)
         {
             BuildCertificateAndRun(

src/libraries/System.Security.Cryptography/tests/X509Certificates/TestFiles.cs

@@ -8,7 +8,8 @@ namespace System.Security.Cryptography.X509Certificates.Tests
 {
     internal static class TestFiles
     {
-        internal const string TestDataFolder = "TestData";
+        internal static readonly string? TestDataRoot = Environment.GetEnvironmentVariable("ASSETS_DIR") ?? AppContext.BaseDirectory;
+        internal static readonly string TestDataFolder = Path.Combine(TestDataRoot, "TestData");
 
         // Certs
         internal static readonly string MsCertificateDerFile = Path.Combine(TestDataFolder, "MS.cer");

src/libraries/tests.proj

@@ -608,6 +608,9 @@
 
   <ItemGroup Condition="'$(TargetOS)' == 'android' and '$(TestNativeAOT)' == 'true'">
     <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" />
+    <SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\System.Runtime.InteropServices.UnitTests\System.Runtime.InteropServices.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/mono/msbuild/android/build/AndroidBuild.props

@@ -23,6 +23,7 @@
     <CppCompilerAndLinker>$(ANDROID_NDK_ROOT)\toolchains\llvm\prebuilt\$(NdkToolchainPrebuiltOS)\bin\clang</CppCompilerAndLinker>
 
     <AndroidBuildAfterThisTarget Condition="'$(AndroidBuildAfterThisTarget)' == ''">Publish</AndroidBuildAfterThisTarget>
+
     <AndroidBuildDependsOn Condition="'$(UseMonoRuntime)' == 'true'">
         $(_ReadRuntimeComponentsManifestTargetName);
         _InitializeCommonProperties;
@@ -42,9 +43,9 @@
         _AfterAndroidBuild
     </AndroidBuildDependsOn>
     <AndroidBuildDependsOn Condition="'$(UseNativeAOTRuntime)' == 'true'">
-    $(AndroidBuildDependsOn);
-    CopyNativeBinary;
-    _CopyAotSymbols
+      CopyNativeBinary;
+      _CopyAotSymbols;
+      $(AndroidBuildDependsOn)
     </AndroidBuildDependsOn>
 
     <!-- When building on Helix $(_CommonTargetsDir) will be properly set, otherwise we have to set it to a in-tree location -->

src/tasks/AndroidAppBuilder/Templates/MonoRunner.java

@@ -91,6 +91,7 @@ public static void initializeRuntime(String entryPointLibName, Context context)
 
         // set environment variables
         setEnv("HOME", filesDir);
+        setEnv("ASSETS_DIR", filesDir);
         setEnv("TMPDIR", cacheDir);
         setEnv("TEST_RESULTS_DIR", testResultsDir);
 

src/tasks/AndroidAppBuilder/Templates/monodroid-nativeaot.cs

@@ -1,14 +1,17 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Runtime.InteropServices;
-using System.Runtime;
 using System;
+using System.IO;
+using System.Linq;
+using System.Runtime;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 using JObject = nint;
 using JString = nint;
 using JObjectArray = nint;
+using JSize = int;
 
 namespace MonoDroid.NativeAOT;
 
@@ -21,14 +24,18 @@ public static void SetEnv(JNIEnv* env, JObject thiz, JString j_key, JString j_va
     {
         string? key = env->GetStringUTFChars(j_key);
         string? value = env->GetStringUTFChars(j_value);
+        Console.WriteLine($"SetEnv: {key ?? "null"} = {value ?? "null"}");
         if (key != null && value != null)
+        {
             Environment.SetEnvironmentVariable(key, value);
+        }
     }
 
     // int Java_net_dot_MonoRunner_initRuntime (JNIEnv* env, jobject thiz, jstring j_files_dir, jstring j_entryPointLibName, long current_local_time);
     [UnmanagedCallersOnly(EntryPoint = "Java_net_dot_MonoRunner_initRuntime", CallConvs = [typeof(CallConvCdecl)])]
     public static int InitRuntime(JNIEnv* env, JObject thiz, JString j_files_dir, JString j_entryPointLibName, long current_local_time)
     {
+        Console.WriteLine("Initializing Android crypto native library");
         // The NativeAOT runtime does not need to be initialized, but the crypto library does.
         JavaVM* javaVM = env->GetJavaVM();
         AndroidCryptoNative_InitLibraryOnLoad(javaVM, null);
@@ -42,7 +49,26 @@ public static int InitRuntime(JNIEnv* env, JObject thiz, JString j_files_dir, JS
     [UnmanagedCallersOnly(EntryPoint = "Java_net_dot_MonoRunner_execEntryPoint", CallConvs = [typeof(CallConvCdecl)])]
     public static int ExecEntryPoint(JNIEnv* env, JObject thiz, JString j_entryPointLibName, JObjectArray j_args)
     {
-        return Program.Main();
+        int argc = env->GetArrayLength(j_args);
+        string[] args = new string[argc];
+        for (int i = 0; i < argc; i++)
+        {
+            JObject j_arg = env->GetObjectArrayElement(j_args, i);
+            args[i] = env->GetStringUTFChars((JString)j_arg);
+        }
+
+#if SINGLE_FILE_TEST_RUNNER
+        string excludesFile = Path.Combine(Environment.GetEnvironmentVariable("HOME"), "xunit-excludes.txt");
+        if (File.Exists(excludesFile))
+        {
+            args = args.Concat(File.ReadAllLines(excludesFile).SelectMany(trait => new string[]{"-notrait", trait})).ToArray();
+        }
+        // SingleFile unit tests
+        return SingleFileTestRunner.Main(args);
+#else
+        // Functional tests
+        return Program.Main(args);
+#endif
     }
 
     // void Java_net_dot_MonoRunner_freeNativeResources (JNIEnv* env, jobject thiz);
@@ -88,6 +114,22 @@ internal unsafe struct JNIEnv
         }
     }
 
+    public JSize GetArrayLength(JObjectArray array)
+    {
+        fixed (JNIEnv* thisptr = &this)
+        {
+            return NativeInterface->GetArrayLength(thisptr, array);
+        }
+    }
+
+    public JObject GetObjectArrayElement(JObjectArray array, JSize index)
+    {
+        fixed (JNIEnv* thisptr = &this)
+        {
+            return NativeInterface->GetObjectArrayElement(thisptr, array, index);
+        }
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     unsafe struct JNINativeInterface
     {
@@ -312,11 +354,10 @@ unsafe struct JNINativeInterface
         delegate* unmanaged[Cdecl]<JNIEnv*, JString, int> GetStringUTFLength;
         public delegate* unmanaged[Cdecl]<JNIEnv*, JString, out byte, byte*> GetStringUTFChars;
         public delegate* unmanaged[Cdecl]<JNIEnv*, JString, byte*, void> ReleaseStringUTFChars;
-
-        void* GetArrayLength;
+        public delegate* unmanaged[Cdecl]<JNIEnv*, JObjectArray, JSize> GetArrayLength;
 
         void* NewObjectArray;
-        void* GetObjectArrayElement;
+        public delegate* unmanaged[Cdecl]<JNIEnv*, JObjectArray, JSize, JObject> GetObjectArrayElement;
         void* SetObjectArrayElement;
 
         void* NewBooleanArray;

src/tests/FunctionalTests/Android/Device_Emulator/JIT/Program.cs

@@ -5,7 +5,7 @@
 
 public class Program
 {
-    public static int Main()
+    public static int Main(string[] args)
     {
         Console.WriteLine("Hello, Android!"); // logcat
         return 42;

src/tests/FunctionalTests/Android/Device_Emulator/NativeAOT/Android.Device_Emulator.NativeAOT.Test.csproj

@@ -4,19 +4,12 @@
     <OutputType>Library</OutputType>
     <TestRuntime>true</TestRuntime>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <TargetName>lib$(MSBuildProjectName)</TargetName>
-    <MainLibraryFileName>$(TargetName).so</MainLibraryFileName>
     <ExpectedExitCode>42</ExpectedExitCode>
     <UseNativeAOTRuntime>true</UseNativeAOTRuntime>
     <PublishAOT>true</PublishAOT>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\..\..\..\tasks\AndroidAppBuilder\Templates\monodroid-nativeaot.cs" />
-    <DirectPInvoke Include="System.Security.Cryptography.Native.Android" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>

src/tests/FunctionalTests/Android/Device_Emulator/NativeAOT/Program.cs

@@ -5,7 +5,7 @@
 
 public class Program
 {
-    public static int Main()
+    public static int Main(string[] args)
     {
         string message = "Hello, Android!";
         Console.WriteLine(message); // logcat