Skip to content

[xaprepare] Check in Ndk.projitems, remove generator#11733

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

Merged
jonathanpeppers merged 5 commits into from
Jun 25, 2026
Merged

[xaprepare] Check in Ndk.projitems, remove generator #11733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f8e478
[xaprepare] Check in Ndk.projitems, remove generator
jonathanpeppers Jun 24, 2026
2a28bc2
Reference existing Configuration.props properties in Ndk.projitems
jonathanpeppers Jun 24, 2026
c3c8b74
Collapse dead legacy/NET API-level split in Ndk.projitems
jonathanpeppers Jun 24, 2026
dd3ade2
Trim Ndk.projitems header comment
jonathanpeppers Jun 24, 2026
1c5aa2a
Remove ApiLevelNET metadata, use ApiLevel everywhere
jonathanpeppers Jun 24, 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
121 changes: 60 additions & 61 deletions build-tools/scripts/Ndk.projitems.in → build-tools/scripts/Ndk.projitems
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidNdkVersion Condition=" '$(AndroidNdkVersion)' == '' ">@NDK_RELEASE@</AndroidNdkVersion>
<AndroidNdkPkgRevision Condition=" '$(AndroidNdkPkgRevision)' == '' ">@NDK_PKG_REVISION@</AndroidNdkPkgRevision>
<AndroidNdkApiLevel_ArmV7a Condition=" '$(AndroidNdkApiLevel_ArmV7a)' == '' ">@NDK_ARMEABI_V7_API@</AndroidNdkApiLevel_ArmV7a>
<AndroidNdkApiLevel_Arm Condition=" '$(AndroidNdkApiLevel_Arm)' == '' ">@NDK_ARMEABI_V7_API_NET@</AndroidNdkApiLevel_Arm>
<AndroidNdkApiLevel_ArmV8a Condition=" '$(AndroidNdkApiLevel_ArmV8a)' == '' ">@NDK_ARM64_V8A_API@</AndroidNdkApiLevel_ArmV8a>
<AndroidNdkApiLevel_Arm64 Condition=" '$(AndroidNdkApiLevel_Arm64)' == '' ">@NDK_ARM64_V8A_API_NET@</AndroidNdkApiLevel_Arm64>
<AndroidNdkApiLevel_X86_Legacy Condition=" '$(AndroidNdkApiLevel_X86_Legacy)' == '' ">@NDK_X86_API@</AndroidNdkApiLevel_X86_Legacy>
<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>
</PropertyGroup>

<ItemGroup>
<AndroidSupportedTargetJitAbi
Include="armeabi-v7a"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:')) ">
<ApiLevel>$(AndroidNdkApiLevel_ArmV7a)</ApiLevel>
<ApiLevelNET>$(AndroidNdkApiLevel_Arm)</ApiLevelNET>
<AndroidRID>android-arm</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>False</SupportCoreCLR>
<SupportNativeAOT>False</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>

<AndroidSupportedTargetJitAbi
Include="arm64-v8a"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':arm64-v8a:')) ">
<ApiLevel>$(AndroidNdkApiLevel_ArmV8a)</ApiLevel>
<ApiLevelNET>$(AndroidNdkApiLevel_Arm64)</ApiLevelNET>
<AndroidRID>android-arm64</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>True</SupportCoreCLR>
<SupportNativeAOT>True</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>

<AndroidSupportedTargetJitAbi
Include="x86"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':x86:')) ">
<ApiLevel>$(AndroidNdkApiLevel_X86_Legacy)</ApiLevel>
<ApiLevelNET>$(AndroidNdkApiLevel_X86)</ApiLevelNET>
<AndroidRID>android-x86</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>False</SupportCoreCLR>
<SupportNativeAOT>False</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>

