From df741213a76f97a145061aed0c1d6a783602973b Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 16 Feb 2026 12:16:43 +0100
Subject: [PATCH 1/2] Make Android API level configurable

---
 .../Microsoft.NETCore.Native.Unix.targets                 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index e935ae43de5090..480ca262ff8ddb 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -30,6 +30,10 @@ The .NET Foundation licenses this file to you under the MIT license.
   <Target Name="SetupOSSpecificProps" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
 
     <PropertyGroup>
+      <!-- API level specified here MUST be the same as the one used by .NET for Android. .NET for Android targets will
+           take care to always set this property. -->
+      <CrossCompileAndroidApiLevel Condition="'$(CrossCompileAndroidApiLevel)' == ''">24</CrossCompileAndroidApiLevel>
+
       <UseSystemZlib Condition="'$(UseSystemZlib)' == '' and !Exists('$(IlcFrameworkNativePath)libz.a')">true</UseSystemZlib>
       <!-- Use libbrotlicommon.a as the sentinel for the three brotli libs. -->
       <UseSystemBrotli Condition="'$(UseSystemBrotli)' == '' and !Exists('$(IlcFrameworkNativePath)libbrotlicommon.a')">true</UseSystemBrotli>
@@ -48,10 +52,10 @@ The .NET Foundation licenses this file to you under the MIT license.
       <CrossCompileArch Condition="$(CrossCompileRid.EndsWith('-arm'))">armv7</CrossCompileArch>
 
       <CrossCompileAbi>gnu</CrossCompileAbi>
-      <CrossCompileAbi Condition="$(CrossCompileRid.StartsWith('linux-bionic-')) or $(CrossCompileRid.StartsWith('android-'))">android21</CrossCompileAbi>
+      <CrossCompileAbi Condition="$(CrossCompileRid.StartsWith('linux-bionic-')) or $(CrossCompileRid.StartsWith('android-'))">android$(CrossCompileAndroidApiLevel)</CrossCompileAbi>
       <CrossCompileAbi Condition="$(CrossCompileRid.StartsWith('linux-musl-')) or $(CrossCompileRid.StartsWith('alpine-'))">musl</CrossCompileAbi>
       <CrossCompileAbi Condition="'$(CrossCompileRid)' == 'linux-arm'">gnueabihf</CrossCompileAbi>
-      <CrossCompileAbi Condition="'$(CrossCompileRid)' == 'linux-bionic-arm' or '$(CrossCompileRid)' == 'android-arm'">androideabi21</CrossCompileAbi>
+      <CrossCompileAbi Condition="'$(CrossCompileRid)' == 'linux-bionic-arm' or '$(CrossCompileRid)' == 'android-arm'">androideabi$(CrossCompileAndroidApiLevel)</CrossCompileAbi>
       <CrossCompileAbi Condition="'$(CrossCompileRid)' == 'linux-musl-arm'">musleabihf</CrossCompileAbi>
     </PropertyGroup>
 

From 90cc37969e2eff619ad12a0707db11a3adcc7861 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 16 Feb 2026 13:20:53 +0100
Subject: [PATCH 2/2] Set the default API level back to 21, to match the rest
 of the runtime

---
 .../BuildIntegration/Microsoft.NETCore.Native.Unix.targets      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index 480ca262ff8ddb..5fe5d22299300a 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -32,7 +32,7 @@ The .NET Foundation licenses this file to you under the MIT license.
     <PropertyGroup>
       <!-- API level specified here MUST be the same as the one used by .NET for Android. .NET for Android targets will
            take care to always set this property. -->
-      <CrossCompileAndroidApiLevel Condition="'$(CrossCompileAndroidApiLevel)' == ''">24</CrossCompileAndroidApiLevel>
+      <CrossCompileAndroidApiLevel Condition="'$(CrossCompileAndroidApiLevel)' == ''">21</CrossCompileAndroidApiLevel>
 
       <UseSystemZlib Condition="'$(UseSystemZlib)' == '' and !Exists('$(IlcFrameworkNativePath)libz.a')">true</UseSystemZlib>
       <!-- Use libbrotlicommon.a as the sentinel for the three brotli libs. -->