[android] Enable android-arm CoreCLR with softfp ABI handling

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

[simonrozsival]

Note

This PR description was updated with GitHub Copilot.

Fixes#127500.

Description

This re-enables the android-arm CoreCLR runtime pack and CI coverage, and fixes the Android ARM softfp ABI handling needed for native code, ReadyToRun/Crossgen2-generated code, and NativeAOT target handling.

Android arm maps to the armeabi-v7a ABI. That ABI can use VFP instructions internally, but floating-point arguments and return values cross function-call boundaries through core registers/stack rather than VFP argument registers. In .NET target terminology, the matching AOT/JIT ABI is armel.

The original enablement exposed runtime crashes caused by parts of the build and code-generation pipeline disagreeing on that ABI. Native/CoreCLR builds needed ARM_SOFTFP, and AOT compiler target handling needed to treat Android ARM as Linux/Bionic with the softfp ABI.

Changes

• Re-enable android-arm as a supported CoreCLR runtime pack target.

• Re-enable Android ARM CoreCLR legs in the runtime and extra-platform CI pipelines.

• Add Android ARM Helix queue selection.

• Set ARM_SOFTFP for Android ARM native/CoreCLR builds.

• Treat Android ARM compile definitions as softfp when setting CoreCLR target definitions.

• Keep Android as an accepted AOT command-line target OS without extending the internal TargetOS enum.

• Centralize Android command-line normalization in both Crossgen2 and NativeAOT ILCompiler:

  --targetos:android -> TargetOS.Linux
  --targetos:android --targetarch:arm -> NativeAotArmel / softfp ABI
  --targetos:android --targetarch:arm64 -> NativeAot
  

• Update Crossgen2 call sites to pass the real Android target identity instead of duplicating Android-to-Linux remaps in MSBuild.

• Update NativeAOT build integration to pass --targetos:android through to ILCompiler while preserving the existing bionic ARM armel target-architecture handling.

Validation

Built Android ARM locally:

./build.sh clr+libs+host+packs -os android -arch arm -c Release

Result:

Build succeeded.
0 Warning(s)
0 Error(s)

Validated on a physical Android device with armeabi-v7a support.

The following Android ARM test runs completed with zero failures with both TestReadyToRun=true and TestReadyToRun=false:

• System.Runtime.Tests
• System.Runtime.Numerics.Tests
• System.Numerics.Vectors.Tests
• System.Numerics.Tensors.Tests
• Microsoft.Bcl.Numerics.Tests

Additional validation for the centralized AOT target handling:

./build.sh clr+libs+host /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/crossgen2/crossgen2.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj /p:RestoreDisableParallel=true
./dotnet.sh build src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj /p:RestoreDisableParallel=true
./build.sh tasks /p:RestoreDisableParallel=true
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj /t:Test --no-restore
./dotnet.sh build src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj /t:Test --no-restore

Also smoke-tested that both Crossgen2 and ILCompiler accept Android target arguments, including --targetos:android --targetarch:arm and --targetos:android --targetarch:arm64, and that the existing --targetos:linux --targetarch:armel normalization still works.

[Copilot]

Pull request overview

This PR re-enables android-arm (armeabi-v7a) CoreCLR runtime pack production and CI by ensuring Crossgen2/JIT agree on Android ARM32’s required softfp call-boundary ABI (modeled as armel in the type system), while keeping the rest of Crossgen2’s behavior on existing Linux/Bionic paths.

Changes:

• Teach Crossgen2 to accept --targetos:android, and for android-arm select the softfp (armel) ABI then normalize the OS to Linux for the remaining pipeline.
• Update Android build/plumbing to pass the real $(TargetOS) to Crossgen2 (instead of remapping Android to Linux at the caller).
• Re-enable android_arm CoreCLR runtime pack support and restore CI/Helix coverage, including Android ARM queue mapping.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/tasks/Crossgen2Tasks/ResolveReadyToRunCompilers.cs	Allows the Crossgen2 task logic to resolve android as a target OS from RID graph matching.
src/mono/msbuild/android/build/AndroidBuild.InTree.targets	Passes $(TargetOS) through to Crossgen2 for Android in-tree builds.
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj	Stops remapping Android to Linux for Crossgen2 invocation; passes $(TargetOS) directly.
src/coreclr/tools/Common/TypeSystem/Common/TargetDetails.cs	Adds TargetOS.Android to represent Android explicitly in target selection.
src/coreclr/tools/Common/CommandLineHelpers.cs	Enables parsing --targetos:android into TargetOS.Android.
src/coreclr/tools/aot/crossgen2/Program.cs	Implements Android normalization: select softfp (NativeAotArmel) for Android ARM32, then treat as Linux for the remaining Crossgen2 logic.
src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs	Updates extended help to include android as a valid --targetos value.
src/coreclr/crossgen-corelib.proj	Always passes --targetos:$(TargetOS) (removes Android→Linux remap at the caller).
src/coreclr/clrdefinitions.cmake	Defines ARM_SOFTFP for Android ARM32 targets so native/JIT compilation agrees on softfp.
eng/testing/tests.readytorun.targets	Passes $(TargetOS) to Crossgen2 for test R2R flows (removes Android→Linux remap).
eng/Subsets.props	Re-enables CoreCLR support gating for Android ARM32 (still excludes Android x86).
eng/pipelines/runtime.yml	Re-adds android_arm CoreCLR functional test coverage in the main pipeline matrix.
eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml	Adds android_arm CoreCLR coverage in the extra-platforms Android pipeline.
eng/pipelines/coreclr/templates/helix-queues-setup.yml	Adds Helix queue mapping for the android_arm platform.
eng/native/configureplatform.cmake	Sets ARM_SOFTFP for Android ARM32 at CMake configuration time.

