Skip to content

Unify Android minimum API level to 24 for all runtimes #11331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbomer wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Unify Android minimum API level to 24 for all runtimes #11331

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4440e81
Unify Android minimum API level to 24 for all runtimes
sbomer May 12, 2026
809e222
Remove nonmono CMake preset indirection
sbomer May 12, 2026
549d0c9
Potential fix for pull request finding
sbomer May 12, 2026
cd8f3e8
Fix CI failures: update SupportedOSPlatformVersion from 21/23 to 24 i…
Copilot May 13, 2026
2051780
Remove redundant SupportedOSPlatformVersion override for MAUI CI
sbomer May 13, 2026
0b1ff54
Fix CheckSignApk tests for API 24+ APK signing
sbomer May 14, 2026
9eadf27
Merge remote-tracking branch 'origin/main' into android-apilevel
sbomer May 14, 2026
cd7f135
Remove redist-nativeaot directory; use unified redist for all runtimes
sbomer May 14, 2026
85b71a9
Merge remote-tracking branch 'origin/main' into android-apilevel
sbomer May 14, 2026
e99fad4
Merge remote-tracking branch 'origin/main' into android-apilevel
sbomer May 15, 2026
bd0121a
Revert external/Java.Interop submodule change
jonathanpeppers May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
<_StandardLibraryPath Condition=" '$(TargetFrameworkVersion)' == '' ">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToStandardLibraries('.NETFramework', 'v4.7.2', ''))</_StandardLibraryPath>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' And '$(UsingMicrosoftNETSdk)' != 'true' And '$(_StandardLibraryPath)' != '' ">v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' And '$(UsingMicrosoftNETSdk)' != 'true' ">v4.7.1</TargetFrameworkVersion>
<!-- The min API level supported by Microsoft.Android.Sdk. This applies to Mono-based runtimes,
both 32-bit and 64-bit. -->
<AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">21</AndroidMinimumDotNetApiLevel>
<!-- The min API level supported by non-Mono runtimes (CoreCLR/NativeAOT) -->
<AndroidMinimumNonMonoApiLevel Condition="'$(AndroidMinimumNonMonoApiLevel)' == ''">24</AndroidMinimumNonMonoApiLevel>
<!-- The min API level supported by Microsoft.Android.Sdk, for all runtimes (MonoVM, CoreCLR, NativeAOT).
Must match $(AndroidApiLevelMin) in dotnet/runtime's Directory.Build.props. -->
<AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">24</AndroidMinimumDotNetApiLevel>
<!-- *Latest* *stable* API level binding that we support; used when building src/Xamarin.Android.Build.Tasks -->
<AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">37</AndroidLatestStableApiLevel>
<AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">37.0</AndroidLatestStablePlatformId>
Expand Down
10 changes: 0 additions & 10 deletions ...d.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateSupportedPlatforms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,11 @@ public class GenerateSupportedPlatforms : Task
/// </summary>
public string? TargetApiLevel { get; set; }

/// <summary>
/// Minimum API level supported by non-Mono runtimes (CoreCLR/NativeAOT).
/// API levels below this will be conditional on $(UseMonoRuntime) == 'true'.
/// </summary>
public string? MinimumNonMonoApiLevel { get; set; }

