diff --git a/build-tools/scripts/Ndk.projitems.in b/build-tools/scripts/Ndk.projitems
similarity index 68%
rename from build-tools/scripts/Ndk.projitems.in
rename to build-tools/scripts/Ndk.projitems
index e767b8c460f..c473fa5dd01 100644
--- a/build-tools/scripts/Ndk.projitems.in
+++ b/build-tools/scripts/Ndk.projitems
@@ -1,61 +1,60 @@
-
-
-
- @NDK_RELEASE@
- @NDK_PKG_REVISION@
- @NDK_ARMEABI_V7_API@
- @NDK_ARMEABI_V7_API_NET@
- @NDK_ARM64_V8A_API@
- @NDK_ARM64_V8A_API_NET@
- @NDK_X86_API@
- @NDK_X86_API_NET@
- @NDK_X86_64_API@
- @NDK_X86_64_API_NET@
-
-
-
-
- $(AndroidNdkApiLevel_ArmV7a)
- $(AndroidNdkApiLevel_Arm)
- android-arm
- True
- False
- False
-
-
-
- $(AndroidNdkApiLevel_ArmV8a)
- $(AndroidNdkApiLevel_Arm64)
- android-arm64
- True
- True
- True
-
-
-
- $(AndroidNdkApiLevel_X86_Legacy)
- $(AndroidNdkApiLevel_X86)
- android-x86
- True
- False
- False
-
-
-
- $(AndroidNdkApiLevel_X86_64)
- $(AndroidNdkApiLevel_X64)
- android-x64
- True
- True
- True
-
-
-
+
+
+
+
+ $(_XAAndroidNdkRelease)
+ $(_XAAndroidNdkPkgRevision)
+ $(AndroidMinimumDotNetApiLevel)
+ $(AndroidMinimumDotNetApiLevel)
+ $(AndroidMinimumDotNetApiLevel)
+ $(AndroidMinimumDotNetApiLevel)
+ $(AndroidMinimumDotNetApiLevel)
+ $(AndroidMinimumDotNetApiLevel)
+
+
+
+
+ $(AndroidNdkApiLevel_ArmV7a)
+ android-arm
+ True
+ False
+ False
+
+
+
+ $(AndroidNdkApiLevel_ArmV8a)
+ android-arm64
+ True
+ True
+ True
+
+
+
+ $(AndroidNdkApiLevel_X86)
+ android-x86
+ True
+ False
+ False
+
+
+
+ $(AndroidNdkApiLevel_X86_64)
+ android-x64
+ True
+ True
+ True
+
+
+
diff --git a/build-tools/scripts/Ndk.targets b/build-tools/scripts/Ndk.targets
index 9972e4b3a8d..4a4b41e60d2 100644
--- a/build-tools/scripts/Ndk.targets
+++ b/build-tools/scripts/Ndk.targets
@@ -1,7 +1,7 @@
- $(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Ndk.projitems
+ $(MSBuildThisFileDirectory)Ndk.projitems
SupportNativeAOT in
- /// build-tools/scripts/Ndk.projitems.in.
+ /// build-tools/scripts/Ndk.projitems.
///
public static readonly HashSet NativeAotSupportedAbis = new (StringComparer.Ordinal) {
"arm64-v8a",
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
index 789268275d1..6e0219c875d 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
@@ -66,7 +66,6 @@ protected override async Task 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),
};
}
@@ -230,30 +229,6 @@ static string GetMinor (string value)
}
}
- GeneratedFile Get_Ndk_projitems (Context context)
- {
- const string OutputFileName = "Ndk.projitems";
-
- var replacements = new Dictionary (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) {
diff --git a/src/native/common/libunwind/libunwind-xamarin.targets b/src/native/common/libunwind/libunwind-xamarin.targets
index 983f32cc460..4890470137d 100644
--- a/src/native/common/libunwind/libunwind-xamarin.targets
+++ b/src/native/common/libunwind/libunwind-xamarin.targets
@@ -17,7 +17,7 @@
<_ConfigureLibUnwindCommands
Include="@(AndroidSupportedTargetJitAbi)">
$(CmakePath)
- $(_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)
+ $(_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)
$(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.Identity)-$(Configuration)