<AndroidSupportedTargetJitAbi
Include="x86_64"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':x86_64:')) ">
<ApiLevel>$(AndroidNdkApiLevel_X86_64)</ApiLevel>
<ApiLevelNET>$(AndroidNdkApiLevel_X64)</ApiLevelNET>
<AndroidRID>android-x64</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>True</SupportCoreCLR>
<SupportNativeAOT>True</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>
</ItemGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<!--
Checked-in. NDK version/revision and API level come from Configuration.props
($(_XAAndroidNdkRelease), $(_XAAndroidNdkPkgRevision),
$(AndroidMinimumDotNetApiLevel)), so there is nothing to keep in sync here.
-->
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidNdkVersion Condition=" '$(AndroidNdkVersion)' == '' ">$(_XAAndroidNdkRelease)</AndroidNdkVersion>
<AndroidNdkPkgRevision Condition=" '$(AndroidNdkPkgRevision)' == '' ">$(_XAAndroidNdkPkgRevision)</AndroidNdkPkgRevision>
<AndroidNdkApiLevel_ArmV7a Condition=" '$(AndroidNdkApiLevel_ArmV7a)' == '' ">$(AndroidMinimumDotNetApiLevel)</AndroidNdkApiLevel_ArmV7a>
<AndroidNdkApiLevel_ArmV8a Condition=" '$(AndroidNdkApiLevel_ArmV8a)' == '' ">$(AndroidMinimumDotNetApiLevel)</AndroidNdkApiLevel_ArmV8a>
<AndroidNdkApiLevel_Arm64 Condition=" '$(AndroidNdkApiLevel_Arm64)' == '' ">$(AndroidMinimumDotNetApiLevel)</AndroidNdkApiLevel_Arm64>
<AndroidNdkApiLevel_X86 Condition=" '$(AndroidNdkApiLevel_X86)' == '' ">$(AndroidMinimumDotNetApiLevel)</AndroidNdkApiLevel_X86>
<AndroidNdkApiLevel_X86_64 Condition=" '$(AndroidNdkApiLevel_X86_64)' == '' ">$(AndroidMinimumDotNetApiLevel)</AndroidNdkApiLevel_X86_64>
<AndroidNdkApiLevel_X64 Condition=" '$(AndroidNdkApiLevel_X64)' == '' ">$(AndroidMinimumDotNetApiLevel)</AndroidNdkApiLevel_X64>
</PropertyGroup>

<ItemGroup>
<AndroidSupportedTargetJitAbi
Include="armeabi-v7a"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:')) ">
<ApiLevel>$(AndroidNdkApiLevel_ArmV7a)</ApiLevel>
<AndroidRID>android-arm</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>False</SupportCoreCLR>
<SupportNativeAOT>False</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>

<AndroidSupportedTargetJitAbi
Include="arm64-v8a"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':arm64-v8a:')) ">
<ApiLevel>$(AndroidNdkApiLevel_ArmV8a)</ApiLevel>
<AndroidRID>android-arm64</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>True</SupportCoreCLR>
<SupportNativeAOT>True</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>

<AndroidSupportedTargetJitAbi
Include="x86"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':x86:')) ">
<ApiLevel>$(AndroidNdkApiLevel_X86)</ApiLevel>
<AndroidRID>android-x86</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>False</SupportCoreCLR>
<SupportNativeAOT>False</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>

<AndroidSupportedTargetJitAbi
Include="x86_64"
Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':x86_64:')) ">
<ApiLevel>$(AndroidNdkApiLevel_X86_64)</ApiLevel>
<AndroidRID>android-x64</AndroidRID>
<SupportMonoVM>True</SupportMonoVM>
<SupportCoreCLR>True</SupportCoreCLR>
<SupportNativeAOT>True</SupportNativeAOT>
</AndroidSupportedTargetJitAbi>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build-tools/scripts/Ndk.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjitemsFile>$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Ndk.projitems</ProjitemsFile>
<ProjitemsFile>$(MSBuildThisFileDirectory)Ndk.projitems</ProjitemsFile>
</PropertyGroup>
<Import
Project="$(ProjitemsFile)"
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ public static partial class Defaults
/// ABIs that support the NativeAOT runtime. Used to determine which ABIs
/// need the higher API-level CRT/sysroot files in the NativeAOT runtime pack.
/// When adding a new ABI here, also update <c>SupportNativeAOT</c> in
/// <c>build-tools/scripts/Ndk.projitems.in</c>.
/// <c>build-tools/scripts/Ndk.projitems</c>.
/// </summary>
public static readonly HashSet<string> NativeAotSupportedAbis = new (StringComparer.Ordinal) {
"arm64-v8a",
Expand Down
25 changes: 0 additions & 25 deletions build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,6 @@ protected override async Task<bool> Execute (Context context)
Get_Configuration_Generated_Props (context),
Get_Cmake_XA_Build_Configuration (context),
Get_Cmake_Presets (context),
Get_Ndk_projitems (context),
Get_XABuildConfig_cs (context),
};
}
Expand DownExpand Up@@ -230,30 +229,6 @@ static string GetMinor (string value)
}
}