[simonrozsival]

/azp run runtime-extra-platforms

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[simonrozsival]

Note

This CI analysis comment was drafted with Copilot.

I compared the current CI on #127578 with the original Android ARM runtime-pack enablement PR, #127225, and the first softfp follow-up, #127527. My read is that the original Android ARM ABI mismatch is not manifesting in the current run: the exact smoke job that exposed it before now passes.

PR / build	Android ARM signal	Verdict
#127225, build 1398504	android-arm Release AllSubsets_CoreCLR_Smoke failed across smoke work items	Original ABI mismatch manifested; tracked by #127500 as SIGSEGV during runner init at System.DateTime.get_Now()
#127527, build 1400569	Same android-arm CoreCLR_Smoke job still failed	Partial fix only; follow-up local investigation found remaining R2R ABI corruption symptoms like Hashtable(... Single loadFactor), Decimal.op_Explicit / VarDecFromR8, and NFloat
#127578, build 1402505	android-arm Release AllSubsets_CoreCLR_Smoke passed	Strong evidence the old smoke-level ABI issue is fixed
#127578, build 1402544	Full Android legs still have failures	Different failure set; not the old ARM ABI signature

Current Android pass/fail breakdown:

Job	Result	Failed work items / notes
android-arm CoreCLR_Smoke	Pass	No failed work items
android-arm64 CoreCLR_Smoke	Pass	No failed work items
android-x64 CoreCLR_Smoke	Pass	No failed work items
android-arm64 Mono_Smoke	Pass	No failed work items
android-x64 MonoAOTOffsets	Pass	No failed work items
android-x64 AllSubsets_Mono	Pass	No failed work items
android-x64 Mono RuntimeTests_Interp	Pass	No failed work items
android-x64 NativeAOT_RuntimeTests	Pass	No failed work items
android-arm AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.NameResolution.Pal.Tests, System.Net.Sockets.Tests
android-arm64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.NameResolution.Functional.Tests, System.Net.Sockets.Tests
android-x64 AllSubsets_CoreCLR	Fail	System.IO.Compression.Tests, System.Net.Sockets.Tests
android-x64 NativeAOT	Fail	System.IO.Compression.Tests, System.Linq.Expressions.Tests, System.Net.Sockets.Tests

Failure classification:

• System.IO.Compression.Tests: the failing tests are the three RoundTrip_AllWindowLogs cases, all returning DestinationTooSmall. I reproduced these locally on android-arm CoreCLR both with and without R2R, so this is not R2R-specific. This matches the broader mobile compression issue tracked by #127563.
• System.Net.NameResolution.*: matches the existing Android/mobile networking/configuration failure class tracked by #126456.
• System.Net.Sockets.Tests: matches the existing Android socket/IPv6 failure class tracked by #127565.
• android-x64 NativeAOT / System.Linq.Expressions.Tests: still looks unclassified from this pass and should be investigated or tracked separately.

I also searched the current downloaded Android AzDO/Helix logs for the old ABI signatures: System.DateTime.get_Now, SIGSEGV / SIGABRT, managed Hashtable..ctor(... Single loadFactor), loadFactor, Decimal.op_Explicit, VarDecFromR8, NFloat, and arithmetic-overflow R2R corruption. None of those signatures appear in the current Android logs; the only Hashtable hit is a native source filename (jithashtable.cpp) in build output.

So I would not treat the current red CI as evidence that the original Android ARM ABI mismatch is still present. The important ABI validation signal passed; the remaining Android failures are later library/test-suite issues, mostly already represented by known mobile issues, with the NativeAOT System.Linq.Expressions failure as the remaining item to classify.

[Copilot]

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

[Copilot]

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.