Enable android-arm CoreCLR native pack

Assume the android-arm CoreCLR runtime pack is available and keep the PR wired end-to-end: native build, pack creation, and workload manifest all include android-arm CoreCLR.

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

Author: simonrozsival

build-tools/scripts/Ndk.projitems.in

@@ -25,7 +25,7 @@
       <ApiLevelNonMono>$(AndroidNdkApiLevelNonMono_Arm)</ApiLevelNonMono>
       <AndroidRID>android-arm</AndroidRID>
       <SupportMonoVM>True</SupportMonoVM>
-      <SupportCoreCLR>False</SupportCoreCLR>
+      <SupportCoreCLR>True</SupportCoreCLR>
       <SupportNativeAOT>False</SupportNativeAOT>
     </AndroidSupportedTargetJitAbi>
 

src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json

@@ -12,6 +12,7 @@
         "Microsoft.Android.Runtime.Mono.37.android-arm64",
         "Microsoft.Android.Runtime.Mono.37.android-x86",
         "Microsoft.Android.Runtime.Mono.37.android-x64",
+        "Microsoft.Android.Runtime.CoreCLR.37.android-arm",
         "Microsoft.Android.Runtime.CoreCLR.37.android-arm64",
         "Microsoft.Android.Runtime.CoreCLR.37.android-x64",
         "Microsoft.Android.Runtime.NativeAOT.37.android-arm64",
@@ -78,6 +79,10 @@
       "kind": "framework",
       "version": "@WORKLOAD_VERSION@"
     },
+    "Microsoft.Android.Runtime.CoreCLR.37.android-arm": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
     "Microsoft.Android.Runtime.CoreCLR.37.android-arm64": {
       "kind": "framework",
       "version": "@WORKLOAD_VERSION@"

src/native/native-clr.csproj

@@ -7,11 +7,8 @@
     <OutputType>Exe</OutputType>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
-    <!-- HACK HACK: until CoreCLR exists for all the targets, work only with arm64 -->
-    <!-- armeabi-v7a is wired up elsewhere (workload manifest, Ndk.projitems, CMake presets, ArchToApiLevelNonMono) -->
-    <!-- but is excluded from the native build until the android-arm CoreCLR runtime pack ships (dotnet/runtime#127225). -->
     <AndroidSupportedTargetAotAbis>arm64:x86_64</AndroidSupportedTargetAotAbis>
-    <AndroidSupportedTargetJitAbis>arm64-v8a:x86_64</AndroidSupportedTargetJitAbis>
+    <AndroidSupportedTargetJitAbis>armeabi-v7a:arm64-v8a:x86_64</AndroidSupportedTargetJitAbis>
   </PropertyGroup>
 
   <Import Project="..\..\Configuration.props" />