public override bool Execute ()
{

var minVersion = ToVersion (MinimumApiLevel);
var targetVersion = ToVersion (TargetApiLevel);
var minNonMonoVersion = ToVersion (MinimumNonMonoApiLevel);
var versions = new AndroidVersions (AndroidApiInfo.Select (ToAndroidVersion));
var targetApiLevel = targetVersion != null && targetVersion.Major > 0
? targetVersion
Expand Down Expand Up @@ -98,9 +91,6 @@ public override bool Execute ()
if (versionCode < targetVersion) {
writer.WriteAttributeString ("DefineConstantsOnly", "true");
}
if (minNonMonoVersion != null && versionCode < minNonMonoVersion) {
writer.WriteAttributeString ("Condition", " '$(UseMonoRuntime)' == 'true' ");
}
writer.WriteEndElement (); // </AndroidSdkSupportedTargetPlatformVersion>
}
writer.WriteStartElement ("SdkSupportedTargetPlatformVersion");
Expand Down
4 changes: 0 additions & 4 deletions build-tools/scripts/Ndk.projitems.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<AndroidNdkApiLevel_X86 Condition=" '$(AndroidNdkApiLevel_X86)' == '' ">@NDK_X86_API_NET@</AndroidNdkApiLevel_X86>
<AndroidNdkApiLevel_X86_64 Condition=" '$(AndroidNdkApiLevel_X86_64)' == '' ">@NDK_X86_64_API@</AndroidNdkApiLevel_X86_64>
<AndroidNdkApiLevel_X64 Condition=" '$(AndroidNdkApiLevel_X64)' == '' ">@NDK_X86_64_API_NET@</AndroidNdkApiLevel_X64>
<AndroidNdkApiLevelNonMono_Arm64 Condition=" '$(AndroidNdkApiLevelNonMono_Arm64)' == '' ">@NDK_ARM64_V8A_API_NON_MONO@</AndroidNdkApiLevelNonMono_Arm64>
<AndroidNdkApiLevelNonMono_X64 Condition=" '$(AndroidNdkApiLevelNonMono_X64)' == '' ">@NDK_X86_64_API_NON_MONO@</AndroidNdkApiLevelNonMono_X64>
</PropertyGroup>

<ItemGroup>
Expand All @@ -32,7 +30,6 @@
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':arm64-v8a:')) ">
<ApiLevel>$(AndroidNdkApiLevel_ArmV8a)</ApiLevel>
<ApiLevelNET>$(AndroidNdkApiLevel_Arm64)</ApiLevelNET>
<ApiLevelNonMono>$(AndroidNdkApiLevelNonMono_Arm64)</ApiLevelNonMono>
<AndroidRID>android-arm64</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>True</SupportCoreCLR>
Expand All @@ -55,7 +52,6 @@
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':x86_64:')) ">
<ApiLevel>$(AndroidNdkApiLevel_X86_64)</ApiLevel>
<ApiLevelNET>$(AndroidNdkApiLevel_X64)</ApiLevelNET>
<ApiLevelNonMono>$(AndroidNdkApiLevelNonMono_X64)</ApiLevelNonMono>
<AndroidRID>android-x64</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>True</SupportCoreCLR>
Expand Down
6 changes: 0 additions & 6 deletions build-tools/scripts/XABuildConfig.cs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace Xamarin.Android.Tools
public const string XamarinAndroidBranch = "@XAMARIN_ANDROID_BRANCH@";
public const string AndroidSdkBuildToolsVersion = "@SDK_BUILD_TOOLS_VERSION@";
public static readonly Version AndroidMinimumDotNetApiLevel = new Version (@ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL@, @ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL_MINOR@);
public static readonly Version AndroidMinimumNonMonoApiLevel = new Version (@ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL@, @ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL_MINOR@);
public static readonly Version AndroidLatestStableApiLevel = new Version (@ANDROID_LATEST_STABLE_API_LEVEL@, @ANDROID_LATEST_STABLE_API_LEVEL_MINOR@);
public static readonly Version AndroidLatestUnstableApiLevel = new Version (@ANDROID_LATEST_UNSTABLE_API_LEVEL@, @ANDROID_LATEST_UNSTABLE_API_LEVEL_MINOR@);
public static readonly Version AndroidDefaultTargetDotnetApiLevel = new Version (@ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL@, @ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL_MINOR@);
Expand All @@ -37,10 +36,5 @@ namespace Xamarin.Android.Tools
{ AndroidTargetArch.X86, @NDK_X86_API@ },
{ AndroidTargetArch.X86_64, @NDK_X86_64_API@ },
};

