diff --git a/Documentation/docs-mobile/building-apps/build-properties.md b/Documentation/docs-mobile/building-apps/build-properties.md
index 31334e5ec7e..6846de0c79d 100644
--- a/Documentation/docs-mobile/building-apps/build-properties.md
+++ b/Documentation/docs-mobile/building-apps/build-properties.md
@@ -1248,8 +1248,8 @@ This property is obsolete and should not be used.
An enum-style property that selects the type map implementation.
Valid values are `llvm-ir` and `trimmable`.
-The default value is `llvm-ir` when using CoreCLR and `trimmable` when using
-NativeAOT.
+The default value is `trimmable` when `$(PublishAot)` is `true` and `llvm-ir`
+otherwise.
## AndroidUseApkSigner
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
index af654a3b23f..f03550603d9 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
@@ -44,7 +44,7 @@
class-parse
XAJavaInterop1
<_AndroidJcwCodegenTarget Condition=" '$(_AndroidJcwCodegenTarget)' == '' and '$(_AndroidRuntime)' != 'NativeAOT' ">XAJavaInterop1
- llvm-ir
+ trimmable
true
true
true
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
index 8c78fcdd32c..769a2e4992b 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
@@ -36,6 +36,27 @@ public void Build_WithTrimmableTypeMap_Succeeds ([Values] bool isRelease, [Value
AssertTrimmableTypeMapOutputs (intermediateDir);
}
+ [Test]
+ public void Build_PublishAotProject_UsesTrimmableTypeMapForCoreClrDebug ()
+ {
+ if (IgnoreUnsupportedConfiguration (AndroidRuntime.CoreCLR, release: false)) {
+ return;
+ }
+
+ var proj = new XamarinAndroidApplicationProject {
+ IsRelease = false,
+ };
+ proj.SetRuntime (AndroidRuntime.CoreCLR);
+ proj.SetProperty (KnownProperties.PublishAot, "true");
+ proj.SetProperty ("NativeCompilationDuringPublish", "false");
+
+ using var builder = CreateApkBuilder ();
+ Assert.IsTrue (builder.Build (proj, parameters: [ "_AndroidRuntime=CoreCLR" ]), "Build should have succeeded.");
+
+ var intermediateDir = builder.Output.GetIntermediaryPath ("typemap");
+ AssertTrimmableTypeMapOutputs (intermediateDir);
+ }
+
[Test]
public void Build_WithTrimmableTypeMap_IncrementalBuild ([Values] bool isRelease, [Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{