GeneratedFile Get_Ndk_projitems (Context context)
{
const string OutputFileName = "Ndk.projitems";

var replacements = new Dictionary<string, string> (StringComparer.Ordinal) {
{ "@NDK_RELEASE@", BuildAndroidPlatforms.AndroidNdkVersion },
{ "@NDK_PKG_REVISION@", BuildAndroidPlatforms.AndroidNdkPkgRevision },
{ "@NDK_ARMEABI_V7_API@", BuildAndroidPlatforms.NdkMinimumAPILegacy32.ToString () },
{ "@NDK_ARMEABI_V7_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_ARM64_V8A_API@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_ARM64_V8A_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_X86_API@", BuildAndroidPlatforms.NdkMinimumAPILegacy32.ToString () },
{ "@NDK_X86_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_X86_64_API@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
{ "@NDK_X86_64_API_NET@", BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
};

return new GeneratedPlaceholdersFile (
replacements,
Path.Combine (Configurables.Paths.BuildToolsScriptsDir, $"{OutputFileName}.in"),
Path.Combine (Configurables.Paths.BuildBinDir, OutputFileName)
);
}

public GeneratedFile Get_SourceLink_Json (Context context)
{
if (gitSubmodules == null || xaCommit == null) {
Expand Down
2 changes: 1 addition & 1 deletion src/native/common/libunwind/libunwind-xamarin.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
<_ConfigureLibUnwindCommands
Include="@(AndroidSupportedTargetJitAbi)">
<Command>$(CmakePath)</Command>
<Arguments>$(_CmakeAndroidFlags) -DANDROID_NATIVE_API_LEVEL=%(AndroidSupportedTargetJitAbi.ApiLevelNET) -DANDROID_PLATFORM=android-%(AndroidSupportedTargetJitAbi.ApiLevelNET) -DANDROID_ABI=%(AndroidSupportedTargetJitAbi.Identity) -DANDROID_RID=%(AndroidSupportedTargetJitAbi.AndroidRID) -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$(OutputPath)%(AndroidSupportedTargetJitAbi.AndroidRID)" -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$(OutputPath)%(AndroidSupportedTargetJitAbi.AndroidRID)" -DCMAKE_BUILD_TYPE=$(Configuration) -DLIBUNWIND_SOURCE_DIR="$(LibUnwindSourceFullPath)" -DLIBUNWIND_LIBRARY_NAME="$(_LibUnwindBaseLibName)" -DLIBUNWIND_OUTPUT_DIR="@(AndroidSupportedTargetJitAbi->'$(OutputPath)/%(AndroidRID)')" -DLIBUNWIND_HEADERS_OUTPUT_DIR="$(_LibUnwindHeadersOutputDir)" $(MSBuildThisFileDirectory)</Arguments>
<Arguments>$(_CmakeAndroidFlags) -DANDROID_NATIVE_API_LEVEL=%(AndroidSupportedTargetJitAbi.ApiLevel) -DANDROID_PLATFORM=android-%(AndroidSupportedTargetJitAbi.ApiLevel) -DANDROID_ABI=%(AndroidSupportedTargetJitAbi.Identity) -DANDROID_RID=%(AndroidSupportedTargetJitAbi.AndroidRID) -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$(OutputPath)%(AndroidSupportedTargetJitAbi.AndroidRID)" -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$(OutputPath)%(AndroidSupportedTargetJitAbi.AndroidRID)" -DCMAKE_BUILD_TYPE=$(Configuration) -DLIBUNWIND_SOURCE_DIR="$(LibUnwindSourceFullPath)" -DLIBUNWIND_LIBRARY_NAME="$(_LibUnwindBaseLibName)" -DLIBUNWIND_OUTPUT_DIR="@(AndroidSupportedTargetJitAbi->'$(OutputPath)/%(AndroidRID)')" -DLIBUNWIND_HEADERS_OUTPUT_DIR="$(_LibUnwindHeadersOutputDir)" $(MSBuildThisFileDirectory)</Arguments>
<WorkingDirectory>$(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.Identity)-$(Configuration)</WorkingDirectory>
</_ConfigureLibUnwindCommands>
</ItemGroup>
Expand Down
Loading