public static readonly Dictionary <AndroidTargetArch, int> ArchToApiLevelNonMono = new () {
{ AndroidTargetArch.Arm64, @NDK_ARM64_V8A_NONMONO_API@ },
{ AndroidTargetArch.X86_64, @NDK_X86_64_NONMONO_API@ },
};
}
}
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/Application/KnownProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ static class KnownProperties
public const string AndroidCmakeVersion = "AndroidCmakeVersion";
public const string AndroidCmakeVersionPath = "AndroidCmakeVersionPath";
public const string AndroidMinimumDotNetApiLevel = "AndroidMinimumDotNetApiLevel";
public const string AndroidMinimumNonMonoApiLevel = "AndroidMinimumNonMonoApiLevel";
public const string AndroidDefaultTargetDotnetApiLevel = "AndroidDefaultTargetDotnetApiLevel";
public const string AndroidLatestStableApiLevel = "AndroidLatestStableApiLevel";
public const string AndroidLatestUnstableApiLevel = "AndroidLatestUnstableApiLevel";
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Xamarin.Android.Prepare
properties.Add (KnownProperties.AndroidCmakeVersion, StripQuotes ("@AndroidCmakeVersion@"));
properties.Add (KnownProperties.AndroidCmakeVersionPath, StripQuotes (@"@AndroidCmakeVersionPath@"));
properties.Add (KnownProperties.AndroidMinimumDotNetApiLevel, StripQuotes ("@AndroidMinimumDotNetApiLevel@"));
properties.Add (KnownProperties.AndroidMinimumNonMonoApiLevel, StripQuotes ("@AndroidMinimumNonMonoApiLevel@"));
properties.Add (KnownProperties.AndroidDefaultTargetDotnetApiLevel, StripQuotes ("@AndroidDefaultTargetDotnetApiLevel@"));
properties.Add (KnownProperties.AndroidLatestStableApiLevel, StripQuotes ("@AndroidLatestStableApiLevel@"));
properties.Add (KnownProperties.AndroidLatestUnstableApiLevel, StripQuotes ("@AndroidLatestUnstableApiLevel@"));
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class BuildAndroidPlatforms

public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;
public static string NdkMinimumNonMonoAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumNonMonoApiLevel);

