diff --git a/build-tools/bundle/bundle-path.targets b/build-tools/bundle/bundle-path.targets
index da7bd24e0fa..4c225c8a28e 100644
--- a/build-tools/bundle/bundle-path.targets
+++ b/build-tools/bundle/bundle-path.targets
@@ -24,7 +24,7 @@
- bundle-v14-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip
+ bundle-v16-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip
diff --git a/build-tools/mono-runtimes/mono-runtimes.projitems b/build-tools/mono-runtimes/mono-runtimes.projitems
index f74e013c95b..13ebc6e384d 100644
--- a/build-tools/mono-runtimes/mono-runtimes.projitems
+++ b/build-tools/mono-runtimes/mono-runtimes.projitems
@@ -393,23 +393,23 @@
<_MonoCrossRuntime Include="cross-arm64-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-arm64:'))">
arm64-v8a
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ar
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-as
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-gcc
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-ar
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-as
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-gcc
$(_CrossCFlagsWin) -static -static-libgcc
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-g++
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-cpp
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-g++
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-cpp
$(_CrossCXXFlagsWin) -static -static-libgcc
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ld
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-ld
-static -static-libgcc -static-libstdc++
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ranlib
- $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-strip
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-ranlib
+ $(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-strip
-S
aarch64-v8a-linux-android
- --target=aarch64-v8a-linux-android --host="$(_CrossConfigureBuildHostWin32)" --cache-file=$(_CrossConfigureCachePrefix)arm64-win.config.cache --with-cross-offsets=aarch64-v8a-linux-android.h $(_CrossConfigureFlags) --with-llvm=$(_LlvmPrefixWin32)
+ --target=aarch64-v8a-linux-android --host="$(_CrossConfigureBuildHostWin64)" --cache-file=$(_CrossConfigureCachePrefix)arm64-win.config.cache --with-cross-offsets=aarch64-v8a-linux-android.h $(_CrossConfigureFlags) --with-llvm=$(_LlvmPrefixWin64)
.exe
PATH="$(AndroidMxeFullPath)\bin:$(PATH)"
- $(_LlvmConfigureEnvironmentWin32)
+ $(_LlvmConfigureEnvironmentWin64)
lib/mandroid/
cross-arm64
diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets
index 70db99465aa..311c2d9c2fa 100644
--- a/build-tools/mono-runtimes/mono-runtimes.targets
+++ b/build-tools/mono-runtimes/mono-runtimes.targets
@@ -331,7 +331,7 @@
DestinationFiles="@(_InstallUnstrippedRuntimeOutput)"
/>
@@ -546,6 +546,14 @@
SourceFiles="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
DestinationFiles="$(OutputPath)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
/>
+
+
@@ -571,6 +579,9 @@
+