public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
new AndroidPlatform (apiName: "", apiLevel: 1, platformID: "1"),
Expand Down
8 changes: 0 additions & 8 deletions build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ GeneratedFile GetCmakePresetsCommon (Context context, string sourcesDir)
{ "@NDK_ARM64_V8A_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI },
{ "@NDK_X86_API_NET@", BuildAndroidPlatforms.NdkMinimumAPILegacy32 },
{ "@NDK_X86_64_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI },
{ "@NDK_ARM64_V8A_NONMONO_API_NET@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
{ "@NDK_X86_64_NONMONO_API_NET@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
{ "@XA_BUILD_CONFIGURATION@", context.Configuration },
{ "@XA_TEST_OUTPUT_DIR@", Utilities.EscapePathSeparators (props.GetRequiredValue (KnownProperties.TestOutputDirectory)) },
};
Expand Down Expand Up @@ -197,14 +195,10 @@ GeneratedFile Get_XABuildConfig_cs (Context context)
{ "@NDK_ARM64_V8A_API@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_X86_API@", BuildAndroidPlatforms.NdkMinimumAPILegacy32.ToString ().ToString () },
{ "@NDK_X86_64_API@", BuildAndroidPlatforms.NdkMinimumAPI.ToString ().ToString () },
{ "@NDK_ARM64_V8A_NONMONO_API@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
{ "@NDK_X86_64_NONMONO_API@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
{ "@XA_SUPPORTED_ABIS@", context.Properties.GetRequiredValue (KnownProperties.AndroidSupportedTargetJitAbis).Replace (':', ';') },
{ "@SDK_BUILD_TOOLS_VERSION@", context.Properties.GetRequiredValue (KnownProperties.XABuildToolsFolder) },
{ "@ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel)) },
{ "@ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL_MINOR@", GetMinor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel)) },
{ "@ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumNonMonoApiLevel)) },
{ "@ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL_MINOR@", GetMinor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumNonMonoApiLevel)) },
{ "@ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidDefaultTargetDotnetApiLevel)) },
{ "@ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL_MINOR@", GetMinor (context.Properties.GetRequiredValue (KnownProperties.AndroidDefaultTargetDotnetApiLevel)) },
{ "@ANDROID_LATEST_STABLE_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidLatestStableApiLevel)) },
Expand Down Expand Up @@ -256,8 +250,6 @@ GeneratedFile Get_Ndk_projitems (Context context)
{ "@NDK_X86_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_X86_64_API@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_X86_64_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_ARM64_V8A_API_NON_MONO@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
{ "@NDK_X86_64_API_NON_MONO@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
};

return new GeneratedPlaceholdersFile (
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/xaprepare.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<Replacement Include="@AndroidCmakeVersion@=$(AndroidCmakeVersion)" />
<Replacement Include="@AndroidCmakeVersionPath@=$(AndroidCmakeVersionPath)" />
<Replacement Include="@AndroidMinimumDotNetApiLevel@=$(AndroidMinimumDotNetApiLevel)" />
<Replacement Include="@AndroidMinimumNonMonoApiLevel@=$(AndroidMinimumNonMonoApiLevel)" />
<Replacement Include="@AndroidDefaultTargetDotnetApiLevel@=$(AndroidDefaultTargetDotnetApiLevel)" />
<Replacement Include="@AndroidLatestStableApiLevel@=$(AndroidLatestStableApiLevel)" />
<Replacement Include="@AndroidLatestUnstableApiLevel@=$(AndroidLatestUnstableApiLevel)" />
Expand Down
5 changes: 1 addition & 4 deletions src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,10 +884,7 @@ public static void LogTextStreamContents (TaskLoggingHelper log, string message,

public static int GetMinimumApiLevel (AndroidTargetArch arch, AndroidRuntime runtime)
{
int minValue = 0;

Dictionary<AndroidTargetArch, int> apiLevels = runtime == AndroidRuntime.MonoVM ? XABuildConfig.ArchToApiLevel : XABuildConfig.ArchToApiLevelNonMono;
if (!apiLevels.TryGetValue (arch, out minValue)) {
if (!XABuildConfig.ArchToApiLevel.TryGetValue (arch, out int minValue)) {
throw new InvalidOperationException ($"Unable to determine minimum API level for architecture {arch}");
}

Expand Down
3 changes: 0 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,8 @@
<!-- <_XACommonPropsReplacement Include="@NDK_PKG_REVISION@=$(AndroidNdkPkgRevision)" /> -->
<_XACommonPropsReplacement Include="@NDK_PKG_REVISION@=26.3.11579264" />
<_XACommonPropsReplacement Include="@NDK_ARM64_V8A_API@=$(AndroidNdkApiLevel_ArmV8a)" />
<_XACommonPropsReplacement Include="@NDK_ARM64_V8A_API_NON_MONO@=$(AndroidNdkApiLevelNonMono_Arm64)" />
<_XACommonPropsReplacement Include="@NDK_ARMEABI_V7_API@=$(AndroidNdkApiLevel_ArmV7a)" />
<_XACommonPropsReplacement Include="@NDK_X86_64_API@=$(AndroidNdkApiLevel_X86_64)" />
<_XACommonPropsReplacement Include="@NDK_X86_64_API_NON_MONO@=$(AndroidNdkApiLevelNonMono_X64)" />
<_XACommonPropsReplacement Include="@NDK_X86_API@=$(AndroidNdkApiLevel_X86)" />
<_XACommonPropsReplacement Include="@PACKAGE_VERSION_BUILD@=$(XAVersionCommitCount)" />
<_XACommonPropsReplacement Include="@PACKAGE_VERSION@=$(ProductVersion)" />
Expand All @@ -174,7 +172,6 @@
AndroidApiInfo="@(AndroidApiInfo)"
TargetApiLevel="$(AndroidDefaultTargetDotnetApiLevel)"
MinimumApiLevel="$(AndroidMinimumDotNetApiLevel)"
MinimumNonMonoApiLevel="$(AndroidMinimumNonMonoApiLevel)"
OutputFile="Microsoft.Android.Sdk\targets\Microsoft.Android.Sdk.SupportedPlatforms.targets"
/>
</Target>
Expand Down
38 changes: 16 additions & 22 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,21 @@
<!-- Enable nuget package conflict resolution -->
<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>

<AndroidNdkApiLevel_Arm64>@NDK_ARM64_V8A_API_NON_MONO@</AndroidNdkApiLevel_Arm64>
<AndroidNdkApiLevel_X64>@NDK_X86_64_API_NON_MONO@</AndroidNdkApiLevel_X64>
<AndroidNdkApiLevel_Arm64>@NDK_ARM64_V8A_API@</AndroidNdkApiLevel_Arm64>
<AndroidNdkApiLevel_X64>@NDK_X86_64_API@</AndroidNdkApiLevel_X64>
</PropertyGroup>
<ItemGroup>
<AndroidMinimumSupportedApiLevel Include="armeabi-v7a">
<ApiLevel>@NDK_ARMEABI_V7_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="arm64-v8a" Condition=" '$(_AndroidRuntime)' == 'Mono' ">
<ApiLevel>@NDK_ARM64_V8A_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="arm64-v8a" Condition=" '$(_AndroidRuntime)' != 'Mono' ">
<ApiLevel>@NDK_ARM64_V8A_API_NON_MONO@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="x86">
<ApiLevel>@NDK_X86_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="x86_64" Condition=" '$(_AndroidRuntime)' == 'Mono' ">
<ApiLevel>@NDK_X86_64_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="x86_64" Condition=" '$(_AndroidRuntime)' != 'Mono' ">
<ApiLevel>@NDK_X86_64_API_NON_MONO@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
</ItemGroup>
<ItemGroup>
<AndroidMinimumSupportedApiLevel Include="armeabi-v7a">
<ApiLevel>@NDK_ARMEABI_V7_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="arm64-v8a">
<ApiLevel>@NDK_ARM64_V8A_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="x86">
<ApiLevel>@NDK_X86_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
<AndroidMinimumSupportedApiLevel Include="x86_64">
<ApiLevel>@NDK_X86_64_API@</ApiLevel>
</AndroidMinimumSupportedApiLevel>
</ItemGroup>
</Project>
38 changes: 8 additions & 30 deletions src/native/CMakePresets.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,6 @@
}
},

{
"name": "nonmono-common-arm64-v8a",
"hidden": true,
"cacheVariables": {
"ANDROID_ABI": "arm64-v8a",
"ANDROID_NATIVE_API_LEVEL": "@NDK_ARM64_V8A_NONMONO_API_NET@",
"ANDROID_PLATFORM": "android-@NDK_ARM64_V8A_NONMONO_API_NET@",
"ANDROID_RID": "android-arm64"
}
},

{
"name": "common-x86",
"hidden": true,
Expand All @@ -141,17 +130,6 @@
}
},

{
"name": "nonmono-common-x86_64",
"hidden": true,
"cacheVariables": {
"ANDROID_ABI": "x86_64",
"ANDROID_NATIVE_API_LEVEL": "@NDK_X86_64_NONMONO_API_NET@",
"ANDROID_PLATFORM": "android-@NDK_X86_64_NONMONO_API_NET@",
"ANDROID_RID": "android-x64"
}
},

{
"name": "asan-common",
"hidden": true,
Expand Down Expand Up @@ -219,12 +197,12 @@

{
"name": "nativeaot-default-debug-arm64-v8a",
"inherits": ["nativeaot-default-common", "common-debug", "nonmono-common-arm64-v8a"]
"inherits": ["nativeaot-default-common", "common-debug", "common-arm64-v8a"]
},

{
"name": "coreclr-default-debug-arm64-v8a",
"inherits": ["default-common", "common-debug", "nonmono-common-arm64-v8a"]
"inherits": ["default-common", "common-debug", "common-arm64-v8a"]
},

{
Expand All @@ -234,12 +212,12 @@

{
"name": "nativeaot-default-release-arm64-v8a",
"inherits": ["nativeaot-default-common", "common-release", "nonmono-common-arm64-v8a"]
"inherits": ["nativeaot-default-common", "common-release", "common-arm64-v8a"]
},

{
"name": "coreclr-default-release-arm64-v8a",
"inherits": ["default-common", "common-release", "nonmono-common-arm64-v8a"]
"inherits": ["default-common", "common-release", "common-arm64-v8a"]
},

{
Expand Down Expand Up @@ -327,12 +305,12 @@

{
"name": "nativeaot-default-debug-x86_64",
"inherits": ["nativeaot-default-common", "common-debug", "nonmono-common-x86_64"]
"inherits": ["nativeaot-default-common", "common-debug", "common-x86_64"]
},

{
"name": "coreclr-default-debug-x86_64",
"inherits": ["default-common", "common-debug", "nonmono-common-x86_64"]
"inherits": ["default-common", "common-debug", "common-x86_64"]
},

{
Expand All @@ -342,12 +320,12 @@

{
"name": "nativeaot-default-release-x86_64",
"inherits": ["nativeaot-default-common", "common-release", "nonmono-common-x86_64"]
"inherits": ["nativeaot-default-common", "common-release", "common-x86_64"]
},

{
"name": "coreclr-default-release-x86_64",
"inherits": ["default-common", "common-release", "nonmono-common-x86_64"]
"inherits": ["default-common", "common-release", "common-x86_64"]
},

{
Expand Down
Loading