From dad95dc6c5f3ad09c962f29dc411fe031d6a28a3 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:20:19 +0200
Subject: [PATCH 01/58] Default Android type maps to trimmable

Reject the legacy llvm-ir selection with a localized error and cover application and library validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/docs-mobile/TOC.yml             |  2 +
 .../building-apps/build-properties.md         |  6 +--
 Documentation/docs-mobile/messages/index.md   |  1 +
 Documentation/docs-mobile/messages/xa4265.md  | 25 +++++++++++
 ...soft.Android.Sdk.DefaultProperties.targets |  2 +-
 .../Properties/Resources.resx                 |  8 +++-
 .../InvalidConfigTests.cs                     | 43 +++++++++++++++++++
 .../Xamarin.Android.Common.targets            |  5 ++-
 8 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 Documentation/docs-mobile/messages/xa4265.md

diff --git a/Documentation/docs-mobile/TOC.yml b/Documentation/docs-mobile/TOC.yml
index 07954b6a74b..63bbe4ae6ef 100644
--- a/Documentation/docs-mobile/TOC.yml
+++ b/Documentation/docs-mobile/TOC.yml
@@ -348,6 +348,8 @@
         href: messages/xa4263.md
       - name: XA4264
         href: messages/xa4264.md
+      - name: XA4265
+        href: messages/xa4265.md
       - name: XA4301
         href: messages/xa4301.md
       - name: XA4302
diff --git a/Documentation/docs-mobile/building-apps/build-properties.md b/Documentation/docs-mobile/building-apps/build-properties.md
index 1564a283e8f..5c934d03a93 100644
--- a/Documentation/docs-mobile/building-apps/build-properties.md
+++ b/Documentation/docs-mobile/building-apps/build-properties.md
@@ -1316,10 +1316,10 @@ This property is obsolete and should not be used.
 ## AndroidTypeMapImplementation
 
 An enum-style property that selects the type map implementation.
-Valid values are `llvm-ir` and `trimmable`.
+The only supported value is `trimmable`. Setting this property to `llvm-ir`
+causes error [XA4265](../messages/xa4265.md).
 
-The default value is `trimmable` when `$(PublishAot)` is `true` and `llvm-ir`
-otherwise.
+The default value is `trimmable` for all Android projects.
 
 ## AndroidUseApkSigner
 
diff --git a/Documentation/docs-mobile/messages/index.md b/Documentation/docs-mobile/messages/index.md
index 34c8a0fa290..f3b0bd1c0ad 100644
--- a/Documentation/docs-mobile/messages/index.md
+++ b/Documentation/docs-mobile/messages/index.md
@@ -237,6 +237,7 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla
 + [XA4262](xa4262.md): Type '{type}' has an invalid [Export] SuperArgumentsString value '{value}'.
 + [XA4263](xa4263.md): The exported member '{member}' has unsupported signature type '{type}'. Use a Java peer type, a supported managed-to-Java mapping, or [ExportParameter].
 + [XA4264](xa4264.md): Java callable wrapper XML file '{path}' was not found.
++ [XA4265](xa4265.md): The 'llvm-ir' type map implementation is no longer supported. Remove the AndroidTypeMapImplementation property or set it to 'trimmable'.
 + XA4300: Native library '{library}' will not be bundled because it has an unsupported ABI.
 + [XA4301](xa4301.md): Apk already contains the item `xxx`.
 + [XA4302](xa4302.md): Unhandled exception merging \`AndroidManifest.xml\`: {ex}
diff --git a/Documentation/docs-mobile/messages/xa4265.md b/Documentation/docs-mobile/messages/xa4265.md
new file mode 100644
index 00000000000..1cdcbb9030c
--- /dev/null
+++ b/Documentation/docs-mobile/messages/xa4265.md
@@ -0,0 +1,25 @@
+---
+title: .NET for Android error XA4265
+description: XA4265 error code
+ms.date: 09/24/2026
+f1_keywords:
+  - "XA4265"
+---
+
+# .NET for Android error XA4265
+
+## Example message
+
+```text
+error XA4265: The 'llvm-ir' type map implementation is no longer supported. Remove the AndroidTypeMapImplementation property or set it to 'trimmable'.
+```
+
+## Issue
+
+The project sets `AndroidTypeMapImplementation` to `llvm-ir`, which is no longer
+supported.
+
+## Solution
+
+Remove the `AndroidTypeMapImplementation` property to use the default
+`trimmable` type map, or set it to `trimmable` explicitly.
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 bd2eac6c030..5f7f999bcec 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
@@ -45,7 +45,7 @@
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget Condition=" '$(AndroidCodegenTarget)' == '' ">XAJavaInterop1</AndroidCodegenTarget>
     <_AndroidJcwCodegenTarget Condition=" '$(_AndroidJcwCodegenTarget)' == '' ">XAJavaInterop1</_AndroidJcwCodegenTarget>
-    <AndroidTypeMapImplementation Condition=" '$(AndroidTypeMapImplementation)' == '' and '$(PublishAot)' == 'true' ">trimmable</AndroidTypeMapImplementation>
+    <AndroidTypeMapImplementation Condition=" '$(AndroidTypeMapImplementation)' == '' ">trimmable</AndroidTypeMapImplementation>
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods Condition=" '$(AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods)' == '' ">true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
     <AndroidBoundInterfacesContainTypes Condition=" '$(AndroidBoundInterfacesContainTypes)' == '' ">true</AndroidBoundInterfacesContainTypes>
     <AndroidBoundInterfacesContainConstants Condition=" '$(AndroidBoundInterfacesContainConstants)' == '' ">true</AndroidBoundInterfacesContainConstants>
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
index 261facd06c3..960d5c60c97 100644
--- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
+++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
@@ -1198,8 +1198,8 @@ To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MS
 {0} - Java type name from AndroidManifest.xml</comment>
   </data>
   <data name="XA4251" xml:space="preserve">
-    <value>Type '{0}' uses [JniAddNativeMethodRegistrationAttribute], which is not supported by the trimmable type map. To work around this, do not target the trimmable type map (for example, by switching to the 'llvm-ir' type map implementation), and please report this scenario at https://github.com/dotnet/android/issues so the team can evaluate whether to support it.</value>
-    <comment>The following are literal names and should not be translated: JniAddNativeMethodRegistrationAttribute, llvm-ir.
+    <value>Type '{0}' uses [JniAddNativeMethodRegistrationAttribute], which is not supported by the trimmable type map. Please report this scenario at https://github.com/dotnet/android/issues so the team can evaluate whether to support it.</value>
+    <comment>The following is a literal name and should not be translated: JniAddNativeMethodRegistrationAttribute.
 {0} - Fully-qualified managed type name</comment>
   </data>
   <data name="XA4252" xml:space="preserve">
@@ -1278,6 +1278,10 @@ To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MS
     <comment>The following are literal names and should not be translated: Java, XML.
 {0} - Full path to the Java callable wrapper XML file</comment>
   </data>
+  <data name="XA4265" xml:space="preserve">
+    <value>The 'llvm-ir' type map implementation is no longer supported. Remove the AndroidTypeMapImplementation property or set it to 'trimmable'.</value>
+    <comment>The following are literal names and should not be translated: llvm-ir, AndroidTypeMapImplementation, trimmable.</comment>
+  </data>
   <data name="XA0142" xml:space="preserve">
     <value>Command '{0}' failed.\n{1}</value>
     <comment>'{0}' is a failed command name (potentially with path) followed by all the arguments passed to it. {1} is the combined output on the standard error and standard output streams.</comment>
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
index b6f614fa73f..9cf62f023ec 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
@@ -64,6 +64,49 @@ public void UnsupportedJcwCodegenTargetIsRejected (
 			}
 		}
 
+		[TestCase (true, false)]
+		[TestCase (true, true)]
+		[TestCase (false, false)]
+		[TestCase (false, true)]
+		public void TypeMapDefaultsToTrimmable (bool isApplication, bool isRelease)
+		{
+			XamarinProject project = isApplication
+				? new XamarinAndroidApplicationProject { IsRelease = isRelease }
+				: new XamarinAndroidLibraryProject { IsRelease = isRelease };
+			project.Imports.Add (new Import ("assert-typemap.targets") {
+				TextContent = () => """
+					<Project>
+					  <Target Name="_AssertTypeMapDefault" DependsOnTargets="_CheckForInvalidConfigurationAndPlatform">
+					    <Error Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' "
+					        Text="Expected the trimmable type map by default." />
+					  </Target>
+					</Project>
+					""",
+			});
+
+			using var builder = isApplication ? CreateApkBuilder () : CreateDllBuilder ();
+			builder.Target = "_AssertTypeMapDefault";
+			Assert.IsTrue (builder.Build (project), "The default type map should be trimmable for applications and libraries.");
+		}
+
+		[TestCase (true, "llvm-ir", "XA4265")]
+		[TestCase (false, "llvm-ir", "XA4265")]
+		[TestCase (true, "unsupported", "Invalid value for AndroidTypeMapImplementation")]
+		[TestCase (false, "unsupported", "Invalid value for AndroidTypeMapImplementation")]
+		public void UnsupportedTypeMapIsRejected (bool isApplication, string typeMapImplementation, string expectedError)
+		{
+			XamarinProject project = isApplication
+				? new XamarinAndroidApplicationProject ()
+				: new XamarinAndroidLibraryProject ();
+			project.SetProperty ("AndroidTypeMapImplementation", typeMapImplementation);
+
+			using var builder = isApplication ? CreateApkBuilder () : CreateDllBuilder ();
+			builder.Target = "_CheckForInvalidConfigurationAndPlatform";
+			builder.ThrowOnBuildFailure = false;
+			Assert.IsFalse (builder.Build (project), "An unsupported type map should fail validation.");
+			StringAssertEx.Contains (expectedError, builder.LastBuildOutput);
+		}
+
 		[Test]
 		[TestCase ("RunAOTCompilation")]
 		[TestCase ("EnableLLVM")]
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 7ffd8c9aabe..815c2ce09da 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -3008,8 +3008,11 @@ because xbuild doesn't support framework reference assemblies.
 
   <Target Name="_ValidateAndroidTypeMapImplementation"
       BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
+    <AndroidError Code="XA4265"
+        ResourceName="XA4265"
+        Condition=" '$(AndroidTypeMapImplementation)' == 'llvm-ir' " />
     <Error Condition=" '$(AndroidTypeMapImplementation)' != '' and '$(AndroidTypeMapImplementation)' != 'llvm-ir' and '$(AndroidTypeMapImplementation)' != 'trimmable' "
-           Text="Invalid value for AndroidTypeMapImplementation: '$(AndroidTypeMapImplementation)'. Valid values are: llvm-ir, trimmable." />
+           Text="Invalid value for AndroidTypeMapImplementation: '$(AndroidTypeMapImplementation)'. The only supported value is: trimmable." />
   </Target>
 
   <Target Name="_LinkAssemblies"

From 83af0872ee421e17489edf14ca839b4a90dacd7a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:24:16 +0200
Subject: [PATCH 02/58] Guard app-only typemap targets and validate build entry
 points

Prevent the default from running the app typemap generator in libraries and reject legacy selection before build, publish, and direct generation targets.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../InvalidConfigTests.cs                     | 32 +++++++++++++++++++
 .../TrimmableTypeMapBuildTests.cs             |  1 -
 .../Xamarin.Android.Common.targets            |  4 +--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
index 9cf62f023ec..b0f8bb450fb 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
@@ -89,6 +89,15 @@ public void TypeMapDefaultsToTrimmable (bool isApplication, bool isRelease)
 			Assert.IsTrue (builder.Build (project), "The default type map should be trimmable for applications and libraries.");
 		}
 
+		[Test]
+		public void LibraryBuildDoesNotGenerateTypeMap ()
+		{
+			var project = new XamarinAndroidLibraryProject ();
+			using var builder = CreateDllBuilder ();
+			Assert.IsTrue (builder.Build (project), "A library should build with the trimmable type map default.");
+			FileAssert.DoesNotExist (builder.Output.GetIntermediaryPath (Path.Combine ("typemap", "typemap-assemblies.txt")));
+		}
+
 		[TestCase (true, "llvm-ir", "XA4265")]
 		[TestCase (false, "llvm-ir", "XA4265")]
 		[TestCase (true, "unsupported", "Invalid value for AndroidTypeMapImplementation")]
@@ -107,6 +116,29 @@ public void UnsupportedTypeMapIsRejected (bool isApplication, string typeMapImpl
 			StringAssertEx.Contains (expectedError, builder.LastBuildOutput);
 		}
 
+		[TestCase (true, "Build")]
+		[TestCase (false, "Build")]
+		[TestCase (true, "Publish")]
+		[TestCase (false, "Publish")]
+		[TestCase (true, "_GenerateJavaStubs")]
+		[TestCase (true, "_PrepareLinking")]
+		public void LegacyTypeMapIsRejectedBeforeBuildTargets (bool isApplication, string target)
+		{
+			XamarinProject project = isApplication
+				? new XamarinAndroidApplicationProject ()
+				: new XamarinAndroidLibraryProject ();
+			project.SetProperty ("AndroidTypeMapImplementation", "llvm-ir");
+			if (target == "_PrepareLinking") {
+				project.SetProperty ("PublishTrimmed", "true");
+			}
+
+			using var builder = isApplication ? CreateApkBuilder () : CreateDllBuilder ();
+			builder.Target = target;
+			builder.ThrowOnBuildFailure = false;
+			Assert.IsFalse (builder.Build (project), "Legacy type maps should be rejected before generation.");
+			StringAssertEx.Contains ("error XA4265:", builder.LastBuildOutput);
+		}
+
 		[Test]
 		[TestCase ("RunAOTCompilation")]
 		[TestCase ("EnableLLVM")]
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 cf7754c0c1e..50b6febf26a 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
@@ -30,7 +30,6 @@ public void Build_WithTrimmableTypeMap_Succeeds ([Values] bool isRelease, [Value
 				IsRelease = isRelease,
 			};
 			proj.SetRuntime (runtime);
-			proj.SetProperty ("AndroidTypeMapImplementation", "trimmable");
 
 			using var builder = CreateApkBuilder ();
 			Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 815c2ce09da..eb9c6d8d963 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -3007,7 +3007,7 @@ because xbuild doesn't support framework reference assemblies.
   </Target>
 
   <Target Name="_ValidateAndroidTypeMapImplementation"
-      BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
+      BeforeTargets="_CheckForInvalidConfigurationAndPlatform;_GenerateJavaStubs;_PrepareLinking;Build;Publish">
     <AndroidError Code="XA4265"
         ResourceName="XA4265"
         Condition=" '$(AndroidTypeMapImplementation)' == 'llvm-ir' " />
@@ -3021,7 +3021,7 @@ because xbuild doesn't support framework reference assemblies.
 
 <!-- TypeMap imports must be last so their target overrides (e.g. _RemoveRegisterAttribute) take precedence -->
 <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.Android.Sdk.TypeMap.Trimmable.targets"
-    Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' " />
+    Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' and '$(AndroidApplication)' == 'true' " />
 <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.Android.Sdk.TypeMap.LlvmIr.targets"
     Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' " />
 

From af434dcb73076e7ac388071274d74c41ded11fea Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 08:21:51 +0200
Subject: [PATCH 03/58] Remove legacy LLVM IR type map build pipeline

Keep native host compatibility stubs and P/Invoke preservation while removing unreachable typemap and marshal-method generation, rewriting, and linker steps.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../building-apps/build-properties.md         |   11 +-
 Documentation/docs-mobile/messages/index.md   |    2 +-
 Documentation/docs-mobile/messages/xa1049.md  |   20 +-
 .../MonoDroid.Tuner/FindJavaObjectsStep.cs    |   14 +-
 .../MonoDroid.Tuner/FindTypeMapObjectsStep.cs |   74 --
 .../Xamarin.Android.Resource.Designer.targets |    6 +-
 ...oft.Android.Sdk.AssemblyResolution.targets |    1 -
 .../Microsoft.Android.Sdk.BuildOrder.targets  |    1 -
 ...crosoft.Android.Sdk.TypeMap.LlvmIr.targets |  455 -------
 ...soft.Android.Sdk.TypeMap.Trimmable.targets |   12 +-
 .../Properties/Resources.Designer.cs          |    2 +-
 .../Properties/Resources.resx                 |    4 +-
 .../Tasks/AssemblyModifierPipeline.cs         |   12 -
 .../Tasks/CollectTypeMapFilesForArchive.cs    |   38 -
 .../Tasks/CreateTypeManagerJava.cs            |   80 --
 .../Tasks/GenerateACWMap.cs                   |   57 -
 .../GenerateAdditionalProviderSources.cs      |  104 +-
 .../Tasks/GenerateEmptyTypemapStub.cs         |   10 -
 .../Tasks/GenerateJavaCallableWrappers.cs     |  109 --
 .../Tasks/GenerateJavaStubs.cs                |  242 ----
 .../Tasks/GenerateMainAndroidManifest.cs      |  143 ---
 .../GenerateNativeAotBootstrapSources.cs      |    6 +-
 ...ateNativeAotLibraryLoadAssemblerSources.cs |    2 +-
 .../GenerateNativeApplicationConfigSources.cs |    9 +-
 .../GenerateNativeMarshalMethodSources.cs     |  196 +--
 .../Tasks/GenerateTypeMappings.cs             |  177 ---
 .../Tasks/GetMonoPlatformJar.cs               |   43 -
 .../Tasks/PreTrimmingFixLegacyDesigner.cs     |   94 --
 .../Tasks/PrepareAbiItems.cs                  |    5 +-
 .../Tasks/RemoveRegisterAttribute.cs          |   78 --
 .../Tasks/RewriteMarshalMethods.cs            |  122 --
 .../Xamarin.Android.Build.Tests/BuildTest2.cs |   73 +-
 .../IncrementalBuildTest.cs                   |   50 +-
 .../ManifestTest.cs                           |    2 +-
 .../MarshalMethodTests.cs                     |   58 -
 .../Tasks/LinkerTests.cs                      |   18 -
 .../Tasks/LlvmIrGeneratorTests.cs             |   33 +-
 .../Utilities/AssemblyPipeline.cs             |    1 -
 .../Utilities/JCWGenerator.cs                 |  349 ------
 .../Utilities/ManifestDocument.cs             |    2 +-
 .../Utilities/MarshalMethodCecilAdapter.cs    |  261 ----
 .../MarshalMethodsAssemblyRewriter.cs         |  562 ---------
 .../Utilities/MarshalMethodsClassifier.cs     | 1107 -----------------
 .../Utilities/MarshalMethodsCollection.cs     |  418 -------
 .../Utilities/MarshalMethodsHelpers.cs        |   61 -
 .../MarshalMethodsNativeAssemblyGenerator.cs  |   80 +-
 ...rshalMethodsNativeAssemblyGeneratorBase.cs |  919 --------------
 .../Utilities/MarshalMethodsState.cs          |   43 -
 .../Utilities/MonoAndroidHelper.cs            |   20 +-
 .../Utilities/NativeCodeGenState.cs           |   56 -
 .../Utilities/NativeTypeMappingData.cs        |   67 -
 ...PreservePinvokesNativeAssemblyGenerator.cs |   19 +-
 .../Utilities/TypeMapCecilAdapter.cs          |  272 ----
 .../Utilities/TypeMapGenerator.cs             |  355 ------
 .../Utilities/TypeMapObjectsXmlFile.cs        |  366 ------
 .../Utilities/TypeMappingAssemblyGenerator.cs |   16 -
 ...TypeMappingDebugNativeAssemblyGenerator.cs |  281 -----
 ...peMappingReleaseNativeAssemblyGenerator.cs |  486 --------
 .../Xamarin.Android.Build.Tasks.csproj        |    4 -
 .../Xamarin.Android.Common.targets            |  118 +-
 .../Tests/InstallAndRunTests.cs               |   17 +-
 .../Tests/MarshalMethodsGCHangTests.cs        |  131 --
 .../ScannerRunner.cs                          |   21 +-
 .../TypeDataBuilder.cs                        |   10 +-
 64 files changed, 178 insertions(+), 8227 deletions(-)
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
 delete mode 100644 tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs

diff --git a/Documentation/docs-mobile/building-apps/build-properties.md b/Documentation/docs-mobile/building-apps/build-properties.md
index 5c934d03a93..5094917572c 100644
--- a/Documentation/docs-mobile/building-apps/build-properties.md
+++ b/Documentation/docs-mobile/building-apps/build-properties.md
@@ -425,14 +425,9 @@ The default value is `False` when
 
 ## AndroidEnableMarshalMethods
 
-A bool property, that determines whether or not LLVM marshal methods are enabled.
-LLVM marshal methods are an app startup optimization which uses native entry points
-for Java `native` method registration.
-
-This property is False by default.
-
-This property cannot be set to `true` when
-[`$(PublishReadyToRun)`](#publishreadytorun) is `true`.
+A legacy boolean property for LLVM marshal methods. Marshal methods are no
+longer supported. Remove this property or set it to `false`; setting it to
+`true` produces error XA1049.
 
 Added in .NET 8.
 
diff --git a/Documentation/docs-mobile/messages/index.md b/Documentation/docs-mobile/messages/index.md
index f3b0bd1c0ad..a9f84c7259c 100644
--- a/Documentation/docs-mobile/messages/index.md
+++ b/Documentation/docs-mobile/messages/index.md
@@ -159,7 +159,7 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla
 + [XA1046](xa1046.md): Attribute '{0}' in element '{1}' has value '{2}' that cannot be parsed as boolean; {3} line {4}.
 + [XA1047](xa1047.md): Required attribute '{0}' missing from element '{1}'; {2} line {3}.
 + [XA1048](xa1048.md): '{0}' does not contain an &lt;instrumentation&gt; element.
-+ [XA1049](xa1049.md): The 'AndroidEnableMarshalMethods' and 'PublishReadyToRun' MSBuild properties cannot both be set to 'true'.
++ [XA1049](xa1049.md): The 'AndroidEnableMarshalMethods' MSBuild property is no longer supported.
 + [XA1050](xa1050.md): The 'AndroidR8ObfuscationMode' MSBuild property has an invalid value.
 
 ## XA2xxx: Linker
diff --git a/Documentation/docs-mobile/messages/xa1049.md b/Documentation/docs-mobile/messages/xa1049.md
index 4d617f1abda..4f690ea9c43 100644
--- a/Documentation/docs-mobile/messages/xa1049.md
+++ b/Documentation/docs-mobile/messages/xa1049.md
@@ -11,31 +11,21 @@ f1_keywords:
 ## Example messages
 
 ```dotnetcli
-error XA1049: The 'AndroidEnableMarshalMethods' and 'PublishReadyToRun' MSBuild properties cannot both be set to 'true'. Set one property to 'false'.
+error XA1049: The 'AndroidEnableMarshalMethods' MSBuild property is no longer supported. Remove it or set it to 'false'.
 ```
 
 ## Issue
 
-[`$(AndroidEnableMarshalMethods)`](../building-apps/build-properties.md#androidenablemarshalmethods)
-rewrites managed assemblies after trimming, while
-[`$(PublishReadyToRun)`](../building-apps/build-properties.md#publishreadytorun)
-adds native code to those assemblies. The marshal methods rewriter cannot modify
-ReadyToRun assemblies.
+The llvm-ir type map and its marshal-method assembly rewriter are no longer
+supported. Setting `$(AndroidEnableMarshalMethods)` to `true` cannot enable
+marshal methods with the trimmable type map.
 
 ## Solution
 
-Disable marshal methods or ReadyToRun in the project file:
+Remove the property or set it to `false` in the project file:
 
 ```xml
 <PropertyGroup>
   <AndroidEnableMarshalMethods>false</AndroidEnableMarshalMethods>
 </PropertyGroup>
 ```
-
-Alternatively:
-
-```xml
-<PropertyGroup>
-  <PublishReadyToRun>false</PublishReadyToRun>
-</PropertyGroup>
-```
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
index d3e79f011c4..269e8f152b4 100644
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
+++ b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
@@ -22,8 +22,6 @@ public class FindJavaObjectsStep : BaseStep, IAssemblyModifierPipelineStep
 
 	public bool ErrorOnCustomJavaObject { get; set; }
 
-	public bool UseMarshalMethods { get; set; }
-
 	public TaskLoggingHelper Log { get; set; }
 
 	public FindJavaObjectsStep (TaskLoggingHelper log) => Log = log;
@@ -74,11 +72,8 @@ bool ShouldScan (StepContext context)
 		if (!context.IsAndroidAssembly)
 			return false;
 
-		// When marshal methods or non-JavaPeerStyle.XAJavaInterop1 are in use we do not want to skip non-user assemblies (such as Mono.Android) - we need to generate JCWs for them during
-		// application build, unlike in Debug configuration or when marshal methods are disabled, in which case we use JCWs generated during Xamarin.Android
-		// build and stored in a jar file.
-		var useMarshalMethods = !context.IsDebug && context.EnableMarshalMethods;
-		var shouldSkipNonUserAssemblies = !useMarshalMethods && context.CodeGenerationTarget == JavaPeerStyle.XAJavaInterop1;
+		// XAJavaInterop1 uses the framework JCWs from the runtime jar.
+		var shouldSkipNonUserAssemblies = context.CodeGenerationTarget == JavaPeerStyle.XAJavaInterop1;
 
 		if (shouldSkipNonUserAssemblies && !context.IsUserAssembly) {
 			Log.LogDebugMessage ($"Skipping assembly '{context.Source.ItemSpec}' because it is not a user assembly and we don't need JLOs from non-user assemblies");
@@ -114,11 +109,6 @@ List<CallableWrapperType> ConvertToCallableWrappers (List<TypeDefinition> types)
 			DefaultMonoRuntimeInitialization = "mono.MonoPackageManager.LoadApplication (context);",
 		};
 
-		if (UseMarshalMethods) {
-			var classifier = new MarshalMethodsClassifier (Context, Context.Resolver, Log);
-			reader_options.MethodClassifier = new MarshalMethodsCollection (classifier);
-		}
-
 		foreach (var type in types) {
 			var wrapper = CecilImporter.CreateType (type, Context, reader_options);
 			wrappers.Add (wrapper);
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs
deleted file mode 100644
index 43a9b8de334..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Mono.Linker.Steps;
-using Xamarin.Android.Tasks;
-
-namespace MonoDroid.Tuner;
-
-/// <summary>
-/// Scans an assembly for JLOs that need to be in the typemap and writes them to an XML file.
-/// </summary>
-public class FindTypeMapObjectsStep : BaseStep, IAssemblyModifierPipelineStep
-{
-	public bool Debug { get; set; }
-
-	public bool ErrorOnCustomJavaObject { get; set; }
-
-	public TaskLoggingHelper Log { get; set; }
-
-	public FindTypeMapObjectsStep (TaskLoggingHelper log) => Log = log;
-
-	public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
-	{
-		var destinationTypeMapXml = TypeMapObjectsXmlFile.GetTypeMapObjectsXmlFilePath (context.Destination.ItemSpec);
-
-		// We only care about assemblies that can contains JLOs
-		if (!context.IsAndroidAssembly) {
-			Log.LogDebugMessage ($"Skipping assembly '{assembly.Name.Name}' because it is not an Android assembly");
-			TypeMapObjectsXmlFile.WriteEmptyFile (destinationTypeMapXml, Log);
-			return;
-		}
-
-		var types = ScanForJavaTypes (assembly);
-
-		var xml = new TypeMapObjectsXmlFile {
-			AssemblyName = assembly.Name.Name,
-			AssemblyFullName = Debug ? TypeMapCecilAdapter.GetRuntimeAssemblyFullName (assembly.Name) : null,
-			AssemblyMvid = assembly.MainModule.Mvid,
-		};
-
-		if (Debug) {
-			var (typeMapDebugSets, foundJniNativeRegistration) = TypeMapCecilAdapter.GetDebugNativeEntries (types, Context, needUniqueAssemblies: false);
-
-			xml.JavaToManagedDebugEntries.AddRange (typeMapDebugSets.JavaToManaged);
-			xml.ManagedToJavaDebugEntries.AddRange (typeMapDebugSets.ManagedToJava);
-			xml.FoundJniNativeRegistration = foundJniNativeRegistration;
-		} else {
-			var genState = TypeMapCecilAdapter.GetReleaseGenerationState (types, Context, out var foundJniNativeRegistration);
-			xml.ModuleReleaseData = genState.TempModules.SingleOrDefault ().Value;
-		}
-
-		xml.Export (destinationTypeMapXml, Log);
-	}
-
-	List<TypeDefinition> ScanForJavaTypes (AssemblyDefinition assembly)
-	{
-		var types = new List<TypeDefinition> ();
-
-		var scanner = new XAJavaTypeScanner (Xamarin.Android.Tools.AndroidTargetArch.None, Log, Context) {
-			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject
-		};
-
-		foreach (ModuleDefinition md in assembly.Modules) {
-			foreach (TypeDefinition td in md.Types) {
-				scanner.AddJavaType (td, types);
-			}
-		}
-
-		return types;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
index e19d986acda..ee4169c966b 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
@@ -227,10 +227,8 @@ Copyright (C) 2016 Xamarin. All rights reserved.
     is processed by the ILLink step. If we do not do this then the reference to
     `netstandard.dll` is not replaced with `System.Private.CoreLib` and the app crashes.
 
-    No TrimmerRootDescriptor is needed: PreTrimmingFixLegacyDesigner rewrites library
-    assemblies *before* ILLink, replacing designer field loads with calls to the designer
-    assembly's property getters. ILLink then naturally preserves only the referenced
-    properties through its mark step, allowing everything else to be trimmed.
+    The trimmable typemap targets root the designer assembly when trimming is enabled:
+    resource IDs may be resolved through reflection at runtime.
 -->
 <Target Name="_AddResourceDesignerToPublishFiles"
     Condition=" '$(AndroidUseDesignerAssembly)' == 'True' "
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
index f6e8f47184f..691cb182bef 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
@@ -252,7 +252,6 @@ _ResolveAssemblies MSBuild target.
       _ResolveSatellitePaths;
       _CreatePackageWorkspace;
       _LinkAssemblies;
-      _AfterILLinkAdditionalSteps;
     </_PrepareAssembliesDependsOnTargets>
   </PropertyGroup>
 
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
index bb9999a24f1..39b01d08114 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
@@ -73,7 +73,6 @@ properties that determine build ordering.
       _ResolveSatellitePaths;
       _CreatePackageWorkspace;
       _LinkAssemblies;
-      _AfterILLinkAdditionalSteps;
       _GenerateJavaStubs;
       _ManifestMerger;
       _ConvertCustomView;
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
deleted file mode 100644
index d257ad442b4..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
+++ /dev/null
@@ -1,455 +0,0 @@
-<!-- Typemap targets for native binary typemaps generated by GenerateTypeMappings. -->
-<Project>
-
-  <UsingTask TaskName="Xamarin.Android.Tasks.CollectTypeMapFilesForArchive" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.CreateTypeManagerJava" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.GenerateTypeMappings" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.GetMonoPlatformJar" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.RemoveRegisterAttribute" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.GenerateProguardConfiguration" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.PostTrimmingPipeline" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.PreTrimmingFixLegacyDesigner" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-
-  <PropertyGroup>
-    <AndroidEnableLegacyCompatibilityAssemblyFixups Condition=" '$(AndroidEnableLegacyCompatibilityAssemblyFixups)' == '' ">true</AndroidEnableLegacyCompatibilityAssemblyFixups>
-    <_RemoveRegisterFlag>$(MonoAndroidIntermediateAssemblyDir)shrunk\shrunk.flag</_RemoveRegisterFlag>
-    <!-- Inject typemap-specific targets into build dependency chains -->
-    <_BeforeAddStaticResources>$(_BeforeAddStaticResources);_GetMonoPlatformJarPath</_BeforeAddStaticResources>
-    <_BeforeCompileJava>$(_BeforeCompileJava);_GetMonoPlatformJarPath</_BeforeCompileJava>
-    <_BeforeCompileToDalvik>$(_BeforeCompileToDalvik);_GetMonoPlatformJarPath</_BeforeCompileToDalvik>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <RuntimeHostConfigurationOption Include="Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap"
-        Value="false" Trim="true" />
-    <RuntimeHostConfigurationOption Include="Java.Interop.RuntimeFeature.ManagedPeerNativeRegistration"
-        Value="true" Trim="true" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <_GenerateJavaStubsDependsOnTargets>
-      _SetLatestTargetFrameworkVersion;
-      _PrepareAssemblies;
-      _PrepareNativeAssemblySources;
-      $(_AfterPrepareAssemblies);
-      _GetGenerateJavaStubsInputs;
-    </_GenerateJavaStubsDependsOnTargets>
-  </PropertyGroup>
-
-  <Target Name="_GenerateJavaStubs"
-      DependsOnTargets="$(_GenerateJavaStubsDependsOnTargets);$(BeforeGenerateAndroidManifest)"
-      Inputs="@(_GenerateJavaStubsInputs)"
-      Outputs="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp">
-
-    <PropertyGroup>
-      <_ManifestOutput Condition=" '$(AndroidManifestMerger)' == 'legacy' ">$(IntermediateOutputPath)android\AndroidManifest.xml</_ManifestOutput>
-      <_ManifestOutput Condition=" '$(AndroidManifestMerger)' != 'legacy' ">$(IntermediateOutputPath)AndroidManifest.xml</_ManifestOutput>
-      <_LinkingEnabled Condition=" '$(AndroidLinkMode)' != 'None'">True</_LinkingEnabled>
-      <_LinkingEnabled Condition=" '$(AndroidLinkMode)' == 'None'">False</_LinkingEnabled>
-      <_HaveMultipleRIDs Condition=" '$(RuntimeIdentifiers)' != '' ">True</_HaveMultipleRIDs>
-      <_HaveMultipleRIDs Condition=" '$(RuntimeIdentifiers)' == '' ">False</_HaveMultipleRIDs>
-    </PropertyGroup>
-    <ItemGroup>
-      <_MergedManifestDocuments Condition=" '$(AndroidManifestMerger)' == 'legacy' " Include="@(ExtractedManifestDocuments)" />
-    </ItemGroup>
-
-    <GenerateJavaCallableWrappers
-        CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-        OutputDirectory="$(IntermediateOutputPath)android\src"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
-        SupportedAbis="@(_BuildTargetAbis)">
-      <Output TaskParameter="GeneratedJavaFilesOutput" ItemName="_GeneratedJavaFiles" />
-    </GenerateJavaCallableWrappers>
-
-    <GenerateACWMap
-        AcwMapFile="$(_AcwMapFile)"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        SupportedAbis="@(_BuildTargetAbis)">
-    </GenerateACWMap>
-
-    <GenerateJavaStubs
-        CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        ResolvedUserAssemblies="@(_ResolvedUserMonoAndroidAssemblies)"
-        ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        OutputDirectory="$(IntermediateOutputPath)android"
-        PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
-        ApplicationJavaClass="$(AndroidApplicationJavaClass)"
-        FrameworkDirectories="$(_XATargetFrameworkDirectories)"
-        SupportedAbis="@(_BuildTargetAbis)"
-        EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)">
-    </GenerateJavaStubs>
-
-    <RewriteMarshalMethods
-        Condition=" '$(_AndroidUseMarshalMethods)' == 'true' And '$(AndroidIncludeDebugSymbols)' == 'false' "
-        IntermediateOutputDirectory="$(IntermediateOutputPath)">
-    </RewriteMarshalMethods>
-
-    <GenerateTypeMappings
-        AndroidRuntime="$(_AndroidRuntime)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        EmitLlvmIrComments="$(_AndroidEmitLlvmIrComments)"
-        EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        SkipJniAddNativeMethodRegistrationAttributeScan="$(_SkipJniAddNativeMethodRegistrationAttributeScan)"
-        SupportedAbis="@(_BuildTargetAbis)"
-        TypemapImplementation="$(AndroidTypeMapImplementation)"
-        TypemapOutputDirectory="$(_NativeAssemblySourceDir)">
-    </GenerateTypeMappings>
-
-    <GenerateMainAndroidManifest
-        AndroidRuntime="$(_AndroidRuntime)"
-        AndroidSdkDir="$(_AndroidSdkDirectory)"
-        AndroidApiLevel="$(_AndroidApiLevel)"
-        ApplicationJavaClass="$(AndroidApplicationJavaClass)"
-        ApplicationLabel="$(_ApplicationLabel)"
-        BundledWearApplicationName="$(BundledWearApplicationPackageName)"
-        CheckedBuild="$(_AndroidCheckedBuild)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        EmbedAssemblies="$(EmbedAssembliesIntoApk)"
-        EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        ManifestPlaceholders="$(AndroidManifestPlaceholders)"
-        ManifestTemplate="$(_AndroidManifestAbs)"
-        MergedAndroidManifestOutput="$(_ManifestOutput)"
-        MergedManifestDocuments="@(_MergedManifestDocuments)"
-        NeedsInternet="$(AndroidNeedsInternetPermission)"
-        PackageName="$(_AndroidPackage)"
-        ResolvedUserAssemblies="@(_ResolvedUserMonoAndroidAssemblies)"
-        SupportedAbis="@(_BuildTargetAbis)"
-        SupportedOSPlatformVersion="$(SupportedOSPlatformVersion)"
-        VersionCode="$(_AndroidVersionCode)"
-        VersionName="$(_AndroidVersionName)">
-      <Output TaskParameter="AdditionalProviderSources" ItemName="_AdditionalProviderSources" />
-    </GenerateMainAndroidManifest>
-
-    <GenerateAdditionalProviderSources
-        AdditionalProviderSources="@(_AdditionalProviderSources)"
-        AndroidRuntime="$(_AndroidRuntime)"
-        Environments="@(_EnvironmentFiles)"
-        EnableSGenConcurrent="$(AndroidEnableSGenConcurrent)"
-        CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        OutputDirectory="$(IntermediateOutputPath)android"
-        TargetName="$(TargetName)">
-    </GenerateAdditionalProviderSources>
-
-    <ItemGroup>
-      <FileWrites Include="@(_TypeMapAssemblySource)" />
-      <FileWrites Include="@(_TypeMapAssemblyInclude)" />
-      <FileWrites Include="@(_AndroidTypeMapping)" Condition=" '@(_AndroidTypeMapping->Count())' == '0' " />
-      <FileWrites Include="$(_ManifestOutput)" />
-    </ItemGroup>
-
-    <Touch Files="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp" AlwaysCreate="True" />
-  </Target>
-
-  <!-- ILLink customization: custom trimmer steps, root descriptors, etc. -->
-  <Target Name="_PrepareLinking"
-      Condition=" '$(PublishTrimmed)' == 'true' "
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="GetReferenceAssemblyPaths;_CreatePropertiesCache;_AddResourceDesignerToPublishFiles">
-    <PropertyGroup>
-      <TrimmerRemoveSymbols Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' ">true</TrimmerRemoveSymbols>
-      <_ExtraTrimmerArgs Condition=" '$(_EnableSerializationDiscovery)' != 'false' ">--enable-serialization-discovery $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
-      <_ExtraTrimmerArgs Condition=" '$(_AndroidEnableUnusedTypeChecks)' != 'true' ">--disable-opt unusedtypechecks $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
-      <!--
-        Used for the <ILLink DumpDependencies="$(_TrimmerDumpDependencies)" /> value:
-        https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L150
-        -->
-      <_TrimmerDumpDependencies Condition=" '$(LinkerDumpDependencies)' == 'true' ">true</_TrimmerDumpDependencies>
-      <_AndroidLinkerCustomStepAssembly>$(MSBuildThisFileDirectory)..\tools\Microsoft.Android.Sdk.ILLink.dll</_AndroidLinkerCustomStepAssembly>
-      <_SystemIOHashingAssemblyPath>$(MSBuildThisFileDirectory)..\tools\System.IO.Hashing.dll</_SystemIOHashingAssemblyPath>
-      <_ProguardProjectConfiguration Condition=" '$(AndroidLinkTool)' != '' ">$(IntermediateOutputPath)proguard\proguard_project_references.cfg</_ProguardProjectConfiguration>
-    </PropertyGroup>
-    <ItemGroup>
-      <!--
-        Used for the <ILLink CustomData="@(_TrimmerCustomData)" /> value:
-        https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L147
-        -->
-      <_TrimmerCustomData Include="AndroidCustomViewMapFile" Value="$(_OuterCustomViewMapFile)" />
-      <_TrimmerCustomData Include="SystemIOHashingAssemblyPath" Value="$(_SystemIOHashingAssemblyPath)" />
-
-      <!--
-        Used for the <ILLink CustomSteps="@(_TrimmerCustomSteps)" /> value:
-        https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L131
-        -->
-      <!-- add our custom steps -->
-      <!-- Custom MarkHandlers that run during MarkStep -->
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="Microsoft.Android.Sdk.ILLink.PreserveSubStepDispatcher" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="MonoDroid.Tuner.MarkJavaObjects" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="MonoDroid.Tuner.PreserveJavaExceptions" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="MonoDroid.Tuner.PreserveApplications" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="Microsoft.Android.Sdk.ILLink.PreserveRegistrations" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="Microsoft.Android.Sdk.ILLink.PreserveJavaInterfaces" />
-      <!-- Custom steps that run after MarkStep -->
-      <!-- Custom steps that run after CleanStep -->
-      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\PreserveLists\*.xml"
-          Exclude="$(MSBuildThisFileDirectory)..\PreserveLists\System.Private.CoreLib.xml" />
-      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\PreserveLists\System.Private.CoreLib.xml"
-          Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " />
-      <TrimmerRootDescriptor Include="@(LinkDescription)" />
-      <TrimmerRootAssembly Include="Microsoft.Android.Runtime.NativeAOT" Condition=" '$(_AndroidRuntime)' == 'NativeAOT' " RootMode="All" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Android apps set OutputType=Library (no managed Main()), so the upstream
-    _PrepareTrimConfiguration target does not root the entry assembly (see
-    dotnet/runtime#125673). Explicitly add the app assembly with RootMode=All
-    to ensure ILLink includes it in linked output.
-  -->
-  <Target Name="_FixRootAssembly"
-      AfterTargets="PrepareForILLink">
-    <ItemGroup>
-      <TrimmerRootAssembly Remove="@(IntermediateAssembly->'%(Filename)')" />
-      <TrimmerRootAssembly Include="@(IntermediateAssembly->'%(Filename)')" RootMode="All" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Fix legacy resource designer references *before* ILLink runs. This rewrites
-    library assemblies so their resource field accesses (ldsfld) become calls to the
-    designer assembly's property getters, and clears the per-library designer classes.
-    Because the rewritten IL no longer references the old designer fields, ILLink can
-    freely trim unused designer types without needing a root descriptor.
-
-    Modified assemblies are written to an intermediate directory (not in-place) to
-    avoid mutating files in the shared NuGet cache or shared intermediate output paths.
-  -->
-  <Target Name="_CollectPreTrimmingAssemblies"
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="_ComputeAssembliesToPostprocessOnPublish"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(AndroidUseDesignerAssembly)' == 'True' ">
-    <ItemGroup>
-      <_PreTrimmingAssembly Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' and '%(ResolvedFileToPublish.PostprocessAssembly)' == 'true' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_PreTrimmingFixLegacyDesigner"
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="_CollectPreTrimmingAssemblies"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(AndroidUseDesignerAssembly)' == 'True' "
-      Inputs="@(_PreTrimmingAssembly)"
-      Outputs="$(_AndroidStampDirectory)_PreTrimmingFixLegacyDesigner.stamp">
-    <MakeDir Directories="$(_AndroidStampDirectory)" />
-    <PreTrimmingFixLegacyDesigner
-        Assemblies="@(_PreTrimmingAssembly)"
-        TargetName="$(TargetName)"
-        OutputDirectory="$(IntermediateOutputPath)prelink"
-        Deterministic="$(Deterministic)">
-      <Output TaskParameter="ModifiedAssemblies" ItemName="_PreTrimmingModifiedAssembly" />
-    </PreTrimmingFixLegacyDesigner>
-    <Touch Files="$(_AndroidStampDirectory)_PreTrimmingFixLegacyDesigner.stamp" AlwaysCreate="true" />
-    <ItemGroup>
-      <FileWrites Include="@(_PreTrimmingModifiedAssembly)" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Replace ResolvedFileToPublish entries with the prelink copies so ILLink picks them up.
-    This must run even when _PreTrimmingFixLegacyDesigner is skipped (up-to-date) because
-    ResolvedFileToPublish is populated fresh each build.
-  -->
-  <Target Name="_PreTrimmingFixLegacyDesignerUpdateItems"
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="_PreTrimmingFixLegacyDesigner"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(AndroidUseDesignerAssembly)' == 'True' ">
-    <ItemGroup>
-      <_PreTrimmingSwappableItem Include="@(ResolvedFileToPublish)"
-          Condition=" '%(Extension)' == '.dll' and Exists('$(IntermediateOutputPath)prelink/%(Filename)%(Extension)') " />
-      <ResolvedFileToPublish Remove="@(_PreTrimmingSwappableItem)" />
-      <ResolvedFileToPublish Include="@(_PreTrimmingSwappableItem->'$(IntermediateOutputPath)prelink/%(Filename)%(Extension)')" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_TouchAndroidLinkFlag"
-      AfterTargets="ILLink"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(RunILLink)' != 'false' and Exists('$(_LinkSemaphore)') "
-      Inputs="$(_LinkSemaphore)"
-      Outputs="$(_AndroidLinkFlag)">
-    <!-- This file is an input for _RemoveRegisterAttribute -->
-    <Touch Files="$(_AndroidLinkFlag)" AlwaysCreate="true" />
-  </Target>
-
-  <!--
-    Post-trimming assembly modifications: strips embedded Android resources and
-    (optionally) injects GC.KeepAlive() calls, in a single pass over assemblies.
-    Runs in the inner build after ILLink but before ReadyToRun/crossgen2 compilation,
-    so R2R images are generated from the already-modified assemblies.
-  -->
-  <Target Name="_CollectPostTrimmingAssemblies"
-      Condition=" '$(PublishTrimmed)' == 'true' ">
-    <ItemGroup>
-      <_PostTrimmingAssembly Remove="@(_PostTrimmingAssembly)" />
-      <_PostTrimmingAssembly Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' and '%(ResolvedFileToPublish.PostprocessAssembly)' == 'true' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_PostTrimmingPipeline"
-      AfterTargets="ILLink"
-      DependsOnTargets="_CollectPostTrimmingAssemblies"
-      Condition=" '$(PublishTrimmed)' == 'true' "
-      Inputs="@(_PostTrimmingAssembly);$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects)"
-      Outputs="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp">
-    <PostTrimmingPipeline
-        Assemblies="@(_PostTrimmingAssembly)"
-        AddKeepAlives="$(AndroidAddKeepAlives)"
-        AndroidLinkResources="$(AndroidLinkResources)"
-        Deterministic="$(Deterministic)" />
-    <MakeDir Directories="$(_AndroidStampDirectory)" />
-    <Touch Files="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp" AlwaysCreate="true" />
-    <ItemGroup>
-      <FileWrites Include="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Inject _TypeMapKind into the property cache -->
-  <Target Name="_SetTypemapProperties"
-      BeforeTargets="_CreatePropertiesCache">
-    <PropertyGroup>
-      <_TypeMapKind Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">mvid</_TypeMapKind>
-      <_TypeMapKind Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">strings-asm</_TypeMapKind>
-    </PropertyGroup>
-    <ItemGroup>
-      <_PropertyCacheItems Include="TypeMapKind=$(_TypeMapKind)" />
-      <_PropertyCacheItems Include="Deterministic=$(Deterministic)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Locate prebuilt mono.android.jar -->
-  <Target Name="_GetMonoPlatformJarPath">
-    <PropertyGroup>
-      <_AndroidJarAndDexDirectory>$(_XATargetFrameworkDirectories)</_AndroidJarAndDexDirectory>
-    </PropertyGroup>
-    <GetMonoPlatformJar
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-        TargetFrameworkDirectory="$(_AndroidJarAndDexDirectory)">
-      <Output TaskParameter="MonoPlatformJarPath" PropertyName="MonoPlatformJarPath" />
-      <Output TaskParameter="MonoPlatformDexPath" PropertyName="MonoPlatformDexPath" />
-    </GetMonoPlatformJar>
-  </Target>
-
-  <!-- Prepare native assembly sources for typemap -->
-  <Target Name="_PrepareNativeAssemblySources" Condition=" '$(_AndroidRuntime)' != 'NativeAOT' ">
-    <PrepareAbiItems
-        BuildTargetAbis="@(_BuildTargetAbis)"
-        NativeSourcesDir="$(_NativeAssemblySourceDir)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        Mode="typemap">
-      <Output TaskParameter="AssemblySources" ItemName="_TypeMapAssemblySource" />
-      <Output TaskParameter="AssemblyIncludes" ItemName="_TypeMapAssemblyInclude" />
-    </PrepareAbiItems>
-  </Target>
-
-  <!-- TypeManager.java generation and prebuilt mono.android.jar copy -->
-  <PropertyGroup>
-    <_AddTypeManagerResourcesOutput Condition=" '$(_AndroidUseMarshalMethods)' == 'True' ">$(_AndroidIntermediateJavaSourceDirectory)mono\TypeManager.java</_AddTypeManagerResourcesOutput>
-    <_AddTypeManagerResourcesOutput Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">$(IntermediateOutputPath)android\bin\mono.android.jar</_AddTypeManagerResourcesOutput>
-  </PropertyGroup>
-  <Target Name="_AddTypeManagerResources"
-      AfterTargets="_AddStaticResources"
-      Inputs="$(MonoPlatformJarPath);$(_AndroidBuildPropertiesCache)"
-      Outputs="$(_AddTypeManagerResourcesOutput)">
-    <CreateTypeManagerJava
-        Condition=" '$(_AndroidUseMarshalMethods)' == 'True' "
-        ResourceName="JavaInteropTypeManager.java"
-        OutputFilePath="$(_AndroidIntermediateJavaSourceDirectory)mono\TypeManager.java"
-    />
-    <Copy
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-        SourceFiles="$(MonoPlatformJarPath)"
-        DestinationFiles="$(IntermediateOutputPath)android\bin\mono.android.jar"
-        SkipUnchangedFiles="true" />
-    <Touch
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-        Files="$(IntermediateOutputPath)android\bin\mono.android.jar" />
-    <ItemGroup>
-      <FileWrites Include="$(_AndroidIntermediateJavaSourceDirectory)mono\JavaInteropTypeManager.java" />
-      <FileWrites
-          Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-          Include="$(IntermediateOutputPath)android\bin\mono.android.jar" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Override _RemoveRegisterAttribute to strip [Register] attributes from shrunk assemblies.
-
-    The shrunk copies must be taken from the *final* linked assemblies. `_GenerateJavaStubs`
-    runs `RewriteMarshalMethods`, which rewrites @(_ResolvedAssemblies) in place (removing the
-    `cb_*` JNI callback fields), and `_PostTrimmingPipeline` rewrites them again after ILLink.
-    Depending on `_GenerateJavaStubs` keeps this copy ordered after those rewrites.
-
-    `$(_AndroidLinkFlag)` tracks ILLink, while @(_ResolvedAssemblies) tracks the later in-place
-    rewrites that the link flag cannot observe. The assembly hash also invalidates the target when
-    the resolved assembly set changes. Without the final assemblies as inputs, the shrunk copies
-    could go stale while @(_ResolvedAssemblies) moved on, so downstream build steps could consume
-    the rewritten assemblies while packaging shipped the pre-rewrite copies. This mirrors
-    `_RemoveRegisterAttributeCoreClr` in Microsoft.Android.Sdk.TypeMap.Trimmable.targets.
-  -->
-  <Target Name="_RemoveRegisterAttribute"
-      DependsOnTargets="_PrepareAssemblies;_GenerateJavaStubs"
-      Inputs="$(_AndroidLinkFlag);@(_ResolvedAssemblies);$(_ResolvedUserAssembliesHashFile);$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects)"
-      Outputs="$(_RemoveRegisterFlag)"
-      Condition="'$(AndroidLinkMode)' != 'None' AND '$(AndroidIncludeDebugSymbols)' != 'true'">
-    <CopyIfChanged
-        SourceFiles="@(_ResolvedAssemblies)"
-        DestinationFiles="@(_ShrunkAssemblies)" />
-    <CopyIfChanged
-        SourceFiles="@(_ResolvedAssemblies->'%(Identity).config')"
-        DestinationFiles="@(_ShrunkAssemblies->'%(Identity).config')" />
-    <RemoveRegisterAttribute
-        Condition=" '$(_AndroidRuntime)' != 'NativeAOT' and '$(PublishReadyToRun)' != 'true' "
-        ShrunkFrameworkAssemblies="@(_ShrunkAssemblies)" />
-    <MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)shrunk" />
-    <Touch Files="$(_RemoveRegisterFlag)" AlwaysCreate="true" />
-    <ItemGroup>
-      <FileWrites Include="$(_RemoveRegisterFlag)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Collect native typemap files for archive (FastDev) -->
-  <Target Name="_CollectTypeMapFiles"
-      BeforeTargets="_BuildApk">
-    <CollectTypeMapFilesForArchive
-        AndroidPackageFormat="$(AndroidPackageFormat)"
-        TypeMappings="@(_AndroidTypeMaps)">
-      <Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
-    </CollectTypeMapFilesForArchive>
-  </Target>
-
-  <!-- In the non-NativeAOT path, ResolvedFileToPublish is populated by the ILLink target
-       (via the SDK's ComputeResolvedFilesToPublishList), so we run proguard generation after ILLink.
-       In NativeAOT, ResolvedFileToPublish remains empty after ILLink because the ILC package's
-       _ComputeManagedAssemblyForILLink replaces ManagedAssemblyToLink after _LinkedResolvedFileToPublishCandidate
-       is computed, so the ILLink target's ResolvedFileToPublish rewrite adds nothing.
-       Instead, _AndroidComputeIlcCompileInputs populates ResolvedFileToPublish, so NativeAOT.targets
-       sets _GenerateProguardAfterTargets to run these targets after that. -->
-  <PropertyGroup>
-    <_GenerateProguardAfterTargets Condition=" '$(_GenerateProguardAfterTargets)' == '' ">ILLink</_GenerateProguardAfterTargets>
-  </PropertyGroup>
-
-  <Target Name="_PrepareLinkedAssembliesForProguard"
-      AfterTargets="$(_GenerateProguardAfterTargets)"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(_ProguardProjectConfiguration)' != '' ">
-    <ItemGroup>
-      <_LinkedAssemblyForProguard Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_GenerateProguardConfiguration"
-      AfterTargets="_PrepareLinkedAssembliesForProguard"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(_ProguardProjectConfiguration)' != '' "
-      Inputs="@(_LinkedAssemblyForProguard)"
-      Outputs="$(_ProguardProjectConfiguration)">
-    <GenerateProguardConfiguration
-        LinkedAssemblies="@(_LinkedAssemblyForProguard)"
-        OutputFile="$(_ProguardProjectConfiguration)" />
-  </Target>
-
-</Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
index 364be13713a..30c4a2fc948 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
@@ -500,14 +500,15 @@
       Outputs="@(_BuildTargetAbis->'$(_NativeAssemblySourceDir)typemap.%(Identity).ll')">
     <ItemGroup>
       <_TypeMapStubAbis Include="@(_BuildTargetAbis)" />
+      <_TypeMapAssemblySource Include="@(_TypeMapStubAbis->'$(_NativeAssemblySourceDir)typemap.%(Identity).ll')">
+        <abi>%(_TypeMapStubAbis.Identity)</abi>
+      </_TypeMapAssemblySource>
     </ItemGroup>
     <MakeDir Directories="$(_NativeAssemblySourceDir)" />
     <GenerateEmptyTypemapStub
         OutputDirectory="$(_NativeAssemblySourceDir)"
         Abis="@(_TypeMapStubAbis)"
-        Debug="$(AndroidIncludeDebugSymbols)">
-      <Output TaskParameter="Sources" ItemName="_TypeMapAssemblySource" />
-    </GenerateEmptyTypemapStub>
+        Debug="$(AndroidIncludeDebugSymbols)" />
     <ItemGroup>
       <FileWrites Include="@(_TypeMapAssemblySource)" />
     </ItemGroup>
@@ -516,10 +517,7 @@
   <!--
     Keep the resource designer assembly on the trimmable type map path.
 
-    The non-trimmable path (Microsoft.Android.Sdk.TypeMap.LlvmIr.targets) runs
-    PreTrimmingFixLegacyDesigner, which rewrites legacy resource field loads into designer
-    property-getter calls so the trimmer can drop unused designer members. The trimmable path
-    does not run that rewrite. More importantly, resource ids are resolved via reflection at
+    Resource ids are resolved via reflection at
     runtime (Android.Runtime.ResourceIdManager then ResourceDesignerAttribute then Type.GetType /
     UpdateIdValues), which neither ILLink nor ILC can follow. If the designer assembly is left
     trimmable it gets removed entirely, and accessing any resource id (e.g. from a reflection-only
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
index 7e9020904e0..6c131c25df4 100644
--- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
+++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
@@ -973,7 +973,7 @@ public static string XA1048 {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to The &apos;AndroidEnableMarshalMethods&apos; and &apos;PublishReadyToRun&apos; MSBuild properties cannot both be set to &apos;true&apos;. Set one property to &apos;false&apos;..
+        ///   Looks up a localized string similar to The &apos;AndroidEnableMarshalMethods&apos; MSBuild property is no longer supported. Remove it or set it to &apos;false&apos;..
         /// </summary>
         public static string XA1049 {
             get {
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
index 960d5c60c97..5a7b5afcbd0 100644
--- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
+++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
@@ -1124,8 +1124,8 @@ To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MS
 </comment>
   </data>
   <data name="XA1049" xml:space="preserve">
-    <value>The 'AndroidEnableMarshalMethods' and 'PublishReadyToRun' MSBuild properties cannot both be set to 'true'. Set one property to 'false'.</value>
-    <comment>The following are literal names and should not be translated: AndroidEnableMarshalMethods, PublishReadyToRun, MSBuild, true, false.</comment>
+    <value>The 'AndroidEnableMarshalMethods' MSBuild property is no longer supported. Remove it or set it to 'false'.</value>
+    <comment>The following are literal names and should not be translated: AndroidEnableMarshalMethods, MSBuild, false.</comment>
   </data>
   <data name="XA1050" xml:space="preserve">
     <value>The 'AndroidR8ObfuscationMode' MSBuild property has an invalid value of '{0}'. Valid values are 'disabled' and 'private-members'.</value>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs b/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
index 2248e256596..d16a3bbcf99 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
@@ -37,8 +37,6 @@ public class AssemblyModifierPipeline : AndroidTask
 
 	public bool Deterministic { get; set; }
 
-	public bool EnableMarshalMethods { get; set; }
-
 	public bool ErrorOnCustomJavaObject { get; set; }
 
 	public string? PackageNamingPolicy { get; set; }
@@ -134,7 +132,6 @@ protected virtual void BuildPipeline (AssemblyPipeline pipeline, MSBuildLinkCont
 		var findJavaObjectsStep = new FindJavaObjectsStep (Log) {
 			ApplicationJavaClass = ApplicationJavaClass,
 			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject,
-			UseMarshalMethods = EnableMarshalMethods,
 		};
 
 		findJavaObjectsStep.Initialize (context);
@@ -148,14 +145,6 @@ protected virtual void BuildPipeline (AssemblyPipeline pipeline, MSBuildLinkCont
 		var saveChangedAssemblyStep = new SaveChangedAssemblyStep (Log, writerParameters);
 		pipeline.Steps.Add (saveChangedAssemblyStep);
 
-		// FindTypeMapObjectsStep - this must be run after the assembly has been saved, as saving changes the MVID
-		var findTypeMapObjectsStep = new FindTypeMapObjectsStep (Log) {
-			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject,
-			Debug = Debug,
-		};
-
-		findTypeMapObjectsStep.Initialize (context);
-		pipeline.Steps.Add (findTypeMapObjectsStep);
 	}
 
 	void RunPipeline (AssemblyPipeline pipeline, ITaskItem source, ITaskItem destination)
@@ -168,7 +157,6 @@ void RunPipeline (AssemblyPipeline pipeline, ITaskItem source, ITaskItem destina
 
 		var context = new StepContext (source, destination) {
 			CodeGenerationTarget = codeGenerationTarget,
-			EnableMarshalMethods = EnableMarshalMethods,
 			IsAndroidAssembly = MonoAndroidHelper.IsAndroidAssembly (source),
 			IsDebug = Debug,
 			IsFrameworkAssembly = MonoAndroidHelper.IsFrameworkAssembly (source),
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs
deleted file mode 100644
index 9b2b3410641..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#nullable enable
-using System;
-using System.IO;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Collects TypeMap to be added to the final archive.
-/// </summary>
-public class CollectTypeMapFilesForArchive : AndroidTask
-{
-	public override string TaskPrefix => "CTM";
-
-	public string AndroidPackageFormat { get; set; } = "";
-
-	public ITaskItem [] TypeMappings { get; set; } = [];
-
-	[Output]
-	public ITaskItem [] FilesToAddToArchive { get; set; } = [];
-
-	public override bool RunTask ()
-	{
-		if (TypeMappings.Length == 0)
-			return true;
-
-		var rootPath = AndroidPackageFormat.Equals ("aab", StringComparison.InvariantCultureIgnoreCase) ? "root/" : "";
-		var files = new PackageFileListBuilder ();
-
-		foreach (var tm in TypeMappings)
-			files.AddItem (tm.ItemSpec, rootPath + Path.GetFileName (tm.ItemSpec));
-
-		FilesToAddToArchive = files.ToArray ();
-
-		return !Log.HasLoggedErrors;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs
deleted file mode 100644
index f13ab4bff79..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-#nullable enable
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-
-namespace Xamarin.Android.Tasks
-{
-	public class CreateTypeManagerJava : AndroidTask
-	{
-		public override string TaskPrefix => "CTMJ";
-
-		[Required]
-		public string ResourceName { get; set; } = "";
-
-		[Required]
-		public string OutputFilePath { get; set; } = "";
-
-		static readonly Assembly ExecutingAssembly = Assembly.GetExecutingAssembly ();
-
-		public override bool RunTask ()
-		{
-			string? content = ReadResource (ResourceName);
-
-			if (content.IsNullOrEmpty ()) {
-				return false;
-			}
-
-			var result = new StringBuilder ();
-			bool ignoring = false;
-			foreach (string line in content.Split ('\n')) {
-				if (!ignoring) {
-					if (ignoring = line.StartsWith ("//#MARSHAL_METHODS:START", StringComparison.Ordinal)) {
-						continue;
-					}
-					result.AppendLine (line);
-				} else if (line.StartsWith ("//#MARSHAL_METHODS:END", StringComparison.Ordinal)) {
-					ignoring = false;
-				}
-			}
-
-			if (result.Length == 0) {
-				Log.LogDebugMessage ("TypeManager.java not generated, empty resource data");
-				return false;
-			}
-
-			using (var ms = new MemoryStream ()) {
-				using (var sw = new StreamWriter (ms)) {
-					sw.Write (result.ToString ());
-					sw.Flush ();
-
-					if (Files.CopyIfStreamChanged (ms, OutputFilePath)) {
-						Log.LogDebugMessage ($"Wrote resource {OutputFilePath}.");
-					} else {
-						Log.LogDebugMessage ($"Resource {OutputFilePath} is unchanged. Skipping.");
-					}
-				}
-			}
-
-			return !Log.HasLoggedErrors;
-		}
-
-		string? ReadResource (string resourceName)
-		{
-			using (var from = ExecutingAssembly.GetManifestResourceStream (resourceName)) {
-				if (from == null) {
-					Log.LogCodedError ("XA0116", Properties.Resources.XA0116, resourceName);
-					return null;
-				}
-
-				using (var sr = new StreamReader (from)) {
-					return sr.ReadToEnd ();
-				}
-			}
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs
deleted file mode 100644
index 13080cd8a1a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-public class GenerateACWMap : AndroidTask
-{
-	public override string TaskPrefix => "ACW";
-
-	[Required]
-	public string AcwMapFile { get; set; } = "";
-
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	public override bool RunTask ()
-	{
-		GenerateMap ();
-
-		return !Log.HasLoggedErrors;
-	}
-
-	void GenerateMap ()
-	{
-		// Get the set of assemblies for the "first" ABI. The ACW map is
-		// not ABI-specific, so we can use any ABI to generate the wrappers.
-		var allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-		var singleArchAssemblies = allAssembliesPerArch.First ().Value.Values.ToList ();
-
-		var entries = new List<ACWMapEntry> ();
-
-		foreach (var assembly in singleArchAssemblies) {
-			var wrappersPath = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (assembly);
-
-			if (!File.Exists (wrappersPath)) {
-				Log.LogCodedError ("XA4264", Properties.Resources.XA4264, wrappersPath);
-				return;
-			}
-
-			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.AndroidResourceFixups);
-
-			entries.AddRange (xml.ACWMapEntries);
-		}
-
-		var acwMapGen = new ACWMapGenerator (Log);
-
-		acwMapGen.Generate (entries, AcwMapFile);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs
index 14c33bf1fb8..4e4b2872a08 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs
@@ -2,105 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using Java.Interop.Tools.JavaCallableWrappers;
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
 
 namespace Xamarin.Android.Tasks;
 
-public sealed class GenerateAdditionalProviderSources : AndroidTask
+internal static class GenerateAdditionalProviderSources
 {
-	public override string TaskPrefix => "GPS";
-
-	[Required]
-	public string [] AdditionalProviderSources { get; set; } = [];
-
-	[Required]
-	public string AndroidRuntime { get; set; } = "";
-
-	public string CodeGenerationTarget { get; set; } = "";
-
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	[Required]
-	public string OutputDirectory { get; set; } = "";
-
-	[Required]
-	public string TargetName { get; set; } = "";
-
-	public ITaskItem[]? Environments { get; set; }
-
-	// We need to pass this to the environment builder, otherwise not used
-	// by this task. See also GenerateNativeApplicationSources.cs
-	public bool EnableSGenConcurrent { get; set; }
-
-	AndroidRuntime androidRuntime;
-	JavaPeerStyle codeGenerationTarget;
-
-	public override bool RunTask ()
-	{
-		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
-		codeGenerationTarget = MonoAndroidHelper.ParseCodeGenerationTarget (CodeGenerationTarget);
-
-		// Retrieve the stored NativeCodeGenStateObject
-		var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<NativeCodeGenStateCollection> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenStateCollection)} not found");
-
-		// We only need the first architecture, since this task is architecture-agnostic
-		var templateCodeGenState = nativeCodeGenStates.States.First ().Value;
-
-		Generate (templateCodeGenState);
-
-		return !Log.HasLoggedErrors;
-	}
-
-	void Generate (NativeCodeGenStateObject codeGenState)
-	{
-		// Create additional runtime provider java sources.
-		bool isCoreCLR = androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.CoreCLR;
-
-		WriteAdditionalRuntimeProviderSources (OutputDirectory, isCoreCLR, AdditionalProviderSources);
-
-		// For NativeAOT, generate JavaInteropRuntime.java and NativeAotEnvironmentVars.java
-		if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.NativeAOT) {
-			GenerateNativeAotBootstrapFiles (Log, OutputDirectory, TargetName, Environments, EnableSGenConcurrent);
-		}
-
-		// Create additional application java sources.
-		StringWriter regCallsWriter = new StringWriter ();
-		regCallsWriter.WriteLine ("// Application and Instrumentation ACWs must be registered first.");
-
-		foreach ((string jniName, string assemblyQualifiedName) in codeGenState.ApplicationsAndInstrumentationsToRegister) {
-			regCallsWriter.WriteLine (
-				codeGenerationTarget == JavaPeerStyle.XAJavaInterop1 ?
-					"\t\tmono.android.Runtime.register (\"{0}\", {1}.class, {1}.__md_methods);" :
-					"\t\tnet.dot.jni.ManagedPeer.registerNativeMembers ({1}.class, {1}.__md_methods);",
-				assemblyQualifiedName,
-				jniName
-			);
-		}
-
-		regCallsWriter.Close ();
-
-		var real_app_dir = Path.Combine (OutputDirectory, "src", "net", "dot", "android");
-		string applicationTemplateFile = "ApplicationRegistration.java";
-		SaveResource (
-			applicationTemplateFile,
-			applicationTemplateFile,
-			real_app_dir,
-			template => template.Replace ("// REGISTER_APPLICATION_AND_INSTRUMENTATION_CLASSES_HERE", regCallsWriter.ToString ())
-		);
-
-	}
-
 	static string GetResource (string resource)
 	{
 		using (var stream = typeof (GenerateAdditionalProviderSources).Assembly.GetManifestResourceStream (resource))
@@ -110,8 +19,7 @@ static string GetResource (string resource)
 
 	/// <summary>
 	/// Writes the additional per-process runtime provider Java sources (e.g. NativeAotRuntimeProvider_1.java)
-	/// by cloning the runtime provider template for each name. Shared between the legacy (ILLink) and
-	/// trimmable build paths so both emit the extra providers a multi-process app declares in its manifest.
+	/// by cloning the runtime provider template for each name.
 	/// </summary>
 	internal static void WriteAdditionalRuntimeProviderSources (string outputDirectory, bool isCoreCLR, string [] additionalProviderSources)
 	{
@@ -131,16 +39,8 @@ internal static void WriteAdditionalRuntimeProviderSources (string outputDirecto
 		}
 	}
 
-	void SaveResource (string resource, string filename, string destDir, Func<string, string> applyTemplate)
-	{
-		string template = GetResource (resource);
-		template = applyTemplate (template);
-		Files.CopyIfStringChanged (template, Path.Combine (destDir, filename));
-	}
-
 	/// <summary>
 	/// Generates JavaInteropRuntime.java and NativeAotEnvironmentVars.java for NativeAOT apps.
-	/// Shared between the legacy (ILLink) and trimmable build paths.
 	/// </summary>
 	internal static void GenerateNativeAotBootstrapFiles (
 		Microsoft.Build.Utilities.TaskLoggingHelper log,
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
index d2373c22d00..87ed570b634 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
@@ -1,11 +1,9 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 namespace Xamarin.Android.Tasks;
 
@@ -25,24 +23,16 @@ public class GenerateEmptyTypemapStub : AndroidTask
 
 	public bool Debug { get; set; }
 
-	[Output]
-	public ITaskItem []? Sources { get; set; }
-
 	public override bool RunTask ()
 	{
 		Directory.CreateDirectory (OutputDirectory);
-		var sources = new List<ITaskItem> ();
 
 		foreach (var abi in Abis) {
 			string abiName = abi.ItemSpec;
 			string stubPath = Path.Combine (OutputDirectory, $"typemap.{abiName}.ll");
 			Files.CopyIfStringChanged (GenerateStubLlvmIr (abiName), stubPath);
-			var item = new TaskItem (stubPath);
-			item.SetMetadata ("abi", abiName);
-			sources.Add (item);
 		}
 
-		Sources = sources.ToArray ();
 		return !Log.HasLoggedErrors;
 	}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs
deleted file mode 100644
index 7090c72b94f..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
-using Java.Interop.Tools.TypeNameMappings;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using PackageNamingPolicyEnum = Java.Interop.Tools.TypeNameMappings.PackageNamingPolicy;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Transforms the XML files of JLOs found in the linker step into JavaCallableWrappers.
-/// </summary>
-public class GenerateJavaCallableWrappers : AndroidTask
-{
-	public override string TaskPrefix => "JCW";
-
-	[Required]
-	public string CodeGenerationTarget { get; set; } = "";
-
-	[Required]
-	public string OutputDirectory { get; set; } = "";
-
-	[Required]
-	public string PackageNamingPolicy { get; set; } = "";
-
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	[Output]
-	public ITaskItem [] GeneratedJavaFilesOutput { get; set; } = [];
-
-	public override bool RunTask ()
-	{
-		JavaNativeTypeManager.PackageNamingPolicy = Enum.TryParse (PackageNamingPolicy, out PackageNamingPolicyEnum pnp) ? pnp : PackageNamingPolicyEnum.LowercaseCrc64;
-
-		// Get the set of assemblies for the "first" ABI. JavaCallableWrappers are
-		// not ABI-specific, so we can use any ABI to generate the wrappers.
-		var allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-		var singleArchAssemblies = allAssembliesPerArch.First ().Value.Values.ToList ();
-
-		GenerateWrappers (singleArchAssemblies);
-
-		return !Log.HasLoggedErrors;
-	}
-
-	void GenerateWrappers (List<ITaskItem> assemblies)
-	{
-		Directory.CreateDirectory (OutputDirectory);
-
-		// Deserialize JavaCallableWrappers XML files
-		var wrappers = new List<CallableWrapperType> ();
-		var sw = Stopwatch.StartNew ();
-
-		foreach (var assembly in assemblies) {
-			var wrappersPath = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (assembly);
-
-			if (!File.Exists (wrappersPath)) {
-				Log.LogCodedError ("XA4264", Properties.Resources.XA4264, wrappersPath);
-				return;
-			}
-
-			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.JavaCallableWrappers);
-
-			if (xml.JavaCallableWrappers.Count == 0) {
-				Log.LogDebugMessage ($"'{wrappersPath}' is empty, skipping.");
-				continue;
-			}
-
-			wrappers.AddRange (xml.JavaCallableWrappers);
-		}
-
-		Log.LogDebugMessage ($"Deserialized {wrappers.Count} Java callable wrappers in {sw.ElapsedMilliseconds}ms");
-		sw.Restart ();
-
-		// Write JavaCallableWrappers to Java files
-		var writer_options = new CallableWrapperWriterOptions {
-			CodeGenerationTarget = MonoAndroidHelper.ParseCodeGenerationTarget (CodeGenerationTarget)
-		};
-
-		var generated_files = new List<ITaskItem> ();
-
-		foreach (var generator in wrappers) {
-			using var writer = MemoryStreamPool.Shared.CreateStreamWriter ();
-
-			generator.Generate (writer, writer_options);
-			writer.Flush ();
-
-			var path = generator.GetDestinationPath (OutputDirectory);
-
-			var changed = Files.CopyIfStreamChanged (writer.BaseStream, path);
-			Log.LogDebugMessage ($"*NEW* Generated Java callable wrapper code: '{path}' (changed: {changed})");
-
-			generated_files.Add (new TaskItem (path));
-		}
-
-		Log.LogDebugMessage ($"Generated {generated_files.Count} Java callable wrapper files in {sw.ElapsedMilliseconds}ms");
-		GeneratedJavaFilesOutput = generated_files.ToArray ();
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
deleted file mode 100644
index 22a4e7afcef..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (C) 2011 Xamarin, Inc. All rights reserved.
-
-#nullable enable
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.Diagnostics;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.JavaCallableWrappers.Adapters;
-using Java.Interop.Tools.TypeNameMappings;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	using PackageNamingPolicyEnum   = PackageNamingPolicy;
-
-	public class GenerateJavaStubs : AndroidTask
-	{
-		public const string NativeCodeGenStateRegisterTaskKey = ".:!MarshalMethods!:.";
-		public const string NativeCodeGenStateObjectRegisterTaskKey = ".:!MarshalMethodsObject!:.";
-
-		public override string TaskPrefix => "GJS";
-
-		[Required]
-		public ITaskItem[] ResolvedAssemblies { get; set; } = [];
-
-		[Required]
-		public ITaskItem[] ResolvedUserAssemblies { get; set; } = [];
-
-		[Required]
-		public ITaskItem [] FrameworkDirectories { get; set; } = [];
-
-		[Required]
-		public string [] SupportedAbis { get; set; } = [];
-
-		public string? IntermediateOutputDirectory { get; set; }
-		public bool EnableMarshalMethods { get; set; }
-
-		public bool Debug { get; set; }
-
-		[Required]
-		public string OutputDirectory { get; set; } = "";
-
-		public bool ErrorOnCustomJavaObject { get; set; }
-
-		public string? PackageNamingPolicy { get; set; }
-
-		[Required]
-		public string ApplicationJavaClass { get; set; } = "";
-
-		public string CodeGenerationTarget { get; set; } = "";
-
-		public bool EnableNativeRuntimeLinking { get; set; }
-
-		JavaPeerStyle codeGenerationTarget;
-
-		//[Output]
-		//public ITaskItem [] GeneratedJavaFilesOutput { get; set; }
-
-		internal const string AndroidSkipJavaStubGeneration = "AndroidSkipJavaStubGeneration";
-
-		public override bool RunTask ()
-		{
-			try {
-				codeGenerationTarget = MonoAndroidHelper.ParseCodeGenerationTarget (CodeGenerationTarget);
-				bool useMarshalMethods = !Debug && EnableMarshalMethods;
-				Run (useMarshalMethods);
-			} catch (XamarinAndroidException e) {
-				Log.LogCodedError (string.Format ("XA{0:0000}", e.Code), e.MessageWithoutCode);
-				if (MonoAndroidHelper.LogInternalExceptions)
-					Log.LogMessage (e.ToString ());
-			}
-
-			return !Log.HasLoggedErrors;
-		}
-
-		void Run (bool useMarshalMethods)
-		{
-			PackageNamingPolicy pnp;
-			JavaNativeTypeManager.PackageNamingPolicy = Enum.TryParse (PackageNamingPolicy, out pnp) ? pnp : PackageNamingPolicyEnum.LowercaseCrc64;
-
-			// We will process each architecture completely separately as both type maps and marshal methods are strictly per-architecture and
-			// the assemblies should be processed strictly per architecture.  Generation of JCWs, and the manifest are ABI-agnostic.
-			// We will generate them only for the first architecture, whichever it is.
-			Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-
-			// Should "never" happen...
-			if (allAssembliesPerArch.Count != SupportedAbis.Length) {
-				// ...but it happens at least in our `BuildAMassiveApp` test, where `SupportedAbis` mentions only the `x86` and `armeabi-v7a` ABIs, but `ResolvedAssemblies` contains
-				// entries for all the ABIs we support, so let's be flexible and ignore the extra architectures but still error out if there are less architectures than supported ABIs.
-				if (allAssembliesPerArch.Count < SupportedAbis.Length) {
-					throw new InvalidOperationException ($"Internal error: number of architectures ({allAssembliesPerArch.Count}) must equal the number of target ABIs ({SupportedAbis.Length})");
-				}
-			}
-
-			// ...or this...
-			foreach (string abi in SupportedAbis) {
-				AndroidTargetArch arch = MonoAndroidHelper.AbiToTargetArch (abi);
-				if (!allAssembliesPerArch.ContainsKey (arch)) {
-					throw new InvalidOperationException ($"Internal error: no assemblies for architecture '{arch}', which corresponds to target abi '{abi}'");
-				}
-			}
-
-			// ...as well as this
-			Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> userAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedUserAssemblies, SupportedAbis, validate: true);
-			foreach (var kvp in userAssembliesPerArch) {
-				if (!allAssembliesPerArch.TryGetValue (kvp.Key, out Dictionary<string, ITaskItem> allAssemblies)) {
-					throw new InvalidOperationException ($"Internal error: found user assemblies for architecture '{kvp.Key}' which isn't found in ResolvedAssemblies");
-				}
-
-				foreach (var asmKvp in kvp.Value) {
-					if (!allAssemblies.ContainsKey (asmKvp.Key)) {
-						throw new InvalidOperationException ($"Internal error: user assembly '{asmKvp.Value}' not found in ResolvedAssemblies");
-					}
-				}
-			}
-
-			// Now that "never" never happened, we can proceed knowing that at least the assembly sets are the same for each architecture
-			var nativeCodeGenStates = new ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState> ();
-			NativeCodeGenState? templateCodeGenState = null;
-			PinvokeScanner? pinvokeScanner = EnableNativeRuntimeLinking ? new PinvokeScanner (Log) : null;
-
-			var firstArch = allAssembliesPerArch.First ().Key;
-
-			// Process each architecture in parallel
-			Parallel.ForEach (allAssembliesPerArch, (kvp) => {
-				AndroidTargetArch arch = kvp.Key;
-				Dictionary<string, ITaskItem> archAssemblies = kvp.Value;
-
-				NativeCodeGenState? state = ScanTypesAndMaybeClassifyMarshalMethods (arch, archAssemblies, MaybeGetArchAssemblies (userAssembliesPerArch, arch), useMarshalMethods);
-
-				// If this is the first architecture, we need to store the state for later use
-				if (arch == firstArch) {
-					templateCodeGenState = state;
-				}
-
-				if (state != null) {
-					nativeCodeGenStates.TryAdd (arch, state);
-
-					if (pinvokeScanner != null && state != null) {
-						(bool success, List<PinvokeScanner.PinvokeEntryInfo>? pinfos) = ScanForUsedPinvokes (pinvokeScanner, arch, state.Resolver);
-						if (!success) {
-							return;
-						}
-						state.PinvokeInfos = pinfos;
-						Log.LogDebugMessage ($"Number of unique p/invokes for architecture '{arch}': {pinfos?.Count}");
-					}
-				}
-			});
-
-			if (templateCodeGenState == null) {
-				throw new InvalidOperationException ($"Internal error: no native code generator state defined");
-			}
-			JCWGenerator.EnsureAllArchitecturesAreIdentical (Log, nativeCodeGenStates);
-
-			// Save NativeCodeGenState for later tasks
-			Log.LogDebugMessage ($"Saving {nameof (NativeCodeGenState)} to {nameof (NativeCodeGenStateRegisterTaskKey)}");
-			BuildEngine4.RegisterTaskObjectAssemblyLocal (MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory), nativeCodeGenStates, RegisteredTaskObjectLifetime.Build);
-		}
-
-		(bool success, List<PinvokeScanner.PinvokeEntryInfo>? pinfos) ScanForUsedPinvokes (PinvokeScanner scanner, AndroidTargetArch arch, XAAssemblyResolver resolver)
-		{
-			if (!EnableNativeRuntimeLinking) {
-				return (true, null);
-			}
-
-			var frameworkAssemblies = new List<ITaskItem> ();
-
-			foreach (ITaskItem asm in ResolvedAssemblies) {
-				string? metadata = asm.GetMetadata ("FrameworkAssembly");
-				if (String.IsNullOrEmpty (metadata)) {
-					continue;
-				}
-
-				if (!Boolean.TryParse (metadata, out bool isFrameworkAssembly) || !isFrameworkAssembly) {
-					continue;
-				}
-
-				frameworkAssemblies.Add (asm);
-			}
-
-			var pinfos = scanner.Scan (arch, resolver, frameworkAssemblies);
-			return (true, pinfos);
-		}
-
-		internal static Dictionary<string, ITaskItem> MaybeGetArchAssemblies (Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> dict, AndroidTargetArch arch)
-		{
-			if (!dict.TryGetValue (arch, out Dictionary<string, ITaskItem> archDict)) {
-				return new Dictionary<string, ITaskItem> (StringComparer.OrdinalIgnoreCase);
-			}
-
-			return archDict;
-		}
-
-		NativeCodeGenState? ScanTypesAndMaybeClassifyMarshalMethods (AndroidTargetArch arch, Dictionary<string, ITaskItem> assemblies, Dictionary<string, ITaskItem> userAssemblies, bool useMarshalMethods)
-		{
-			XAAssemblyResolver resolver = MonoAndroidHelper.MakeResolver (Log, useMarshalMethods, arch, assemblies);
-			var tdCache = new TypeDefinitionCache ();
-			(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) = ScanForJavaTypes (resolver, tdCache, assemblies, userAssemblies, useMarshalMethods);
-
-			MarshalMethodsCollection? marshalMethodsCollection = null;
-
-			if (useMarshalMethods)
-				marshalMethodsCollection = MarshalMethodsCollection.FromAssemblies (arch, assemblies.Values.ToList (), resolver, Log);
-
-			return new NativeCodeGenState (arch, tdCache, resolver, allJavaTypes, javaTypesForJCW, marshalMethodsCollection);
-		}
-
-		(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) ScanForJavaTypes (XAAssemblyResolver res, TypeDefinitionCache cache, Dictionary<string, ITaskItem> assemblies, Dictionary<string, ITaskItem> userAssemblies, bool useMarshalMethods)
-		{
-			var scanner = new XAJavaTypeScanner (res.TargetArch, Log, cache) {
-				ErrorOnCustomJavaObject     = ErrorOnCustomJavaObject,
-			};
-			List<TypeDefinition> allJavaTypes = scanner.GetJavaTypes (assemblies.Values, res);
-
-			var javaTypesForJCW = new List<TypeDefinition> ();
-
-			// When marshal methods or non-JavaPeerStyle.XAJavaInterop1 are in use we do not want to skip non-user assemblies (such as Mono.Android) - we need to generate JCWs for them during
-			// application build, unlike in Debug configuration or when marshal methods are disabled, in which case we use JCWs generated during Xamarin.Android
-			// build and stored in a jar file.
-			bool shouldSkipNonUserAssemblies = !useMarshalMethods && codeGenerationTarget == JavaPeerStyle.XAJavaInterop1;
-			Log.LogDebugMessage ($"Should skip non-user assemblies: {shouldSkipNonUserAssemblies} (useMarshalMethods: {useMarshalMethods})");
-
-			foreach (TypeDefinition type in allJavaTypes) {
-				if ((shouldSkipNonUserAssemblies && !userAssemblies.ContainsKey (type.Module.Assembly.Name.Name)) || JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (type, cache)) {
-					continue;
-				}
-				javaTypesForJCW.Add (type);
-			}
-
-			return (allJavaTypes, javaTypesForJCW);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs
deleted file mode 100644
index 198ef41ca7d..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-public class GenerateMainAndroidManifest : AndroidTask
-{
-	public override string TaskPrefix => "GMM";
-
-	[Output]
-	public string []? AdditionalProviderSources { get; set; }
-	[Required]
-	public string AndroidRuntime { get; set; } = "";
-	public string? AndroidSdkDir { get; set; }
-	[Required]
-	public string AndroidApiLevel { get; set; } = "";
-	public string? ApplicationJavaClass { get; set; }
-	public string? ApplicationLabel { get; set; }
-	public string? BundledWearApplicationName { get; set; }
-	public string? CheckedBuild { get; set; }
-	public bool Debug { get; set; }
-	public bool EmbedAssemblies { get; set; }
-	public bool EnableNativeRuntimeLinking { get; set; }
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-	public string []? ManifestPlaceholders { get; set; }
-	public string? ManifestTemplate { get; set; }
-	public string? MergedAndroidManifestOutput { get; set; }
-	public string []? MergedManifestDocuments { get; set; }
-	public bool NeedsInternet { get; set; }
-	public string? PackageName { get; set; }
-	[Required]
-	public ITaskItem [] ResolvedUserAssemblies { get; set; } = [];
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-	public string? SupportedOSPlatformVersion { get; set; }
-	public string? VersionCode { get; set; }
-	public string? VersionName { get; set; }
-
-	AndroidRuntime androidRuntime;
-
-	public override bool RunTask ()
-	{
-		// Retrieve the stored NativeCodeGenState (and remove it from the cache)
-		var nativeCodeGenStates = BuildEngine4.UnregisterTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenState)} not found");
-
-		// We only need the first architecture, since this task is architecture-agnostic
-		var templateCodeGenState = nativeCodeGenStates.First ().Value;
-
-		var userAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedUserAssemblies, SupportedAbis, validate: true);
-
-		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
-
-		// Generate the merged manifest
-		var additionalProviders = MergeManifest (templateCodeGenState, GenerateJavaStubs.MaybeGetArchAssemblies (userAssembliesPerArch, templateCodeGenState.TargetArch));
-
-		AdditionalProviderSources = additionalProviders.ToArray ();
-
-		// We still need the NativeCodeGenState for later tasks, but we're going to transfer
-		// it to a new object that doesn't require holding open Cecil AssemblyDefinitions.
-		var nativeCodeGenStateObject = MarshalMethodCecilAdapter.GetNativeCodeGenStateCollection (Log, nativeCodeGenStates);
-
-		if (nativeCodeGenStateObject is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenStateCollection)} not created");
-
-		Log.LogDebugMessage ($"Saving {nameof (NativeCodeGenStateObject)} to {nameof (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey)}");
-		BuildEngine4.RegisterTaskObjectAssemblyLocal (MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory), nativeCodeGenStateObject, RegisteredTaskObjectLifetime.Build);
-
-		// Dispose the Cecil resolvers so the assemblies are closed.
-		Log.LogDebugMessage ($"Disposing all {nameof (NativeCodeGenState)}.{nameof (NativeCodeGenState.Resolver)}");
-
-		foreach (var state in nativeCodeGenStates.Values) {
-			state.Resolver.Dispose ();
-		}
-
-		if (Log.HasLoggedErrors && MergedAndroidManifestOutput != null) {
-			// Ensure that on a rebuild, we don't *skip* the `_GenerateJavaStubs` target,
-			// by ensuring that the target outputs have been deleted.
-			Files.DeleteFile (MergedAndroidManifestOutput, Log);
-		}
-
-		return !Log.HasLoggedErrors;
-	}
-
-	IList<string> MergeManifest (NativeCodeGenState codeGenState, Dictionary<string, ITaskItem> userAssemblies)
-	{
-		string targetSdkVersion = AndroidApiLevel;
-		if (MonoAndroidHelper.TryParseApiLevel (targetSdkVersion, out Version version)) {
-			targetSdkVersion = version.Major.ToString (CultureInfo.InvariantCulture);
-		}
-
-		var manifest = new ManifestDocument (ManifestTemplate) {
-			PackageName = PackageName,
-			VersionName = VersionName,
-			ApplicationLabel = ApplicationLabel ?? PackageName,
-			Placeholders = ManifestPlaceholders,
-			Resolver = codeGenState.Resolver,
-			SdkDir = AndroidSdkDir,
-			TargetSdkVersion = targetSdkVersion,
-			MinSdkVersion = MonoAndroidHelper.ConvertSupportedOSPlatformVersionToApiLevel (SupportedOSPlatformVersion).ToString (),
-			Debug = Debug,
-			NeedsInternet = NeedsInternet,
-			AndroidRuntime = androidRuntime,
-		};
-		// Only set manifest.VersionCode if there is no existing value in AndroidManifest.xml.
-		if (manifest.HasVersionCode) {
-			Log.LogDebugMessage ($"Using existing versionCode in: {ManifestTemplate}");
-		} else if (!VersionCode.IsNullOrEmpty ()) {
-			manifest.VersionCode = VersionCode;
-		}
-		manifest.Assemblies.AddRange (userAssemblies.Values.Select (item => item.ItemSpec));
-
-		if (!String.IsNullOrWhiteSpace (CheckedBuild)) {
-			// We don't validate CheckedBuild value here, this will be done in BuildApk. We just know that if it's
-			// on then we need android:debuggable=true and android:extractNativeLibs=true
-			manifest.ForceDebuggable = true;
-			manifest.ForceExtractNativeLibs = true;
-		}
-
-		IList<string> additionalProviders = manifest.Merge (Log, codeGenState.TypeCache, codeGenState.AllJavaTypes, ApplicationJavaClass, EmbedAssemblies, BundledWearApplicationName, MergedManifestDocuments);
-
-		// Only write the new manifest if it actually changed
-		if (manifest.SaveIfChanged (Log, MergedAndroidManifestOutput)) {
-			Log.LogDebugMessage ($"Saving: {MergedAndroidManifestOutput}");
-		}
-
-		return additionalProviders;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs
index afd984d81a4..eeecb6432fd 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs
@@ -9,8 +9,7 @@ namespace Xamarin.Android.Tasks;
 /// library and exposes the runtime init entry point) and NativeAotEnvironmentVars.java
 /// (bakes in environment variable names/values for the native runtime).
 ///
-/// These files are needed by NativeAotRuntimeProvider.java and must be generated regardless
-/// of the typemap implementation (managed or trimmable).
+/// These files are needed by NativeAotRuntimeProvider.java.
 ///
 /// Delegates to <see cref="GenerateAdditionalProviderSources.GenerateNativeAotBootstrapFiles"/>
 /// for the actual generation logic.
@@ -31,8 +30,7 @@ public sealed class GenerateNativeAotBootstrapSources : AndroidTask
 
 	// Names of the extra per-process runtime providers (e.g. NativeAotRuntimeProvider_1) that the
 	// manifest declares for components with a non-default android:process; their Java sources must be
-	// generated too. On the legacy path GenerateAdditionalProviderSources writes these; the trimmable
-	// path has no such task, so the bootstrap step handles them here.
+	// generated too.
 	public string [] AdditionalProviderSources { get; set; } = [];
 
 	public override bool RunTask ()
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
index 2eca13ffbb2..19940d834a1 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
@@ -73,7 +73,7 @@ public override bool RunTask ()
 			assemblies.Add (name, item);
 		}
 
-		XAAssemblyResolver resolver = MonoAndroidHelper.MakeResolver (Log, useMarshalMethods: false, targetArch, assemblies, loadDebugSymbols: false);
+		XAAssemblyResolver resolver = MonoAndroidHelper.MakeResolver (Log, targetArch, assemblies, loadDebugSymbols: false);
 		var pinvokeScanner = new PinvokeScanner (Log, debugLogging: false);
 		List<PinvokeScanner.PinvokeEntryInfo> pinfos = pinvokeScanner.Scan (targetArch, resolver, ResolvedAssemblies);
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
index b6f15fbf4a5..d333e1d899f 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
@@ -52,8 +52,6 @@ public class GenerateNativeApplicationConfigSources : AndroidTask
 		[Required]
 		public string AndroidRuntime { get; set; } = "";
 
-		public bool EnableMarshalMethods { get; set; }
-
 		/// <summary>
 		/// When <c>true</c>, descriptive comments are written into the generated LLVM IR.  They make
 		/// the <c>.ll</c> far easier to read, but have no effect on the object code produced from it.
@@ -99,8 +97,7 @@ public override bool RunTask ()
 			if (!SequencePointsModeParser.TryParse (AndroidSequencePointsMode, out sequencePointsMode))
 				sequencePointsMode = SequencePointsMode.None;
 
-			// Even though environment files were potentially parsed in GenerateJavaStubs, we need to do it here again because we might have additional environment
-			// files (generated by us) which weren't present by the time GeneratJavaStubs ran.
+			// Include generated environment files from the later stages of the build.
 			var envBuilder = new EnvironmentBuilder (Log, EnablePreloadAssembliesDefault, sequencePointsMode);
 			envBuilder.Read (Environments);
 
@@ -235,7 +232,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 				UsesAssemblyPreload = envBuilder.Parser.UsesAssemblyPreload,
 				AndroidPackageName = AndroidPackageName,
 				PackageNamingPolicy = pnp,
-				JniAddNativeMethodRegistrationAttributePresent = NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent,
+				JniAddNativeMethodRegistrationAttributePresent = false,
 				NumberOfAssembliesInApk = assemblyCount,
 				BundledAssemblyNameWidth = assemblyNameWidth,
 				NativeLibraries = uniqueNativeLibraries,
@@ -246,7 +243,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 				JNIEnvRegisterJniNativesToken = jnienv_registerjninatives_method_token,
 				JniRemappingReplacementTypeCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementTypeCount,
 				JniRemappingReplacementMethodIndexEntryCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementMethodIndexEntryCount,
-				MarshalMethodsEnabled = EnableMarshalMethods,
+				MarshalMethodsEnabled = false,
 				IgnoreSplitConfigs = ShouldIgnoreSplitConfigs (),
 				HaveAssemblyStore = UseAssemblyStore,
 			};
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
index 1b9ccf3caa7..db89fe63a2e 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
@@ -10,29 +10,11 @@
 namespace Xamarin.Android.Tasks;
 
 /// <summary>
-/// MSBuild task that generates native LLVM assembly source files containing marshal methods and
-/// optional P/Invoke preservation code. This task creates the final native code that bridges
-/// between .NET and Java/JNI, using the marshal method classifications and rewritten assemblies
-/// from previous pipeline stages.
+/// Generates an empty native marshal-method compatibility source and optional P/Invoke
+/// preservation code. The compatibility source supplies symbols expected by the native host.
 /// </summary>
 /// <remarks>
-/// This task is responsible for the final code generation phase of the marshal methods pipeline:
-/// 
-/// 1. **Marshal Methods Generation**: Creates LLVM IR code for native marshal methods that can
-///    be called directly from Java/JNI without dynamic registration overhead.
-/// 
-/// 2. **P/Invoke Preservation** (when EnableNativeRuntimeLinking=true): Generates additional 
-///    code to preserve P/Invoke methods that would otherwise be removed by native linking.
-/// 
-/// 3. **Runtime-Specific Code**: Adapts the generated code for the target runtime (MonoVM or CoreCLR),
-///    handling differences in runtime linking and method resolution.
-/// 
-/// 4. **Architecture Support**: Generates separate code files for each supported Android ABI
-///    (arm64-v8a, armeabi-v7a, x86_64, x86).
-/// 
-/// The task generates LLVM IR (.ll) files that are later compiled to native assembly by the
-/// Android NDK toolchain. Even when marshal methods are disabled, empty files are generated
-/// to maintain build consistency.
+/// The generated LLVM IR (.ll) is compiled with the other application native sources.
 /// </remarks>
 public class GenerateNativeMarshalMethodSources : AndroidTask
 {
@@ -41,12 +23,6 @@ public class GenerateNativeMarshalMethodSources : AndroidTask
 	/// </summary>
 	public override string TaskPrefix => "GNM";
 
-	/// <summary>
-	/// Gets or sets whether marshal methods generation is enabled.
-	/// When false, generates empty placeholder files to maintain build consistency.
-	/// </summary>
-	public bool EnableMarshalMethods { get; set; }
-
 	/// <summary>
 	/// Gets or sets whether native runtime linking is enabled.
 	/// When true, generates additional P/Invoke preservation code to prevent
@@ -68,31 +44,17 @@ public class GenerateNativeMarshalMethodSources : AndroidTask
 	public string EnvironmentOutputDirectory { get; set; } = "";
 
 	/// <summary>
-	/// Gets or sets the intermediate output directory path.
-	/// Used to retrieve native code generation state from previous pipeline stages.
-	/// </summary>
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	/// <summary>
-	/// Gets or sets the resolved assemblies to process for marshal method generation.
-	/// These assemblies have been processed by previous pipeline stages.
+	/// Gets or sets the resolved assemblies to process.
+	/// These assemblies are scanned for P/Invokes when native linking is enabled.
 	/// </summary>
 	[Required]
 	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
 
 	/// <summary>
-	/// Gets or sets the target Android runtime (MonoVM or CoreCLR).
-	/// Determines which runtime-specific code generator to use.
+	/// Gets or sets the target Android runtime.
 	/// </summary>
 	[Required]
-        public string AndroidRuntime { get; set; } = "";
-
-	/// <summary>
-	/// Gets or sets the satellite assemblies containing localized resources.
-	/// These are included in assembly counting and naming for native code generation.
-	/// </summary>
-	public ITaskItem [] SatelliteAssemblies { get; set; } = [];
+	public string AndroidRuntime { get; set; } = "";
 
 	/// <summary>
 	/// Gets or sets the list of supported Android ABIs to generate code for.
@@ -114,61 +76,44 @@ public class GenerateNativeMarshalMethodSources : AndroidTask
 	/// <remarks>
 	/// The execution flow is:
 	/// 
-	/// 1. Parse the Android runtime type (MonoVM or CoreCLR)
-	/// 2. Retrieve native code generation state from previous pipeline stages (if marshal methods enabled)
+	/// 1. Parse the Android runtime type
+	/// 2. Scan framework assemblies for P/Invokes when native linking is enabled
 	/// 3. Generate LLVM IR files for each supported ABI
-	/// 4. Handle both marshal methods and P/Invoke preservation code as needed
-	/// 
-	/// The native code generation state is removed from the cache after retrieval to ensure
-	/// it's not accidentally reused by subsequent build tasks.
+	/// 4. Write the empty marshal-method source
 	/// </remarks>
 	public override bool RunTask ()
 	{
-		NativeCodeGenStateCollection? nativeCodeGenStates = null;
 		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
 
-		// Retrieve native code generation state only if we need it
-		if (EnableMarshalMethods || EnableNativeRuntimeLinking) {
-			// Retrieve the stored NativeCodeGenStateCollection (and remove it from the cache)
-			nativeCodeGenStates = BuildEngine4.UnregisterTaskObjectAssemblyLocal<NativeCodeGenStateCollection> (
-				MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-				RegisteredTaskObjectLifetime.Build
-			);
-		}
-
 		// Generate native code for each supported ABI
 		foreach (var abi in SupportedAbis)
-			Generate (nativeCodeGenStates, abi);
+			Generate (abi);
 
 		return !Log.HasLoggedErrors;
 	}
 
 	/// <summary>
 	/// Generates native LLVM IR source files for a specific Android ABI.
-	/// Creates both marshal methods and optional P/Invoke preservation code.
+	/// Creates the empty marshal-method source and optional P/Invoke preservation code.
 	/// </summary>
-	/// <param name="nativeCodeGenStates">
-	/// Collection of native code generation states from previous pipeline stages.
-	/// May be null if marshal methods are disabled.
-	/// </param>
 	/// <param name="abi">The target Android ABI to generate code for (e.g., "arm64-v8a").</param>
 	/// <remarks>
 	/// This method handles the complete code generation workflow:
 	/// 
 	/// 1. **Setup**: Determines target architecture, file paths, and assembly information
-	/// 2. **Generator Creation**: Creates runtime-specific code generators (MonoVM or CoreCLR)
+	/// 2. **Generator Creation**: Creates the empty compatibility source
 	/// 3. **P/Invoke Preservation** (optional): Generates code to preserve P/Invoke methods
-	/// 4. **Marshal Methods**: Generates the main marshal methods LLVM IR code
+	/// 4. **Compatibility Stub**: Generates the empty marshal-method LLVM IR
 	/// 5. **File Output**: Writes generated code to disk with proper error handling
 	/// 
 	/// The generated files are:
-	/// - `marshal_methods.{abi}.ll`: Main marshal methods LLVM IR
+	/// - `marshal_methods.{abi}.ll`: Empty marshal-method compatibility LLVM IR
 	/// - `pinvoke_preserve.{abi}.ll`: P/Invoke preservation code (when native linking enabled)
 	/// 
 	/// Both generators construct an LLVM IR module and then generate the actual code,
 	/// with proper stream management and error recovery in case of partial writes.
 	/// </remarks>
-	void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
+	void Generate (string abi)
 	{
 		// Setup target information and file paths
 		var targetAbi = abi.ToLowerInvariant ();
@@ -177,18 +122,16 @@ void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
 		var pinvokePreserveBaseAsmFilePath = EnableNativeRuntimeLinking ? Path.Combine (EnvironmentOutputDirectory, $"pinvoke_preserve.{targetAbi}") : null;
 		var marshalMethodsLlFilePath = $"{marshalMethodsBaseAsmFilePath}.ll";
 		var pinvokePreserveLlFilePath = pinvokePreserveBaseAsmFilePath != null ? $"{pinvokePreserveBaseAsmFilePath}.ll" : null;
-		var (_, uniqueAssemblyNames) = GetAssemblyCountAndUniqueNames ();
-
-		// Create the appropriate runtime-specific generator
+		// Generate the native host's empty marshal-method compatibility symbols.
 		MarshalMethodsNativeAssemblyGenerator marshalMethodsAsmGen = androidRuntime switch {
-			Tasks.AndroidRuntime.CoreCLR => MakeGenerator (),
+			Tasks.AndroidRuntime.CoreCLR => new MarshalMethodsNativeAssemblyGenerator (Log),
 			_ => throw new NotSupportedException ($"Internal error: unsupported runtime type '{androidRuntime}'")
 		};
 
 		// Generate P/Invoke preservation code if native linking is enabled
 		bool fileFullyWritten;
 		if (EnableNativeRuntimeLinking) {
-			var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, EnsureCodeGenState (nativeCodeGenStates, targetArch), MonoComponents);
+			var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, targetArch, ScanPInvokes (targetArch), MonoComponents);
 			LLVMIR.LlvmIrModule pinvokePreserveModule = pinvokePreserveGen.Construct ();
 			using var pinvokePreserveWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
 			fileFullyWritten = false;
@@ -221,101 +164,20 @@ void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
 				MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{marshalMethodsLlFilePath}'", marshalMethodsWriter.BaseStream);
 			}
 		}
-
-		/// <summary>
-		/// Creates a CoreCLR-specific marshal methods generator.
-		/// Handles both enabled and disabled marshal methods scenarios.
-		/// </summary>
-		/// <returns>A configured CoreCLR marshal methods generator.</returns>
-		MarshalMethodsNativeAssemblyGenerator MakeGenerator ()
-		{
-			if (EnableMarshalMethods) {
-				return new MarshalMethodsNativeAssemblyGenerator (
-					Log,
-					uniqueAssemblyNames,
-					EnsureCodeGenState (nativeCodeGenStates, targetArch)
-				);
-			}
-
-			// Generate empty/minimal code when marshal methods are disabled
-			return new MarshalMethodsNativeAssemblyGenerator (
-				Log,
-				targetArch,
-				uniqueAssemblyNames
-			);
-		}
 	}
 
-	/// <summary>
-	/// Counts the total number of assemblies and collects unique assembly names
-	/// from both resolved assemblies and satellite assemblies.
-	/// </summary>
-	/// <returns>
-	/// A tuple containing:
-	/// - assemblyCount: The total number of unique assemblies across all architectures
-	/// - uniqueAssemblyNames: A set of unique assembly names including culture information
-	/// </returns>
-	/// <remarks>
-	/// This method processes both main assemblies and satellite assemblies (for localization).
-	/// For satellite assemblies, the culture name is prepended to create unique identifiers
-	/// (e.g., "en-US/MyApp.resources.dll"). This information is used by the native code
-	/// generators to create appropriate lookup structures and assembly metadata.
-	/// </remarks>
-	(int assemblyCount, HashSet<string> uniqueAssemblyNames) GetAssemblyCountAndUniqueNames ()
+	List<PinvokeScanner.PinvokeEntryInfo> ScanPInvokes (AndroidTargetArch arch)
 	{
-		var assemblyCount = 0;
-		var archAssemblyNames = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
-		var uniqueAssemblyNames = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
-
-		// Process both main assemblies and satellite assemblies
-		foreach (var assembly in SatelliteAssemblies.Concat (ResolvedAssemblies)) {
-			var culture = MonoAndroidHelper.GetAssemblyCulture (assembly);
-			var fileName = Path.GetFileName (assembly.ItemSpec);
-			string assemblyName;
-
-			// Include culture information for satellite assemblies
-			if (culture.IsNullOrEmpty ()) {
-				assemblyName = fileName;
-			} else {
-				assemblyName = $"{culture}/{fileName}";
-			}
-
-			// Track all unique assembly names across architectures
-			uniqueAssemblyNames.Add (assemblyName);
-
-			// Count unique assemblies per architecture to avoid duplicates
-			if (!archAssemblyNames.Contains (assemblyName)) {
-				assemblyCount++;
-				archAssemblyNames.Add (assemblyName);
-			}
+		// Generated trimmable type map assemblies are attached only to the first ABI.
+		var assemblies = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: false);
+		if (!assemblies.TryGetValue (arch, out var archAssemblies)) {
+			throw new InvalidOperationException ($"No resolved assemblies for architecture '{arch}'.");
 		}
-
-		return (assemblyCount, uniqueAssemblyNames);
+		var frameworkAssemblies = archAssemblies.Values
+			.Where (assembly => bool.TryParse (assembly.GetMetadata ("FrameworkAssembly"), out bool isFramework) && isFramework)
+			.ToList ();
+		using var resolver = MonoAndroidHelper.MakeResolver (Log, arch, archAssemblies, loadDebugSymbols: false);
+		return new PinvokeScanner (Log).Scan (arch, resolver, frameworkAssemblies);
 	}
 
-	/// <summary>
-	/// Retrieves the native code generation state for a specific target architecture.
-	/// Validates that the required state exists and throws an exception if missing.
-	/// </summary>
-	/// <param name="nativeCodeGenStates">
-	/// The collection of native code generation states from previous pipeline stages.
-	/// </param>
-	/// <param name="targetArch">The target architecture to retrieve state for.</param>
-	/// <returns>The native code generation state for the specified architecture.</returns>
-	/// <exception cref="InvalidOperationException">
-	/// Thrown when the state collection is null or doesn't contain state for the target architecture.
-	/// </exception>
-	/// <remarks>
-	/// This method ensures that the required native code generation state is available
-	/// before attempting to generate marshal methods code. The state contains marshal method
-	/// classifications, assembly information, and other data needed for code generation.
-	/// </remarks>
-	NativeCodeGenStateObject EnsureCodeGenState (NativeCodeGenStateCollection? nativeCodeGenStates, AndroidTargetArch targetArch)
-	{
-		if (nativeCodeGenStates is null || !nativeCodeGenStates.States.TryGetValue (targetArch, out NativeCodeGenStateObject? state)) {
-			throw new InvalidOperationException ($"Internal error: missing native code generation state for architecture '{targetArch}'");
-		}
-
-		return state;
-	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs
deleted file mode 100644
index 873c927c969..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Java.Interop.Tools.Cecil;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-// Note: If/When this is converted to an incremental task, every build still needs to set:
-// NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent
-public class GenerateTypeMappings : AndroidTask
-{
-	public override string TaskPrefix => "GTM";
-
-	[Required]
-	public string AndroidRuntime { get; set; } = "";
-
-	public bool Debug { get; set; }
-
-	/// <summary>
-	/// When <c>true</c>, descriptive comments are written into the generated LLVM IR.  They make
-	/// the <c>.ll</c> far easier to read, but have no effect on the object code produced from it.
-	/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
-	/// </summary>
-	public bool EmitLlvmIrComments { get; set; }
-
-	public bool EnableMarshalMethods { get;set; }
-
-	[Output]
-	public ITaskItem [] GeneratedBinaryTypeMaps { get; set; } = [];
-
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	public bool SkipJniAddNativeMethodRegistrationAttributeScan { get; set; }
-
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	public string TypemapImplementation { get; set; } = "llvm-ir";
-
-	[Required]
-	public string TypemapOutputDirectory { get; set; } = "";
-
-	AndroidRuntime androidRuntime;
-	readonly List<ITaskItem> generatedBinaryTypeMaps = new List<ITaskItem> ();
-
-	public override bool RunTask ()
-	{
-		var useMarshalMethods = !Debug && EnableMarshalMethods;
-
-		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
-		if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.NativeAOT) {
-			// NativeAOT uses the trimmable type map, generated by the `GenerateTrimmableTypeMap` task
-			Log.LogDebugMessage ("Skipping type maps for NativeAOT.");
-			return !Log.HasLoggedErrors;
-		}
-
-		// If using marshal methods, we cannot use the .typemap.xml files currently because
-		// the type token ids were changed by the marshal method rewriter after we wrote the .xml files.
-		if (!useMarshalMethods)
-			GenerateAllTypeMappings ();
-
-		// Generate typemaps from the native code generator state (produced by the marshal method rewriter)
-		if (useMarshalMethods)
-			GenerateAllTypeMappingsFromNativeState (useMarshalMethods);
-
-		GeneratedBinaryTypeMaps = generatedBinaryTypeMaps.ToArray ();
-		return !Log.HasLoggedErrors;
-	}
-
-	void GenerateAllTypeMappings ()
-	{
-		var allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-
-		foreach (var set in allAssembliesPerArch)
-			GenerateTypeMap (set.Key, set.Value.Values.ToList ());
-	}
-
-	void GenerateTypeMap (AndroidTargetArch arch, List<ITaskItem> assemblies)
-	{
-		Log.LogDebugMessage ($"Generating type maps for architecture '{arch}'");
-
-		var state = TypeMapObjectsFileAdapter.Create (arch, assemblies, Log);
-
-		// An error was already logged to Log.LogError
-		if (state is null)
-			return;
-
-		if (TypemapImplementation != "llvm-ir") {
-			Log.LogDebugMessage ($"TypemapImplementation='{TypemapImplementation}' will write an empty native typemap.");
-			state.XmlFiles.Clear ();
-		}
-
-		var tmg = new TypeMapGenerator (Log, state, androidRuntime) {
-			EmitComments = EmitLlvmIrComments,
-		};
-		tmg.Generate (Debug, SkipJniAddNativeMethodRegistrationAttributeScan, TypemapOutputDirectory);
-
-		// Set for use by <GeneratePackageManagerJava/> task later
-		NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent = state.JniAddNativeMethodRegistrationAttributePresent;
-
-		AddOutputTypeMaps (tmg, state.TargetArch);
-	}
-
-	void GenerateAllTypeMappingsFromNativeState (bool useMarshalMethods)
-	{
-		// Retrieve the stored NativeCodeGenState
-		var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenState)} not found");
-
-		NativeCodeGenState? templateCodeGenState = null;
-
-		foreach (var kvp in nativeCodeGenStates) {
-			NativeCodeGenState state = kvp.Value;
-			templateCodeGenState = state;
-			GenerateTypeMapFromNativeState (state, useMarshalMethods);
-		}
-
-		if (templateCodeGenState is null)
-			throw new InvalidOperationException ($"Internal error: no native code generator state defined");
-
-		// Set for use by <GenerateNativeApplicationConfigSources/> task later
-		if (useMarshalMethods)
-			NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent = templateCodeGenState.JniAddNativeMethodRegistrationAttributePresent;
-	}
-
-	void GenerateTypeMapFromNativeState (NativeCodeGenState state, bool useMarshalMethods)
-	{
-		if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.NativeAOT) {
-			// NativeAOT uses the trimmable type map, generated by the `GenerateTrimmableTypeMap` task
-			Log.LogDebugMessage ("Skipping type maps for NativeAOT.");
-			return;
-		}
-		Log.LogDebugMessage ($"Generating type maps from native state for architecture '{state.TargetArch}'");
-
-		if (TypemapImplementation != "llvm-ir") {
-			Log.LogDebugMessage ($"TypemapImplementation='{TypemapImplementation}' will write an empty native typemap.");
-			state = new NativeCodeGenState (state.TargetArch, new TypeDefinitionCache (), state.Resolver, [], [], state.Classifier);
-		}
-
-		var tmg = new TypeMapGenerator (Log, new NativeCodeGenStateAdapter (state), androidRuntime) {
-			EmitComments = EmitLlvmIrComments,
-		};
-		tmg.Generate (Debug, SkipJniAddNativeMethodRegistrationAttributeScan, TypemapOutputDirectory);
-
-		AddOutputTypeMaps (tmg, state.TargetArch);
-	}
-
-	void AddOutputTypeMaps (TypeMapGenerator tmg, AndroidTargetArch arch)
-	{
-		string abi = MonoAndroidHelper.ArchToAbi (arch);
-
-		foreach (string file in tmg.GeneratedBinaryTypeMaps) {
-			var item = new TaskItem (file);
-			string fileName = Path.GetFileName (file);
-			item.SetMetadata ("DestinationSubPath", $"{abi}/{fileName}");
-			item.SetMetadata ("DestinationSubDirectory", $"{abi}/");
-			item.SetMetadata ("Abi", abi);
-			generatedBinaryTypeMaps.Add (item);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs
deleted file mode 100644
index 0ccfeba1568..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2011 Xamarin, Inc. All rights reserved.
-#nullable enable
-using System;
-using System.IO;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Android.Build.Tasks;
-
-namespace Xamarin.Android.Tasks
-{
-	public class GetMonoPlatformJar : AndroidTask
-	{
-		public override string TaskPrefix => "GMJ";
-
-		[Required]
-		public string TargetFrameworkDirectory { get; set; } = "";
-
-		[Output]
-		public string? MonoPlatformJarPath { get; set; }
-
-		[Output]
-		public string? MonoPlatformDexPath { get; set; }
-
-		public override bool RunTask ()
-		{
-			var directories = TargetFrameworkDirectory.Split (new char[] { ';', ','} ,StringSplitOptions.RemoveEmptyEntries);
-
-			foreach (var dir in directories)
-				if (File.Exists (Path.Combine (dir, "mono.android.jar"))) {
-					MonoPlatformJarPath = Path.Combine (dir, "mono.android.jar");
-					MonoPlatformDexPath = Path.ChangeExtension (MonoPlatformJarPath, ".dex");
-					Log.LogMessage (MessageImportance.Low, "  MonoPlatformJarPath: {0}", MonoPlatformJarPath);
-					Log.LogMessage (MessageImportance.Low, "  MonoPlatformDexPath: {0}", MonoPlatformDexPath);
-
-					return true;
-				}
-
-			Log.LogCodedError ("XA0002", Properties.Resources.XA0002);
-
-			return false;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs
deleted file mode 100644
index f34be506849..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#nullable enable
-
-using System.Collections.Generic;
-using System.IO;
-using Java.Interop.Tools.Cecil;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using MonoDroid.Tuner;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Runs <see cref="FixLegacyResourceDesignerStep"/> on assemblies that are about to be
-/// trimmed by ILLink. This rewrites library assemblies so their resource field accesses
-/// (ldsfld) become calls to the designer assembly's property getters.
-///
-/// Running this *before* ILLink means the trimmer sees the rewritten IL and can freely
-/// trim unused designer types/fields. This avoids the need to root the entire designer
-/// assembly during trimming (which causes an APK size regression).
-///
-/// Modified assemblies are written to <see cref="OutputDirectory"/> rather than in-place,
-/// to avoid mutating files in the shared NuGet cache or shared intermediate output paths.
-/// </summary>
-public class PreTrimmingFixLegacyDesigner : AndroidTask
-{
-	public override string TaskPrefix => "PTD";
-
-	[Required]
-	public ITaskItem [] Assemblies { get; set; } = [];
-
-	[Required]
-	public string TargetName { get; set; } = "";
-
-	[Required]
-	public string OutputDirectory { get; set; } = "";
-
-	public bool Deterministic { get; set; }
-
-	[Output]
-	public ITaskItem []? ModifiedAssemblies { get; set; }
-
-	public override bool RunTask ()
-	{
-		Directory.CreateDirectory (OutputDirectory);
-
-		using var resolver = new DirectoryAssemblyResolver (
-			this.CreateTaskLogger (), loadDebugSymbols: true);
-
-		foreach (var assembly in Assemblies) {
-			var dir = Path.GetFullPath (Path.GetDirectoryName (assembly.ItemSpec) ?? "");
-			if (!resolver.SearchDirectories.Contains (dir)) {
-				resolver.SearchDirectories.Add (dir);
-			}
-		}
-
-		var linkContext = new MSBuildLinkContext (resolver, Log);
-		var fixLegacyStep = new FixLegacyResourceDesignerStep ();
-		fixLegacyStep.Initialize (linkContext);
-
-		var modified = new List<ITaskItem> ();
-
-		foreach (var item in Assemblies) {
-			// Match the filtering in FixLegacyResourceDesignerStep.ProcessAssembly:
-			// skip the main assembly and framework/BCL assemblies.
-			if (Path.GetFileNameWithoutExtension (item.ItemSpec) == TargetName) {
-				continue;
-			}
-			if (MonoAndroidHelper.IsFrameworkAssembly (item)) {
-				continue;
-			}
-
-			var assembly = resolver.GetAssembly (item.ItemSpec);
-			if (fixLegacyStep.ProcessAssemblyDesigner (assembly)) {
-				var outputPath = Path.Combine (OutputDirectory, Path.GetFileName (item.ItemSpec));
-				Log.LogDebugMessage ($"  Writing modified assembly: {outputPath}");
-				assembly.Write (outputPath, new WriterParameters {
-					WriteSymbols = assembly.MainModule.HasSymbols,
-					DeterministicMvid = Deterministic,
-				});
-
-				var outputItem = new TaskItem (outputPath);
-				item.CopyMetadataTo (outputItem);
-				outputItem.SetMetadata ("OriginalPath", item.ItemSpec);
-				modified.Add (outputItem);
-			}
-		}
-
-		ModifiedAssemblies = modified.ToArray ();
-
-		return !Log.HasLoggedErrors;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
index 5dee3987f54..1f77da7a250 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
@@ -12,7 +12,6 @@ namespace Xamarin.Android.Tasks
 	public class PrepareAbiItems : AndroidTask
 	{
 		const string ArmV7a = "armeabi-v7a";
-		const string TypeMapBase = "typemaps";
 		const string EnvBase = "environment";
 		const string CompressedAssembliesBase = "compressed_assemblies";
 		const string JniRemappingBase = "jni_remap";
@@ -46,9 +45,7 @@ public override bool RunTask ()
 			var includes = new List<ITaskItem> ();
 			string baseName;
 
-			if (MonoAndroidHelper.StringEquals ("typemap", Mode, StringComparison.OrdinalIgnoreCase)) {
-				baseName = TypeMapBase;
-			} else if (MonoAndroidHelper.StringEquals ("environment", Mode, StringComparison.OrdinalIgnoreCase)) {
+			if (MonoAndroidHelper.StringEquals ("environment", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = EnvBase;
 			} else if (MonoAndroidHelper.StringEquals ("compressed", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = CompressedAssembliesBase;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs b/src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs
deleted file mode 100644
index 3f37284588f..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (C) 2011, Xamarin Inc.
-// Copyright (C) 2010, Novell Inc.
-#nullable enable
-using System;
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Microsoft.Android.Build.Tasks;
-using Java.Interop.Tools.Cecil;
-
-namespace Xamarin.Android.Tasks
-{
-	public class RemoveRegisterAttribute : AndroidTask
-	{
-		public override string TaskPrefix => "RRA";
-
-		const string RegisterAttribute = "Android.Runtime.RegisterAttribute";
-
-		[Required]
-		public ITaskItem[] ShrunkFrameworkAssemblies { get; set; } = [];
-
-		public override bool RunTask ()
-		{
-			// Find Mono.Android.dll
-			var mono_android = ShrunkFrameworkAssemblies.First (f => Path.GetFileNameWithoutExtension (f.ItemSpec) == "Mono.Android").ItemSpec;
-			var path = Path.GetFullPath (Path.GetDirectoryName (mono_android));
-			using var resolver = new DirectoryAssemblyResolver (this.CreateTaskLogger (), loadDebugSymbols: false, loadReaderParameters: new ReaderParameters { ReadWrite = true });
-			resolver.SearchDirectories.Add (path);
-			
-			using (var assembly = resolver.Load (mono_android)) {
-				if (assembly is null) {
-					Log.LogCodedError ("XA2024", Properties.Resources.XA2024, mono_android);
-					return false;
-				}
-
-				// Strip out [Register] attributes
-				foreach (TypeDefinition type in assembly.MainModule.Types)
-					ProcessType (type);
-
-				assembly.Write ();
-			}
-			
-			return true;
-		}
-
-		private static void ProcessType (TypeDefinition type)
-		{
-			if (type.HasFields)
-				foreach (FieldDefinition field in type.Fields)
-					ProcessAttributeProvider (field);
-
-			if (type.HasMethods)
-				foreach (MethodDefinition method in type.Methods)
-					ProcessAttributeProvider (method);
-		}
-
-		private static void ProcessAttributeProvider (Mono.Cecil.ICustomAttributeProvider provider)
-		{
-			if (!provider.HasCustomAttributes)
-				return;
-
-			for (int i = 0; i < provider.CustomAttributes.Count; i++) {
-				if (!IsRegisterAttribute (provider.CustomAttributes [i]))
-					continue;
-
-				provider.CustomAttributes.RemoveAt (i--);
-			}
-		}
-
-		private static bool IsRegisterAttribute (CustomAttribute attribute)
-		{
-			return attribute.Constructor.DeclaringType.FullName == RegisterAttribute;
-		}
-	}
-}
-
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs b/src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs
deleted file mode 100644
index bfa22dce788..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// MSBuild task that rewrites .NET assemblies to use marshal methods instead of dynamic JNI registration.
-/// This task modifies method implementations to use efficient native callbacks with [UnmanagedCallersOnly]
-/// attributes, significantly improving startup performance and reducing runtime overhead for Android applications.
-/// </summary>
-/// <remarks>
-/// This task operates on the marshal method classifications produced by earlier pipeline stages and:
-/// 
-/// 1. Retrieves marshal method classifications from the build pipeline state
-/// 2. Rewrites assemblies to replace dynamic registration with static marshal methods
-/// 3. Reports statistics on marshal method generation and any fallback to dynamic registration
-/// 
-/// The rewriting process creates native callback wrappers for methods that have non-blittable
-/// parameters or return types, ensuring compatibility with the [UnmanagedCallersOnly] attribute
-/// while maintaining proper marshaling semantics.
-/// </remarks>
-public class RewriteMarshalMethods : AndroidTask
-{
-	/// <summary>
-	/// Gets the task prefix used for logging and error messages.
-	/// </summary>
-	public override string TaskPrefix => "RMM";
-
-	/// <summary>
-	/// Gets or sets the intermediate output directory path. Required for retrieving
-	/// build state objects that contain marshal method classifications.
-	/// </summary>
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	/// <summary>
-	/// Executes the marshal method rewriting task. This is the main entry point that
-	/// coordinates the entire assembly rewriting process across all target architectures.
-	/// </summary>
-	/// <returns>
-	/// true if the task completed successfully; false if errors occurred during processing.
-	/// </returns>
-	/// <remarks>
-	/// The execution flow is:
-	/// 
-	/// 1. Retrieve native code generation state from previous pipeline stages
-	/// 2. For each target architecture:
-	///    - Rewrite assemblies to use marshal methods
-	///    - Add special case methods (e.g., TypeManager methods)
-	/// 3. Report statistics on marshal method generation
-	/// 4. Log warnings for methods that must fall back to dynamic registration
-	/// </remarks>
-	public override bool RunTask ()
-	{
-		// Retrieve the stored NativeCodeGenState from the build pipeline
-		// This contains marshal method classifications from earlier stages
-		var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenState)} not found");
-
-		// Process each target architecture
-		foreach (var kvp in nativeCodeGenStates) {
-			NativeCodeGenState state = kvp.Value;
-
-			if (state.Classifier is null) {
-				Log.LogError ("state.Classifier cannot be null if marshal methods are enabled");
-				return false;
-			}
-
-			RewriteMethods (state);
-			state.Classifier.AddSpecialCaseMethods ();
-
-			// Report statistics on marshal method generation
-			Log.LogDebugMessage ($"[{state.TargetArch}] Number of generated marshal methods: {state.Classifier.MarshalMethods.Count}");
-			if (state.Classifier.DynamicallyRegisteredMarshalMethods.Count > 0) {
-				Log.LogWarning ($"[{state.TargetArch}] Number of methods in the project that will be registered dynamically: {state.Classifier.DynamicallyRegisteredMarshalMethods.Count}");
-			}
-
-			// Count and report methods that need blittable workaround wrappers
-			var wrappedCount = state.Classifier.MarshalMethods.Sum (m => m.Value.Count (m2 => m2.NeedsBlittableWorkaround));
-
-			if (wrappedCount > 0) {
-				// TODO: change to LogWarning once the generator can output code which requires no non-blittable wrappers
-				Log.LogDebugMessage ($"[{state.TargetArch}] Number of methods in the project that need marshal method wrappers: {wrappedCount}");
-			}
-		}
-
-		return !Log.HasLoggedErrors;
-	}
-
-	/// <summary>
-	/// Performs the actual assembly rewriting for a specific target architecture.
-	/// Creates and executes the <see cref="MarshalMethodsAssemblyRewriter"/> that handles
-	/// the low-level assembly modification operations.
-	/// </summary>
-	/// <param name="state">The native code generation state containing marshal method classifications and resolver.</param>
-	/// <remarks>
-	/// This method delegates the complex assembly rewriting logic to the specialized
-	/// <see cref="MarshalMethodsAssemblyRewriter"/> class, which handles:
-	/// - Adding [UnmanagedCallersOnly] attributes to native callbacks
-	/// - Generating wrapper methods for non-blittable types
-	/// - Modifying assembly references and imports
-	/// </remarks>
-	void RewriteMethods (NativeCodeGenState state)
-	{
-		if (state.Classifier == null) {
-			return;
-		}
-
-		var rewriter = new MarshalMethodsAssemblyRewriter (Log, state.TargetArch, state.Classifier, state.Resolver);
-		rewriter.Rewrite ();
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
index 765f6b22b30..95c1cc36fa7 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -102,22 +102,21 @@ public void BasicApplicationPublishReadyToRun ([Values] bool isComposite, [Value
 		}
 
 		[Test]
-		public void AndroidEnableMarshalMethodsWithReadyToRunFailsBuild ()
+		public void AndroidEnableMarshalMethodsFailsBuild ([Values (false, true)] bool publishReadyToRun)
 		{
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = true,
 				EnableMarshalMethods = true,
 			};
 			proj.SetRuntime (AndroidRuntime.CoreCLR);
-			proj.SetProperty ("PublishReadyToRun", "true");
+			proj.SetProperty ("PublishReadyToRun", publishReadyToRun.ToString ());
 
 			using var b = CreateApkBuilder ();
 			b.ThrowOnBuildFailure = false;
 			Assert.IsFalse (b.Build (proj), "Build should have failed.");
 			StringAssertEx.Contains ("error XA1049", b.LastBuildOutput);
 			StringAssertEx.Contains ("AndroidEnableMarshalMethods", b.LastBuildOutput);
-			StringAssertEx.Contains ("PublishReadyToRun", b.LastBuildOutput);
-			StringAssertEx.DoesNotContain ("XARMM7015", b.LastBuildOutput, "Build should fail before rewriting ReadyToRun assemblies.");
+			StringAssertEx.Contains ("no longer supported", b.LastBuildOutput);
 		}
 
 		[Test]
@@ -2187,72 +2186,6 @@ public void Plugin_Maui_Audio ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.N
 			Assert.IsTrue (DexUtils.ContainsClass (className, dexFile, AndroidSdkPath), $"`{dexFile}` should include `{className}`!");
 		}
 
-		[Test]
-		public void MarshalMethodsUnhandledExceptionRuntimeFixUpWorks ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
-		{
-			const bool isRelease = true;
-			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
-				return;
-			}
-
-			switch (runtime) {
-				case AndroidRuntime.NativeAOT:
-					Assert.Ignore ("NativeAOT does not support marshal methods");
-					break;
-
-				case AndroidRuntime.CoreCLR:
-					Assert.Ignore ("CoreCLR currently doesn't work due to a bug in Mono.Cecil");
-					break;
-			}
-
-			var proj = new XamarinAndroidApplicationProject {
-				IsRelease = isRelease,
-				EnableMarshalMethods = true,
-			};
-			proj.SetRuntime (runtime);
-			using var builder = CreateApkBuilder ();
-			Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
-
-			string monoAndroidRuntimePath = Path.Combine (
-				Root,
-				builder.ProjectDirectory,
-				proj.IntermediateOutputPath,
-				"android-arm64",
-				"linked",
-				"Mono.Android.Runtime.dll"
-			);
-			FileAssert.Exists (monoAndroidRuntimePath);
-
-			using var asm = AssemblyDefinition.ReadAssembly (monoAndroidRuntimePath);
-			const string TypeName = "Android.Runtime.AndroidEnvironmentInternal";
-			TypeDefinition? type = null;
-
-			foreach (ModuleDefinition module in asm.Modules) {
-				foreach (TypeDefinition t in module.Types) {
-					if (t.FullName.Equals (TypeName, StringComparison.Ordinal)) {
-						type = t;
-						break;
-					}
-				}
-			}
-
-			Assert.NotNull (type, $"Failed to find the '{TypeName}' type in '{monoAndroidRuntimePath}'");
-			Assert.IsTrue (type.IsPublic, $"Type '{TypeName}' should be public");
-
-			// Additionally verify that the UnhandledException method is also public
-			const string MethodName = "UnhandledException";
-			MethodDefinition? method = null;
-			foreach (MethodDefinition m in type.Methods) {
-				if (m.Name.Equals (MethodName, StringComparison.Ordinal)) {
-					method = m;
-					break;
-				}
-			}
-
-			Assert.NotNull (method, $"Failed to find the '{MethodName}' method in type '{TypeName}'");
-			Assert.IsTrue (method.IsPublic, $"Method '{MethodName}' should be public");
-		}
-
 		[Test]
 		public void InvalidCustomJniInitFunctionName ()
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
index c0a8b4d6fcc..1eed625101d 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
@@ -430,7 +430,6 @@ public void BuildSolutionWithMultipleProjectsInParallel ([Values (AndroidRuntime
 					ProjectName = $"App{i}",
 					PackageName = $"com.companyname.App{i}",
 					IsRelease = isRelease,
-					EnableMarshalMethods = true,
 				};
 
 				app1.SetRuntime (runtime);
@@ -1470,8 +1469,8 @@ public void GenerateJavaStubsAndAssembly ([Values] bool isRelease, [Values (Andr
 		readonly string [] ExpectedAssemblyFiles = new [] {
 			Path.Combine ("android", "environment.@ABI@.o"),
 			Path.Combine ("android", "environment.@ABI@.ll"),
-			Path.Combine ("android", "typemaps.@ABI@.o"),
-			Path.Combine ("android", "typemaps.@ABI@.ll"),
+			Path.Combine ("android", "typemap.@ABI@.o"),
+			Path.Combine ("android", "typemap.@ABI@.ll"),
 			Path.Combine ("app_shared_libraries", "@ABI@", "libxamarin-app.so")
 		};
 
@@ -1951,50 +1950,5 @@ public void UniversalApkFromBundleIsIncremental ()
 			builder.Output.AssertTargetIsSkipped ("_CreateUniversalApkFromBundle");
 		}
 
-		[Test]
-		public void AfterILLinkAdditionalStepsIsSkippedOnSecondBuild ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
-		{
-			bool isRelease = runtime == AndroidRuntime.NativeAOT;
-			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
-				return;
-			}
-			if (IgnoreOnNativeAot (runtime, "the trimmable typemap (the NativeAOT default) generates the typemap at compile time, so `_RunAfterILLinkAdditionalSteps` is intentionally skipped and no `afterlink/` output is produced.")) {
-				return;
-			}
-
-			var proj = new XamarinAndroidApplicationProject {
-				IsRelease = isRelease,
-			};
-			proj.SetRuntime (runtime);
-			proj.SetProperty ("PublishTrimmed", "true");
-
-			using (var b = CreateApkBuilder ()) {
-				Assert.IsTrue (b.Build (proj), "first build should succeed");
-				b.Output.AssertTargetIsNotSkipped ("_RunAfterILLinkAdditionalSteps");
-				b.Output.AssertTargetIsNotSkipped ("_AfterILLinkAdditionalSteps");
-				if (runtime == AndroidRuntime.CoreCLR) {
-					b.Output.AssertTargetIsNotSkipped ("_PostTrimmingPipeline");
-				}
-
-				// Verify afterlink/ output directory was created with per-ABI subdirectories containing assemblies
-				var afterlinkDir = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "afterlink");
-				Assert.IsTrue (Directory.Exists (afterlinkDir), "afterlink/ directory should exist after first build");
-				var abiDirs = Directory.GetDirectories (afterlinkDir);
-				Assert.IsTrue (abiDirs.Length > 0, "afterlink/ should contain ABI subdirectories");
-				foreach (var abiDir in abiDirs) {
-					var afterlinkFiles = Directory.GetFiles (abiDir, "*.dll");
-					Assert.IsTrue (afterlinkFiles.Length > 0, $"afterlink/{Path.GetFileName (abiDir)}/ should contain assemblies");
-				}
-
-				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "second build should succeed");
-				b.Output.AssertTargetIsSkipped ("_RunAfterILLinkAdditionalSteps");
-				// The outer target must always run to update assembly itemgroups for downstream targets
-				b.Output.AssertTargetIsNotSkipped ("_AfterILLinkAdditionalSteps");
-				if (runtime == AndroidRuntime.CoreCLR) {
-					b.Output.AssertTargetIsSkipped ("_PostTrimmingPipeline");
-				}
-			}
-		}
-
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
index 0f5d6141d80..38fcb75ff2a 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
@@ -1696,7 +1696,7 @@ public void TargetSdkVersion_361In_36Out ()
 				GetApiLevelFromIdFunc = id => id == "36" || id == "36.1" ? 36 : 99,
 			};
 
-			// GenerateMainAndroidManifest strips "36.1" → "36" before setting TargetSdkVersion
+			// Manifest generation strips "36.1" to "36" before setting TargetSdkVersion.
 			string targetSdkVersion = "36.1";
 			if (MonoAndroidHelper.TryParseApiLevel (targetSdkVersion, out var version)) {
 				targetSdkVersion = version.Major.ToString ();
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs
deleted file mode 100644
index 57e0e3fbdf6..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-#nullable enable
-using System;
-using System.IO;
-using System.Text;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NUnit.Framework;
-using Xamarin.Android.Tasks;
-using Xamarin.ProjectTools;
-
-namespace Xamarin.Android.Build.Tests;
-
-public class MarshalMethodTests : BaseTest
-{
-
-	void AssertMarshalMethodData (MarshalMethodEntry entry, string? callbackField, string? connector, string? declaringType,
-		string? implementedMethod, string? jniMethodName, string? jniMethodSignature, string? jniTypeName,
-		string? nativeCallback, string? registeredMethod)
-	{
-		Assert.AreEqual (callbackField, entry.CallbackField?.ToString (), "Callback field should be the same.");
-		Assert.AreEqual (connector, entry.Connector?.ToString (), "Connector should be the same.");
-		Assert.AreEqual (declaringType, entry.DeclaringType.ToString (), "Declaring type should be the same.");
-		Assert.AreEqual (implementedMethod, entry.ImplementedMethod?.ToString (), "Implemented method should be the same.");
-		Assert.AreEqual (jniMethodName, entry.JniMethodName, "JNI method name should be the same.");
-		Assert.AreEqual (jniMethodSignature, entry.JniMethodSignature, "JNI method signature should be the same.");
-		Assert.AreEqual (jniTypeName, entry.JniTypeName, "JNI type name should be the same.");
-		Assert.AreEqual (nativeCallback, entry.NativeCallback.ToString (), "Native callback should be the same.");
-		Assert.AreEqual (registeredMethod, entry.RegisteredMethod?.ToString (), "Registered method should be the same.");
-	}
-
-	void AssertRewrittenMethodData (ConvertedMarshalMethodEntry converted, MarshalMethodEntry entry)
-	{
-		// Things that are different between the two:
-		Assert.IsNull (converted.CallbackField, "Callback field will be null.");
-		Assert.IsNull (converted.Connector, "Connector will be null.");
-
-		var nativeCallback = converted.NativeCallback?.ToString () ?? "";
-		var paren = nativeCallback.IndexOf ('(');
-		var convertedNativeCallback = nativeCallback.Substring (0, paren) + "_mm_wrapper" + nativeCallback.Substring (paren);
-		Assert.AreEqual (convertedNativeCallback, converted.ConvertedNativeCallback?.ToString (), "ConvertedNativeCallback should be the same.");
-
-		// Things that should be the same between the two:
-		Assert.AreEqual (entry.DeclaringType.ToString (), converted.DeclaringType.ToString (), "Declaring type should be the same.");
-		Assert.AreEqual (entry.ImplementedMethod?.ToString (), converted.ImplementedMethod?.ToString (), "Implemented method should be the same.");
-		Assert.AreEqual (entry.JniMethodName, converted.JniMethodName, "JNI method name should be the same.");
-		Assert.AreEqual (entry.JniMethodSignature, converted.JniMethodSignature, "JNI method signature should be the same.");
-		Assert.AreEqual (entry.JniTypeName, converted.JniTypeName, "JNI type name should be the same.");
-		Assert.AreEqual (entry.NativeCallback.ToString (), converted.NativeCallback?.ToString (), "Native callback should be the same.");
-		Assert.AreEqual (entry.RegisteredMethod?.ToString (), converted.RegisteredMethod?.ToString (), "Registered method should be the same.");
-	}
-
-	static ITaskItem CreateItem (string itemSpec, string abi)
-	{
-		var item = new TaskItem (itemSpec);
-		item.SetMetadata ("Abi", abi);
-		return item;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
index 930c374bb9b..9c7c6647b7c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -47,7 +47,6 @@ public void LinkAssembliesNoShrinkLegacyCompatibilityFixups (bool enabled)
 				$"{nameof (AddKeepAlivesStep)} presence should match the compatibility fixup setting.");
 			Assert.IsTrue (pipeline.Steps.Any (step => step is FindJavaObjectsStep), $"{nameof (FindJavaObjectsStep)} should always run.");
 			Assert.IsTrue (pipeline.Steps.Any (step => step is SaveChangedAssemblyStep), $"{nameof (SaveChangedAssemblyStep)} should always run.");
-			Assert.IsTrue (pipeline.Steps.Any (step => step is FindTypeMapObjectsStep), $"{nameof (FindTypeMapObjectsStep)} should always run.");
 		}
 
 		sealed class TestableLinkAssembliesNoShrink : LinkAssembliesNoShrink
@@ -827,26 +826,10 @@ protected override void OnNewIntent (Android.Content.Intent? intent)
 			}
 		}
 
-		// TODO: fix for (true, AndroidRuntime.CoreCLR)
 		[Test]
 		public void DoNotErrorOnPerArchJavaTypeDuplicates (
-			[Values(true, false)] bool enableMarshalMethods,
 			[Values (AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
 		{
-			if (enableMarshalMethods == true && runtime == AndroidRuntime.CoreCLR) {
-				// This currently fails with the following exception:
-				//
-				// Xamarin.Android.Common.targets(1603,3): error XARMM7015: System.NotSupportedException: Writing mixed-mode assemblies is not supported
-				//  at Mono.Cecil.ModuleWriter.Write(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleWriter.WriteModule(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Mono.Cecil.AssemblyDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Xamarin.Android.Tasks.MarshalMethodsAssemblyRewriter.Rewrite(Boolean brokenExceptionTransitions) in src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs:line 165
-				//  at Xamarin.Android.Tasks.RewriteMarshalMethods.RewriteMethods(NativeCodeGenState state, Boolean brokenExceptionTransitionsEnabled) in src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs:line 160
-				Assert.Ignore ("Fails with Mono.Cecil exception on CoreCLR");
-				return;
-			}
-
 			var path = Path.Combine (Root, "temp", TestName);
 			var lib = new XamarinAndroidLibraryProject { IsRelease = true, ProjectName = "Lib1" };
 			lib.SetRuntime (runtime);
@@ -880,7 +863,6 @@ public abstract class MyRunner {
 				"base.OnCreate (bundle);",
 				"base.OnCreate (bundle);\n" +
 				"if (Lib1.Library1.Is64 ()) Console.WriteLine (\"Hello World!\");");
-			proj.EnableMarshalMethods = enableMarshalMethods;
 
 
 			using var lb = CreateDllBuilder (Path.Combine (path, "Lib1"));
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
index effa0229108..d9631f035c9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using Microsoft.Build.Utilities;
-using Mono.Cecil;
 using NUnit.Framework;
 using Xamarin.Android.Tasks;
 using Xamarin.Android.Tasks.LLVMIR;
@@ -83,25 +83,24 @@ public void GeneratedIR_FunctionWithWhitespaceParameterName_ProducesValidOutput
 		}
 
 		[Test]
-		public void TypeMapAssemblyFullNameUsesRuntimeEscaping ()
+		public void EmptyMarshalMethodsSourceRetainsNativeHostEntryPoint ()
 		{
-			var assemblyName = new AssemblyNameDefinition ("Comma,Name", new Version (1, 2, 3, 4));
-
-			Assert.That (
-				TypeMapCecilAdapter.GetRuntimeAssemblyFullName (assemblyName),
-				Is.EqualTo (@"Comma\,Name, Version=1.2.3.4, Culture=neutral, PublicKeyToken=null")
-			);
-		}
+			var log = new TaskLoggingHelper (new MockBuildEngine (TestContext.Out, [], [], []), "test");
+			var generator = new MarshalMethodsNativeAssemblyGenerator (log);
+			var module = generator.Construct ();
 
-		[Test]
-		public void TypeMapAssemblyFullNameMatchesStrongNamedRuntimeAssembly ()
-		{
-			string assemblyPath = typeof (TypeMapCecilAdapter).Assembly.Location;
-			using var assembly = AssemblyDefinition.ReadAssembly (assemblyPath);
-			string? runtimeFullName = System.Reflection.AssemblyName.GetAssemblyName (assemblyPath).FullName;
+			using var stream = new MemoryStream ();
+			using (var writer = new StreamWriter (stream, new UTF8Encoding (false), 1024, leaveOpen: true)) {
+				generator.Generate (module, AndroidTargetArch.Arm64, writer, "marshal_methods.arm64-v8a.ll");
+			}
 
-			Assert.That (runtimeFullName, Does.Not.EndWith ("PublicKeyToken=null"));
-			Assert.That (TypeMapCecilAdapter.GetRuntimeAssemblyFullName (assembly.Name), Is.EqualTo (runtimeFullName));
+			stream.Position = 0;
+			using var reader = new StreamReader (stream);
+			string output = reader.ReadToEnd ();
+			Assert.That (output, Does.Contain ("@xamarin_app_init"));
+			Assert.That (output, Does.Contain ("@get_function_pointer"));
+			Assert.That (output, Does.Not.Contain ("@Java_"));
 		}
+
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs
index eba39ee60ed..2db6d2fd6eb 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs
@@ -54,7 +54,6 @@ public class StepContext
 {
 	public JavaPeerStyle CodeGenerationTarget { get; set; }
 	public ITaskItem Destination { get; }
-	public bool EnableMarshalMethods { get; set; }
 	public bool IsAndroidAssembly { get; set; }
 	public bool IsAssemblyModified { get; set; }
 	public bool IsDebug { get; set; }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs
deleted file mode 100644
index 9e37c0feade..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.Diagnostics;
-using Java.Interop.Tools.JavaCallableWrappers.Adapters;
-using Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-using System.Collections.Concurrent;
-
-namespace Xamarin.Android.Tasks;
-
-class JCWGeneratorContext
-{
-	public AndroidTargetArch Arch                    { get; }
-	public TypeDefinitionCache TypeDefinitionCache   { get; }
-	public XAAssemblyResolver Resolver               { get; }
-	public IList<TypeDefinition> JavaTypes           { get; }
-	public ICollection<ITaskItem> ResolvedAssemblies { get; }
-
-	public JCWGeneratorContext (AndroidTargetArch arch, XAAssemblyResolver res, ICollection<ITaskItem> resolvedAssemblies, List<TypeDefinition> javaTypesForJCW, TypeDefinitionCache tdCache)
-	{
-		Arch = arch;
-		Resolver = res;
-		ResolvedAssemblies = resolvedAssemblies;
-		JavaTypes = javaTypesForJCW.AsReadOnly ();
-		TypeDefinitionCache = tdCache;
-	}
-}
-
-class JCWGenerator
-{
-	readonly TaskLoggingHelper log;
-	readonly JCWGeneratorContext context;
-
-	public JavaPeerStyle CodeGenerationTarget { get; set; } = JavaPeerStyle.XAJavaInterop1;
-
-	public JCWGenerator (TaskLoggingHelper log, JCWGeneratorContext context)
-	{
-		this.log = log;
-		this.context = context;
-	}
-
-	public List<string> GeneratedJavaFiles { get; } = [];
-
-	public bool Generate (string outputPath, string applicationJavaClass)
-	{
-		return ProcessTypes (
-			generateCode: true,
-			outputPath,
-			applicationJavaClass
-		);
-	}
-
-	bool ProcessTypes (bool generateCode, string? outputPath, string? applicationJavaClass)
-	{
-		if (generateCode && outputPath.IsNullOrEmpty ()) {
-			throw new ArgumentException ("must not be null or empty", nameof (outputPath));
-		}
-
-		string monoInit = "mono.MonoPackageManager.LoadApplication (context);";
-		bool hasExportReference = context.ResolvedAssemblies.Any (assembly => Path.GetFileName (assembly.ItemSpec) == "Mono.Android.Export.dll");
-		bool ok = true;
-
-		foreach (TypeDefinition type in context.JavaTypes) {
-			if (type.IsInterface) {
-				// Interfaces are in typemap but they shouldn't have JCW generated for them
-				continue;
-			}
-
-			CallableWrapperType generator = CreateGenerator (type, monoInit, hasExportReference, applicationJavaClass);
-			if (!generateCode) {
-				continue;
-			}
-
-			if (!GenerateCode (generator, type, outputPath!, hasExportReference)) {  // NRT - Guarded above by IsNullOrEmpty and generateCode checks
-				ok = false;
-			}
-		}
-
-		return ok;
-	}
-
-	public bool GenerateCode (CallableWrapperType generator, TypeDefinition type, string outputPath, bool hasExportReference)
-	{
-		bool ok = true;
-		using var writer = MemoryStreamPool.Shared.CreateStreamWriter ();
-		var writer_options = new CallableWrapperWriterOptions {
-			CodeGenerationTarget    = CodeGenerationTarget
-		};
-
-		try {
-			generator.Generate (writer, writer_options);
-			writer.Flush ();
-
-			string path = generator.GetDestinationPath (outputPath);
-			var changed = Files.CopyIfStreamChanged (writer.BaseStream, path);
-
-			if (changed) {
-				log.LogCodedError ("XA4253", Properties.Resources.XA4253, path);
-			} else {
-				log.LogMessage ($"Java callable wrapper code already up to date: '{path}'");
-			}
-			GeneratedJavaFiles.Add (path);
-			if (generator.HasExport && !hasExportReference) {
-				Diagnostic.Error (4210, Properties.Resources.XA4210);
-			}
-		} catch (XamarinAndroidException xae) {
-			ok = false;
-			log.LogError (
-				subcategory: "",
-				errorCode: "XA" + xae.Code,
-				helpKeyword: string.Empty,
-				file: xae.SourceFile,
-				lineNumber: xae.SourceLine,
-				columnNumber: 0,
-				endLineNumber: 0,
-				endColumnNumber: 0,
-				message: xae.MessageWithoutCode,
-				messageArgs: []
-			);
-		} catch (DirectoryNotFoundException ex) {
-			ok = false;
-			if (OS.IsWindows) {
-				Diagnostic.Error (5301, Properties.Resources.XA5301, type.FullName, ex);
-			} else {
-				Diagnostic.Error (4209, Properties.Resources.XA4209, type.FullName, ex);
-			}
-		} catch (Exception ex) {
-			ok = false;
-			Diagnostic.Error (4209, Properties.Resources.XA4209, type.FullName, ex);
-		}
-
-		return ok;
-	}
-
-	CallableWrapperType CreateGenerator (TypeDefinition type, string monoInit, bool hasExportReference, string? applicationJavaClass)
-	{
-		var reader_options = new CallableWrapperReaderOptions {
-			DefaultApplicationJavaClass         = applicationJavaClass,
-			DefaultGenerateOnCreateOverrides    = false, // this was used only when targetting Android API <= 10, which is no longer supported
-			DefaultMonoRuntimeInitialization    = monoInit,
-		};
-
-		return CecilImporter.CreateType (type, context.TypeDefinitionCache, reader_options);
-	}
-
-	public static void EnsureAllArchitecturesAreIdentical (TaskLoggingHelper logger, ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState> javaStubStates)
-	{
-		if (javaStubStates.Count <= 1) {
-			return;
-		}
-
-		// An expensive process, but we must be sure that all the architectures have the same data
-		NativeCodeGenState? templateState = null;
-		foreach (var kvp in javaStubStates) {
-			NativeCodeGenState state = kvp.Value;
-
-			if (templateState == null) {
-				templateState = state;
-				continue;
-			}
-
-			EnsureIdenticalCollections (logger, templateState, state);
-			EnsureClassifiersMatch (logger, templateState, state);
-		}
-	}
-
-	static void EnsureIdenticalCollections (TaskLoggingHelper logger, NativeCodeGenState templateState, NativeCodeGenState state)
-	{
-		logger.LogDebugMessage ($"Ensuring Java type collection in architecture '{state.TargetArch}' matches the one in architecture '{templateState.TargetArch}'");
-
-		var templateSet = new HashSet<string> (templateState.AllJavaTypes.Select (t => t.FullName), StringComparer.Ordinal);
-		var typesSet = new HashSet<string> (state.AllJavaTypes.Select (t => t.FullName), StringComparer.Ordinal);
-
-		if (typesSet.Count != templateSet.Count) {
-			throw new InvalidOperationException ($"Internal error: architecture '{state.TargetArch}' has a different number of types ({typesSet.Count}) than the template architecture '{templateState.TargetArch}' ({templateSet.Count})");
-		}
-
-		if (!typesSet.SetEquals (templateSet)) {
-			typesSet.ExceptWith (templateSet);
-			var typesList = string.Join (", ", typesSet.OrderBy (t => t, StringComparer.Ordinal));
-			logger.LogCodedError ("XA4217", Properties.Resources.XA4217, state.TargetArch, templateState.TargetArch, typesList);
-		}
-	}
-
-	static bool CheckWhetherTypesMatch (TypeDefinition templateType, TypeDefinition type)
-	{
-		// TODO: should we compare individual methods, fields, properties?
-		return MonoAndroidHelper.StringEquals (templateType.FullName, type.FullName);
-	}
-
-	static void EnsureClassifiersMatch (TaskLoggingHelper logger, NativeCodeGenState templateState, NativeCodeGenState state)
-	{
-		logger.LogDebugMessage ($"Ensuring marshal method classifier in architecture '{state.TargetArch}' matches the one in architecture '{templateState.TargetArch}'");
-
-		MarshalMethodsCollection? templateClassifier = templateState.Classifier;
-		MarshalMethodsCollection? classifier = state.Classifier;
-
-		if (templateClassifier == null) {
-			if (classifier != null) {
-				throw new InvalidOperationException ($"Internal error: architecture '{templateState.TargetArch}' DOES NOT have a marshal methods classifier, unlike architecture '{state.TargetArch}'");
-			}
-			return;
-		}
-
-		if (classifier == null) {
-			throw new InvalidOperationException ($"Internal error: architecture '{templateState.TargetArch}' DOES have a marshal methods classifier, unlike architecture '{state.TargetArch}'");
-		}
-
-		if (templateClassifier.MarshalMethods.Count != classifier.MarshalMethods.Count) {
-			throw new InvalidOperationException (
-				$"Internal error: classifier for template architecture '{templateState.TargetArch}' contains {templateClassifier.MarshalMethods.Count} marshal methods, but the one for architecture '{state.TargetArch}' has {classifier.MarshalMethods.Count}"
-			);
-		}
-
-		var matchedTemplateMethods = new HashSet<MethodDefinition> ();
-		var mismatchedMethods = new List<MethodDefinition> ();
-		bool foundMismatches = false;
-
-		foreach (var kvp in classifier.MarshalMethods) {
-			string key = kvp.Key;
-			IList<MarshalMethodEntry> methods = kvp.Value;
-
-			logger.LogDebugMessage ($"Comparing marshal method '{key}' in architecture '{templateState.TargetArch}', with {methods.Count} overloads, against architecture '{state.TargetArch}'");
-
-			if (!templateClassifier.MarshalMethods.TryGetValue (key, out IList<MarshalMethodEntry> templateMethods)) {
-				logger.LogDebugMessage ($"Architecture '{state.TargetArch}' has marshal method '{key}' which does not exist in architecture '{templateState.TargetArch}'");
-				foundMismatches = true;
-				continue;
-			}
-
-			if (methods.Count != templateMethods.Count) {
-				logger.LogDebugMessage ($"Architecture '{state.TargetArch}' has an incorrect number of marshal method '{key}' overloads. Expected {templateMethods.Count}, but found {methods.Count}");
-				continue;
-			}
-
-			foreach (MarshalMethodEntry templateMethod in templateMethods) {
-				MarshalMethodEntry? match = null;
-
-				foreach (MarshalMethodEntry method in methods) {
-					if (CheckWhetherMethodsMatch (logger, templateMethod, templateState.TargetArch, method, state.TargetArch)) {
-						match = method;
-						break;
-					}
-				}
-
-				if (match == null) {
-					foundMismatches = true;
-				}
-			}
-		}
-
-		if (!foundMismatches) {
-			return;
-		}
-
-		logger.LogCodedError ("XA4227", Properties.Resources.XA4227, state.TargetArch, templateState.TargetArch);
-	}
-
-	static bool CheckWhetherMethodsMatch (TaskLoggingHelper logger, MarshalMethodEntry templateMethod, AndroidTargetArch templateArch, MarshalMethodEntry method, AndroidTargetArch arch)
-	{
-		bool success = true;
-		string methodName = templateMethod.NativeCallback.FullName;
-
-		if (!CheckWhetherTypesMatch (templateMethod.DeclaringType, method.DeclaringType)) {
-			logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' should be declared in type '{templateMethod.DeclaringType.FullName}', but instead was declared in '{method.DeclaringType.FullName}'");
-			success = false;
-		}
-
-		bool skipJniCheck = false;
-		if (!CheckWhetherMembersMatch (logger, methodName, "native callback", templateMethod.NativeCallback, templateArch, method.NativeCallback, arch)) {
-			success = false;
-
-			// This takes care of overloads for the same methods, and avoids false negatives below
-			skipJniCheck = true;
-		}
-
-		if (!skipJniCheck) {
-			if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodName, method.JniMethodName)) {
-				logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI method name than architecture '{templateArch}':");
-				logger.LogDebugMessage ($"  Expected: '{templateMethod.JniMethodName}', found: '{method.JniMethodName}'");
-				success = false;
-			}
-
-			if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodSignature, method.JniMethodSignature)) {
-				logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI method signature than architecture '{templateArch}':");
-				logger.LogDebugMessage ($"  Expected: '{templateMethod.JniMethodSignature}', found: '{method.JniMethodSignature}'");
-				success = false;
-			}
-
-			if (!MonoAndroidHelper.StringEquals (templateMethod.JniTypeName, method.JniTypeName)) {
-				logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI type name than architecture '{templateArch}':");
-				logger.LogDebugMessage ($"  Expected: '{templateMethod.JniTypeName}', found: '{method.JniTypeName}'");
-				success = false;
-			}
-		}
-
-		if (templateMethod.IsSpecial) {
-			// Other method definitions will be `null`, so we can skip them
-			if (method.IsSpecial) {
-				return success;
-			}
-
-			logger.LogDebugMessage ($"Marshal method '{templateMethod.NativeCallback.FullName}' is marked as special in architecture '{templateArch}', but not in architecture '{arch}'");
-			return false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "connector", templateMethod.Connector, templateArch, method.Connector, arch)) {
-			success = false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "implemented", templateMethod.ImplementedMethod, templateArch, method.ImplementedMethod, arch)) {
-			success = false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "registered", templateMethod.RegisteredMethod, templateArch, method.RegisteredMethod, arch)) {
-			success = false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "callback backing field", templateMethod.CallbackField, templateArch, method.CallbackField, arch)) {
-			success = false;
-		}
-
-		return success;
-	}
-
-	static bool CheckWhetherMembersMatch (TaskLoggingHelper logger, string marshalMethodName, string description, MemberReference? templateMethod, AndroidTargetArch templateArch, MemberReference? method, AndroidTargetArch arch)
-	{
-		if (templateMethod == null) {
-			if (method == null) {
-				return true;
-			}
-
-			logger.LogDebugMessage ($"Marshal method '{marshalMethodName}' component '{description}' is null in architecture '{templateArch}', but not null in architecture '{arch}'");
-			return false;
-		}
-
-		return MonoAndroidHelper.StringEquals (templateMethod.FullName, method?.FullName);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
index c71c964d363..3866b69f1db 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
@@ -163,7 +163,7 @@ public ManifestDocument (string templateFilename) : base ()
 		}
 
 		// TargetSdkVersion and MinSdkVersion are already resolved to integer API level
-		// strings (e.g. "36") by GenerateMainAndroidManifest. Don't round-trip through
+		// strings (e.g. "36") by the manifest generator. Don't round-trip through
 		// GetIdFromApiLevel() because when multiple API versions share the same ApiLevel
 		// (e.g. 36.0 and 36.1 both have ApiLevel=36), it can return the wrong Id
 		// (e.g. "36.1" instead of "36").
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs
deleted file mode 100644
index 3f92fec0c0e..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.TypeNameMappings;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-class MarshalMethodCecilAdapter
-{
-	public static NativeCodeGenStateCollection? GetNativeCodeGenStateCollection (TaskLoggingHelper log, ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>? nativeCodeGenStates)
-	{
-		if (nativeCodeGenStates is null) {
-			log.LogDebugMessage ($"No {nameof (NativeCodeGenState)} found");
-			return null;
-		}
-
-		var collection = new NativeCodeGenStateCollection ();
-
-		// Convert each architecture
-		foreach (var kvp in nativeCodeGenStates) {
-			var arch = kvp.Key;
-			var state = kvp.Value;
-			var obj = CreateNativeCodeGenState (arch, state);
-			obj.PinvokeInfos = state.PinvokeInfos;
-			obj.TargetArch = state.TargetArch;
-			collection.States.Add (arch, obj);
-		}
-
-		return collection;
-	}
-
-	static NativeCodeGenStateObject CreateNativeCodeGenState (AndroidTargetArch arch, NativeCodeGenState state)
-	{
-		var obj = new NativeCodeGenStateObject ();
-
-		foreach (var type in state.JavaTypesForJCW) {
-			if (JavaNativeTypeManager.IsApplication (type, state.TypeCache) || JavaNativeTypeManager.IsInstrumentation (type, state.TypeCache)) {
-				if (state.Classifier != null && !state.Classifier.TypeHasDynamicallyRegisteredMethods (type)) {
-					continue;
-				}
-
-				var jniName = JavaNativeTypeManager.ToJniName (type, state.TypeCache).Replace ('/', '.');
-				var assemblyQualifiedName = type.GetAssemblyQualifiedName (state.TypeCache);
-
-				obj.ApplicationsAndInstrumentationsToRegister.Add ((jniName, assemblyQualifiedName));
-			}
-		}
-
-		if (state.Classifier is null)
-			return obj;
-
-		foreach (var group in state.Classifier.MarshalMethods) {
-			var methods = new List<MarshalMethodEntryObject> (group.Value.Count);
-
-			foreach (var method in group.Value) {
-				var entry = CreateEntry (method);
-				methods.Add (entry);
-			}
-
-			obj.MarshalMethods.Add (group.Key, methods);
-		}
-		return obj;
-	}
-
-	static MarshalMethodEntryObject CreateEntry (MarshalMethodEntry entry)
-	{
-		var obj = new MarshalMethodEntryObject (
-			declaringType: CreateDeclaringType (entry.DeclaringType),
-			implementedMethod: CreateMethod (entry.ImplementedMethod),
-			isSpecial: entry.IsSpecial,
-			jniTypeName: entry.JniTypeName,
-			jniMethodName: entry.JniMethodName,
-			jniMethodSignature: entry.JniMethodSignature,
-			nativeCallback: CreateMethod (entry.NativeCallback),
-			registeredMethod: CreateMethodBase (entry.RegisteredMethod)
-		);
-
-		return obj;
-	}
-
-	static MarshalMethodEntryTypeObject CreateDeclaringType (TypeDefinition type)
-	{
-		var cecilModule = type.Module;
-		var cecilAssembly = cecilModule.Assembly;
-
-		var assembly = new MarshalMethodEntryAssemblyObject (
-			fullName: cecilAssembly.FullName,
-			nameFullName: cecilAssembly.Name.FullName,
-			mainModuleFileName: cecilAssembly.MainModule.FileName,
-			nameName: cecilAssembly.Name.Name
-		);
-
-		var module = new MarshalMethodEntryModuleObject (
-			assembly: assembly
-		);
-
-		return new MarshalMethodEntryTypeObject (
-			fullName: type.FullName,
-			metadataToken: type.MetadataToken.ToUInt32 (),
-			module: module);
-	}
-
-	[return:NotNullIfNotNull (nameof (method))]
-	static MarshalMethodEntryMethodObject? CreateMethod (MethodDefinition? method)
-	{
-		if (method is null)
-			return null;
-
-		var parameters = new List<MarshalMethodEntryMethodParameterObject> (method.Parameters.Count);
-
-		foreach (var parameter in method.Parameters) {
-			parameters.Add (new MarshalMethodEntryMethodParameterObject (
-				name: parameter.Name,
-				parameterTypeName: parameter.ParameterType.Name
-			));
-		}
-
-		return new MarshalMethodEntryMethodObject (
-			name: method.Name,
-			fullName: method.FullName,
-			declaringType: CreateDeclaringType (method.DeclaringType),
-			metadataToken: method.MetadataToken.ToUInt32 (),
-			parameters: parameters
-		);
-	}
-
-	static MarshalMethodEntryMethodBaseObject? CreateMethodBase (MethodDefinition? method)
-	{
-		if (method is null)
-			return null;
-		return new MarshalMethodEntryMethodBaseObject (
-			fullName: method.FullName
-		);
-	}
-}
-
-class NativeCodeGenStateCollection
-{
-	public Dictionary<AndroidTargetArch, NativeCodeGenStateObject> States { get; } = [];
-}
-
-class NativeCodeGenStateObject
-{
-	public Dictionary<string, IList<MarshalMethodEntryObject>> MarshalMethods { get; } = [];
-	public List<PinvokeScanner.PinvokeEntryInfo>? PinvokeInfos                { get; set; }
-	public AndroidTargetArch TargetArch                                       { get; set; } = AndroidTargetArch.None;
-	public List<(string JniName, string AssemblyQualifiedName)> ApplicationsAndInstrumentationsToRegister { get; } = [];
-}
-
-class MarshalMethodEntryObject
-{
-	public MarshalMethodEntryTypeObject DeclaringType { get; }
-	public MarshalMethodEntryMethodObject? ImplementedMethod { get; }
-	public bool IsSpecial { get; }
-	public string JniTypeName { get; }
-	public string JniMethodName { get; }
-	public string JniMethodSignature { get; }
-	public MarshalMethodEntryMethodObject NativeCallback { get; }
-	public MarshalMethodEntryMethodBaseObject? RegisteredMethod { get; }
-
-	public MarshalMethodEntryObject (MarshalMethodEntryTypeObject declaringType, MarshalMethodEntryMethodObject? implementedMethod, bool isSpecial, string jniTypeName, string jniMethodName, string jniMethodSignature, MarshalMethodEntryMethodObject nativeCallback, MarshalMethodEntryMethodBaseObject? registeredMethod)
-	{
-		DeclaringType = declaringType;
-		ImplementedMethod = implementedMethod;
-		IsSpecial = isSpecial;
-		JniTypeName = jniTypeName;
-		JniMethodName = jniMethodName;
-		JniMethodSignature = jniMethodSignature;
-		NativeCallback = nativeCallback;
-		RegisteredMethod = registeredMethod;
-	}
-}
-
-class MarshalMethodEntryAssemblyObject
-{
-	public string FullName { get; }
-	public string NameFullName { get; }  // Cecil's Assembly.Name.FullName
-	public string MainModuleFileName { get; }  // Cecil's Assembly.MainModule.FileName
-	public string NameName { get; } // Cecil's Module.Name.Name
-
-	public MarshalMethodEntryAssemblyObject (string fullName, string nameFullName, string mainModuleFileName, string nameName)
-	{
-		FullName = fullName;
-		NameFullName = nameFullName;
-		MainModuleFileName = mainModuleFileName;
-		NameName = nameName;
-	}
-}
-
-class MarshalMethodEntryModuleObject
-{
-	public MarshalMethodEntryAssemblyObject Assembly { get; }
-
-	public MarshalMethodEntryModuleObject (MarshalMethodEntryAssemblyObject assembly)
-	{
-		Assembly = assembly;
-	}
-}
-
-class MarshalMethodEntryTypeObject
-{
-	public string FullName { get; }
-	public uint MetadataToken { get; }
-	public MarshalMethodEntryModuleObject Module { get; }
-
-	public MarshalMethodEntryTypeObject (string fullName, uint metadataToken, MarshalMethodEntryModuleObject module)
-	{
-		FullName = fullName;
-		MetadataToken = metadataToken;
-		Module = module;
-	}
-}
-
-class MarshalMethodEntryMethodBaseObject
-{
-	public string FullName { get; }
-
-	public MarshalMethodEntryMethodBaseObject (string fullName)
-	{
-		FullName = fullName;
-	}
-}
-
-class MarshalMethodEntryMethodObject : MarshalMethodEntryMethodBaseObject
-{
-	public string Name { get; }
-	public MarshalMethodEntryTypeObject DeclaringType { get; }
-	public uint MetadataToken { get; }
-	public List<MarshalMethodEntryMethodParameterObject> Parameters { get; }
-
-	public bool HasParameters => Parameters.Count > 0;
-
-	public MarshalMethodEntryMethodObject (string name, string fullName, MarshalMethodEntryTypeObject declaringType, uint metadataToken, List<MarshalMethodEntryMethodParameterObject> parameters)
-		: base (fullName)
-	{
-		Name = name;
-		DeclaringType = declaringType;
-		MetadataToken = metadataToken;
-		Parameters = parameters;
-	}
-}
-
-class MarshalMethodEntryMethodParameterObject
-{
-	public string Name { get; }
-	public string ParameterTypeName { get; }  // Cecil's ParameterDefinition.ParameterType.Name
-
-	public MarshalMethodEntryMethodParameterObject (string name, string parameterTypeName)
-	{
-		Name = name;
-		ParameterTypeName = parameterTypeName;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs
deleted file mode 100644
index 2d7b2528188..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs
+++ /dev/null
@@ -1,562 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using Java.Interop.Tools.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	class MarshalMethodsAssemblyRewriter
-	{
-		sealed class AssemblyImports
-		{
-			public TypeReference? SystemException;
-			public MethodReference? UnhandledExceptionMethod;
-			public CustomAttribute? UnmanagedCallersOnlyAttribute;
-			public MethodReference? WaitForBridgeProcessingMethod;
-		}
-
-		readonly TaskLoggingHelper log;
-		readonly MarshalMethodsCollection classifier;
-		readonly XAAssemblyResolver resolver;
-		readonly AndroidTargetArch targetArch;
-
-		public MarshalMethodsAssemblyRewriter (TaskLoggingHelper log, AndroidTargetArch targetArch, MarshalMethodsCollection classifier, XAAssemblyResolver resolver)
-		{
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.targetArch = targetArch;
-			this.classifier = classifier ?? throw new ArgumentNullException (nameof (classifier));;
-			this.resolver = resolver ?? throw new ArgumentNullException (nameof (resolver));;
-		}
-
-		public void Rewrite ()
-		{
-			AssemblyDefinition? monoAndroidRuntime = resolver.Resolve ("Mono.Android.Runtime");
-			if (monoAndroidRuntime == null) {
-				throw new InvalidOperationException ($"[{targetArch}] Internal error: unable to load the Mono.Android.Runtime assembly");
-			}
-
-			TypeDefinition? runtime = FindType (monoAndroidRuntime, "Android.Runtime.AndroidRuntimeInternal", required: true);
-			if (runtime == null)
-				throw new ArgumentNullException (nameof (runtime));
-			MethodDefinition? waitForBridgeProcessingMethod = FindMethod (runtime, "WaitForBridgeProcessing", required: true);
-			if (waitForBridgeProcessingMethod == null)
-				throw new ArgumentNullException (nameof (waitForBridgeProcessingMethod));
-
-			TypeDefinition? androidEnvironment = FindType (monoAndroidRuntime, "Android.Runtime.AndroidEnvironmentInternal", required: true);
-			if (androidEnvironment == null)
-				throw new ArgumentNullException (nameof (androidEnvironment));
-			MethodDefinition? unhandledExceptionMethod = FindMethod (androidEnvironment, "UnhandledException", required: true);
-			if (unhandledExceptionMethod == null)
-				throw new ArgumentNullException (nameof (unhandledExceptionMethod));
-
-			AssemblyDefinition? corlib = resolver.Resolve ("System.Private.CoreLib");
-			if (corlib == null)
-				throw new ArgumentNullException (nameof (corlib));
-			TypeDefinition? systemException = FindType (corlib, "System.Exception", required: true);
-			if (systemException == null)
-				throw new ArgumentNullException (nameof (systemException));
-
-			MethodDefinition unmanagedCallersOnlyAttributeCtor = GetUnmanagedCallersOnlyAttributeConstructor (resolver);
-
-			var assemblyImports = new Dictionary<AssemblyDefinition, AssemblyImports> ();
-			foreach (AssemblyDefinition asm in classifier.AssembliesWithMarshalMethods) {
-				var imports = new AssemblyImports {
-					SystemException               = asm.MainModule.ImportReference (systemException),
-					UnhandledExceptionMethod      = asm.MainModule.ImportReference (unhandledExceptionMethod),
-					UnmanagedCallersOnlyAttribute = CreateImportedUnmanagedCallersOnlyAttribute (asm, unmanagedCallersOnlyAttributeCtor),
-					WaitForBridgeProcessingMethod = asm.MainModule.ImportReference (waitForBridgeProcessingMethod),
-				};
-
-				assemblyImports.Add (asm, imports);
-			}
-
-			log.LogDebugMessage ($"[{targetArch}] Rewriting assemblies for marshal methods support");
-
-			var processedMethods = new Dictionary<string, MethodDefinition> (StringComparer.Ordinal);
-			foreach (IList<MarshalMethodEntry> methodList in classifier.MarshalMethods.Values) {
-				foreach (MarshalMethodEntry method in methodList) {
-					string fullNativeCallbackName = method.NativeCallback.FullName;
-					if (processedMethods.TryGetValue (fullNativeCallbackName, out MethodDefinition nativeCallbackWrapper)) {
-						method.NativeCallbackWrapper = nativeCallbackWrapper;
-						continue;
-					}
-
-					if (HasUnmanagedCallersOnlyAttribute (method.NativeCallback)) {
-						log.LogDebugMessage ($"[{targetArch}] Method '{method.NativeCallback.FullName}' does not need a wrapper, it already has UnmanagedCallersOnlyAttribute");
-						method.NativeCallbackWrapper = method.NativeCallback;
-						continue;
-					}
-
-					method.NativeCallbackWrapper = GenerateWrapper (method, assemblyImports);
-					if (method.Connector != null) {
-						if (method.Connector.IsStatic && method.Connector.IsPrivate) {
-							log.LogDebugMessage ($"[{targetArch}] Removing connector method {method.Connector.FullName}");
-							method.Connector.DeclaringType?.Methods?.Remove (method.Connector);
-						} else {
-							log.LogWarning ($"[{targetArch}] NOT removing connector method {method.Connector.FullName} because it's either not static or not private");
-						}
-					}
-
-					if (method.CallbackField != null) {
-						if (method.CallbackField.IsStatic && method.CallbackField.IsPrivate) {
-							log.LogDebugMessage ($"[{targetArch}] Removing callback delegate backing field {method.CallbackField.FullName}");
-							method.CallbackField.DeclaringType?.Fields?.Remove (method.CallbackField);
-						} else {
-							log.LogWarning ($"[{targetArch}] NOT removing callback field {method.CallbackField.FullName} because it's either not static or not private");
-						}
-					}
-
-					processedMethods.Add (fullNativeCallbackName, method.NativeCallback);
-				}
-			}
-
-			foreach (AssemblyDefinition asm in classifier.AssembliesWithMarshalMethods) {
-				string? path = asm.MainModule.FileName;
-				if (String.IsNullOrEmpty (path)) {
-					throw new InvalidOperationException ($"[{targetArch}] Internal error: assembly '{asm}' does not specify path to its file");
-				}
-
-				string pathPdb = Path.ChangeExtension (path, ".pdb");
-				bool havePdb = File.Exists (pathPdb);
-
-				var writerParams = new WriterParameters {
-					WriteSymbols = havePdb,
-				};
-
-				string directory = Path.Combine (Path.GetDirectoryName (path), "new");
-				Directory.CreateDirectory (directory);
-				string output = Path.Combine (directory, Path.GetFileName (path));
-				log.LogDebugMessage ($"[{targetArch}] Writing new version of '{path}' assembly: {output}");
-
-				// TODO: this should be used eventually, but it requires that all the types are reloaded from the assemblies before typemaps are generated
-				// since Cecil doesn't update the MVID in the already loaded types
-				//asm.MainModule.Mvid = Guid.NewGuid ();
-				asm.Write (output, writerParams);
-
-				CopyFile (output, path);
-				RemoveFile (output);
-
-				if (havePdb) {
-					string outputPdb = Path.ChangeExtension (output, ".pdb");
-					if (File.Exists (outputPdb)) {
-						CopyFile (outputPdb, pathPdb);
-					}
-					RemoveFile (outputPdb);
-				}
-			}
-
-			void CopyFile (string source, string target)
-			{
-				log.LogDebugMessage ($"[{targetArch}] Copying rewritten assembly: {source} -> {target}");
-
-				string targetBackup = $"{target}.bak";
-				if (File.Exists (target)) {
-					// Try to avoid sharing violations by first renaming the target
-					File.Move (target, targetBackup);
-				}
-
-				File.Copy (source, target, true);
-
-				if (File.Exists (targetBackup)) {
-					try {
-						File.Delete (targetBackup);
-					} catch (Exception ex) {
-						// On Windows the deletion may fail, depending on lock state of the original `target` file before the move.
-						log.LogDebugMessage ($"[{targetArch}] While trying to delete '{targetBackup}', exception was thrown: {ex}");
-						log.LogDebugMessage ($"[{targetArch}] Failed to delete backup file '{targetBackup}', ignoring.");
-					}
-				}
-			}
-
-			void RemoveFile (string? path)
-			{
-				if (path.IsNullOrEmpty () || !File.Exists (path)) {
-					return;
-				}
-
-				try {
-					log.LogDebugMessage ($"[{targetArch}] Deleting: {path}");
-					File.Delete (path);
-				} catch (Exception ex) {
-					log.LogCodedWarning ("XA4324", Properties.Resources.XA4324, targetArch, path);
-					log.LogDebugMessage ($"[{targetArch}] {ex.ToString ()}");
-				}
-			}
-
-			static bool HasUnmanagedCallersOnlyAttribute (MethodDefinition method)
-			{
-				foreach (CustomAttribute ca in method.CustomAttributes) {
-					if (ca.Constructor.DeclaringType.FullName == "System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute") {
-						return true;
-					}
-				}
-
-				return false;
-			}
-		}
-
-		MethodDefinition GenerateWrapper (MarshalMethodEntry method, Dictionary<AssemblyDefinition, AssemblyImports> assemblyImports)
-		{
-			MethodDefinition callback = method.NativeCallback;
-			AssemblyImports imports = assemblyImports [callback.Module.Assembly];
-			string wrapperName = $"{callback.Name}_mm_wrapper";
-			TypeReference retType = MapToBlittableTypeIfNecessary (callback.ReturnType, out bool returnTypeMapped);
-			bool hasReturnValue = !MonoAndroidHelper.StringEquals ("System.Void", callback.ReturnType.FullName);
-			var wrapperMethod = new MethodDefinition (wrapperName, callback.Attributes, retType);
-
-			callback.DeclaringType.Methods.Add (wrapperMethod);
-			wrapperMethod.CustomAttributes.Add (imports.UnmanagedCallersOnlyAttribute);
-
-			MethodBody body = wrapperMethod.Body;
-			body.InitLocals = true;
-
-			VariableDefinition? retval = null;
-			if (hasReturnValue) {
-				retval = new VariableDefinition (retType);
-				body.Variables.Add (retval);
-			}
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Call, imports.WaitForBridgeProcessingMethod));
-			var exceptionHandler = new ExceptionHandler (ExceptionHandlerType.Catch) {
-				CatchType = imports.SystemException,
-			};
-
-			body.ExceptionHandlers.Add (exceptionHandler);
-
-			Instruction? firstTryInstruction = null;
-			Instruction? inst = null;
-			uint nparam = 0;
-			foreach (ParameterDefinition pdef in callback.Parameters) {
-				TypeReference newType = MapToBlittableTypeIfNecessary (pdef.ParameterType, out _);
-				wrapperMethod.Parameters.Add (new ParameterDefinition (pdef.Name, pdef.Attributes, newType));
-
-				inst = GetLoadArgInstruction (nparam++, pdef);
-				if (firstTryInstruction == null) {
-					firstTryInstruction = inst;
-				}
-
-				body.Instructions.Add (inst);
-
-				if (!pdef.ParameterType.IsBlittable ()) {
-					GenerateNonBlittableConversion (pdef.ParameterType, newType);
-				}
-			}
-
-			inst = Instruction.Create (OpCodes.Call, callback);
-			if (firstTryInstruction == null) {
-				firstTryInstruction = inst;
-			}
-			body.Instructions.Add (inst);
-
-			exceptionHandler.TryStart = firstTryInstruction;
-
-			if (hasReturnValue && !returnTypeMapped) {
-				body.Instructions.Add (Instruction.Create (OpCodes.Stloc, retval));
-			}
-
-			Instruction ret = Instruction.Create (OpCodes.Ret);
-			Instruction? retValLoadInst = null;
-			Instruction leaveTarget;
-
-			if (hasReturnValue) {
-				if (returnTypeMapped) {
-					GenerateRetValCast (callback.ReturnType, retType);
-					body.Instructions.Add (Instruction.Create (OpCodes.Stloc, retval));
-				}
-
-				retValLoadInst = Instruction.Create (OpCodes.Ldloc, retval);
-				leaveTarget = retValLoadInst;
-			} else {
-				leaveTarget = ret;
-			}
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Leave_S, leaveTarget));
-
-			var exceptionVar = new VariableDefinition (imports.SystemException);
-			body.Variables.Add (exceptionVar);
-
-			var catchStartInst = Instruction.Create (OpCodes.Stloc, exceptionVar);
-			exceptionHandler.HandlerStart = catchStartInst;
-
-			// TryEnd must point to the next instruction after the try block
-			exceptionHandler.TryEnd = catchStartInst;
-
-			body.Instructions.Add (catchStartInst);
-			body.Instructions.Add (Instruction.Create (OpCodes.Ldarg_0));
-			body.Instructions.Add (Instruction.Create (OpCodes.Ldloc, exceptionVar));
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Call, imports.UnhandledExceptionMethod));
-
-			if (hasReturnValue) {
-				AddSetDefaultValueInstructions (body, retType, retval!);
-			}
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Leave_S, leaveTarget));
-
-			// HandlerEnd must point to the next instruction after the catch block
-			if (hasReturnValue) {
-				body.Instructions.Add (retValLoadInst);
-				exceptionHandler.HandlerEnd = retValLoadInst;
-			} else {
-				exceptionHandler.HandlerEnd = ret;
-			}
-			body.Instructions.Add (ret);
-
-			return wrapperMethod;
-
-			void GenerateNonBlittableConversion (TypeReference sourceType, TypeReference targetType)
-			{
-				if (IsBooleanConversion (sourceType, targetType)) {
-					// We output equivalent of the `param != 0` C# code
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Cgt_Un));
-					return;
-				}
-
-				ThrowUnsupportedType (sourceType);
-			}
-
-			void GenerateRetValCast (TypeReference sourceType, TypeReference targetType)
-			{
-				if (IsBooleanConversion (sourceType, targetType)) {
-					var insLoadOne = Instruction.Create (OpCodes.Ldc_I4_1);
-					var insConvert = Instruction.Create (OpCodes.Conv_U1);
-
-					body.Instructions.Add (Instruction.Create (OpCodes.Brtrue_S, insLoadOne));
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Br_S, insConvert));
-					body.Instructions.Add (insLoadOne);
-					body.Instructions.Add (insConvert);
-					return;
-				}
-
-				ThrowUnsupportedType (sourceType);
-			}
-
-			bool IsBooleanConversion (TypeReference sourceType, TypeReference targetType)
-			{
-				if (MonoAndroidHelper.StringEquals ("System.Boolean", sourceType.FullName)) {
-					if (!MonoAndroidHelper.StringEquals ("System.Byte", targetType.FullName)) {
-						throw new InvalidOperationException ($"[{targetArch}] Unexpected conversion from '{sourceType.FullName}' to '{targetType.FullName}'");
-					}
-
-					return true;
-				}
-
-				return false;
-			}
-
-			void ThrowUnsupportedType (TypeReference type)
-			{
-				throw new InvalidOperationException ($"[{targetArch}] Unsupported non-blittable type '{type.FullName}'");
-			}
-		}
-
-		void AddSetDefaultValueInstructions (MethodBody body, TypeReference type, VariableDefinition retval)
-		{
-			bool supported = false;
-
-			switch (type.FullName) {
-				case "System.Boolean":
-				case "System.Byte":
-				case "System.Int16":
-				case "System.Int32":
-				case "System.SByte":
-				case "System.UInt16":
-				case "System.UInt32":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					break;
-
-				case "System.Int64":
-				case "System.UInt64":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Conv_I8));
-					break;
-
-				case "System.IntPtr":
-				case "System.UIntPtr":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Conv_I));
-					break;
-
-				case "System.Single":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_R4, 0.0F));
-					break;
-
-				case "System.Double":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_R8, 0.0));
-					break;
-			}
-
-			if (supported) {
-				body.Instructions.Add (Instruction.Create (OpCodes.Stloc, retval));
-				return;
-			}
-
-			throw new InvalidOperationException ($"[{targetArch}] Unsupported type: '{type.FullName}'");
-		}
-
-
-		Instruction GetLoadArgInstruction (uint nparam, ParameterDefinition pdef)
-		{
-			OpCode ldargOp;
-			bool paramRef = false;
-
-			switch (nparam++) {
-				case 0:
-					ldargOp = OpCodes.Ldarg_0;
-					break;
-
-				case 1:
-					ldargOp = OpCodes.Ldarg_1;
-					break;
-
-				case 2:
-					ldargOp = OpCodes.Ldarg_2;
-					break;
-
-				case 3:
-					ldargOp = OpCodes.Ldarg_3;
-					break;
-
-				default:
-					ldargOp = OpCodes.Ldarg_S;
-					paramRef = true;
-					break;
-			}
-
-			if (!paramRef) {
-				return Instruction.Create (ldargOp);
-			}
-
-			return Instruction.Create (ldargOp, pdef);
-		}
-
-		TypeReference MapToBlittableTypeIfNecessary (TypeReference type, out bool typeMapped)
-		{
-			if (type.IsBlittable () || MonoAndroidHelper.StringEquals ("System.Void", type.FullName)) {
-				typeMapped = false;
-				return type;
-			}
-
-			if (MonoAndroidHelper.StringEquals ("System.Boolean", type.FullName)) {
-				// Maps to Java JNI's jboolean which is an unsigned 8-bit type
-				typeMapped = true;
-				return ReturnValid (typeof(byte));
-			}
-
-			throw new NotSupportedException ($"[{targetArch}] Cannot map unsupported blittable type '{type.FullName}'");
-
-			TypeReference ReturnValid (Type typeToLookUp)
-			{
-				TypeReference? mappedType = type.Module.Assembly.MainModule.ImportReference (typeToLookUp);
-				if (mappedType == null) {
-					throw new InvalidOperationException ($"[{targetArch}] Unable to obtain reference to type '{typeToLookUp.FullName}'");
-				}
-
-				return mappedType;
-			}
-		}
-
-		MethodDefinition GetUnmanagedCallersOnlyAttributeConstructor (IAssemblyResolver resolver)
-		{
-			AssemblyDefinition? asm = resolver.Resolve ("System.Runtime.InteropServices");
-			if (asm == null)
-				throw new ArgumentNullException (nameof (asm));
-			
-			TypeDefinition? unmanagedCallersOnlyAttribute = null;
-			foreach (ModuleDefinition md in asm.Modules) {
-				foreach (ExportedType et in md.ExportedTypes) {
-					if (!et.IsForwarder) {
-						continue;
-					}
-
-					if (!MonoAndroidHelper.StringEquals ("System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute", et.FullName)) {
-						continue;
-					}
-
-					unmanagedCallersOnlyAttribute = et.Resolve ();
-					break;
-				}
-			}
-
-			if (unmanagedCallersOnlyAttribute == null) {
-				throw new InvalidOperationException ("[{targetArch}] Unable to find the System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute type");
-			}
-
-			foreach (MethodDefinition md in unmanagedCallersOnlyAttribute.Methods) {
-				if (!md.IsConstructor) {
-					continue;
-				}
-
-				return md;
-			}
-
-			throw new InvalidOperationException ("[{targetArch}] Unable to find the System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute type constructor");
-		}
-
-		CustomAttribute CreateImportedUnmanagedCallersOnlyAttribute (AssemblyDefinition targetAssembly, MethodDefinition unmanagedCallersOnlyAtributeCtor)
-		{
-			return new CustomAttribute (targetAssembly.MainModule.ImportReference (unmanagedCallersOnlyAtributeCtor));
-		}
-
-		MethodDefinition? FindMethod (TypeDefinition type, string methodName, bool required)
-		{
-			log.LogDebugMessage ($"[{targetArch}] Looking for method '{methodName}' in type {type}");
-			foreach (MethodDefinition method in type.Methods) {
-				log.LogDebugMessage ($"[{targetArch}]   method: {method.Name}");
-				if (MonoAndroidHelper.StringEquals (methodName, method.Name)) {
-					log.LogDebugMessage ($"[{targetArch}]     match!");
-					return method;
-				}
-			}
-
-			if (required) {
-				throw new InvalidOperationException ($"[{targetArch}] Internal error: required method '{methodName}' in type {type} not found");
-			}
-
-			return null;
-		}
-
-		TypeDefinition? FindType (AssemblyDefinition asm, string typeName, bool required)
-		{
-			log.LogDebugMessage ($"[{targetArch}] Looking for type '{typeName}' in assembly '{asm}' ({GetAssemblyPathInfo (asm)})");
-			foreach (TypeDefinition t in asm.MainModule.Types) {
-				log.LogDebugMessage ($"[{targetArch}]    checking {t.FullName}");
-				if (MonoAndroidHelper.StringEquals (typeName, t.FullName)) {
-					log.LogDebugMessage ($"[{targetArch}]     match!");
-					return t;
-				}
-			}
-
-			if (required) {
-				throw new InvalidOperationException ($"[{targetArch}] Internal error: required type '{typeName}' in assembly {asm} not found");
-			}
-
-			return null;
-		}
-
-		static string GetAssemblyPathInfo (AssemblyDefinition asm)
-		{
-			string? path = asm.MainModule.FileName;
-			if (String.IsNullOrEmpty (path)) {
-				return "no assembly path";
-			}
-
-			return path;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs
deleted file mode 100644
index a1929fbea35..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs
+++ /dev/null
@@ -1,1107 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.TypeNameMappings;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Base class representing a method entry that contains information about 
-	/// a method and its declaring type. Used as a foundation for marshal method entries.
-	/// </summary>
-	class MethodEntry
-	{
-		/// <summary>
-		/// Gets the type that declares this method.
-		/// </summary>
-		public TypeDefinition DeclaringType { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MethodEntry"/> class.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method. Cannot be null.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="declaringType"/> is null.</exception>
-		public MethodEntry (TypeDefinition declaringType)
-		{
-			DeclaringType = declaringType ?? throw new ArgumentNullException (nameof (declaringType));
-		}
-	}
-
-	/// <summary>
-	/// Represents a marshal method entry containing all information needed to generate 
-	/// a native callback method and its associated metadata. This is the core data structure
-	/// used throughout the marshal method generation pipeline.
-	/// </summary>
-	class MarshalMethodEntry : MethodEntry
-	{
-		/// <summary>
-		/// The "real" native callback, used if it doesn't contain any non-blittable types in its parameters
-		/// or return type.
-		/// </summary>
-		MethodDefinition nativeCallbackReal;
-
-		/// <summary>
-		/// Used only when <see cref="NeedsBlittableWorkaround"/> is <c>true</c>. This wrapper is generated by
-		/// <see cref="MarshalMethodsAssemblyRewriter" /> when rewriting assemblies, for methods which have either
-		/// a non-blittable return type or a parameter of a non-blittable type.
-		/// </summary>
-		public MethodDefinition? NativeCallbackWrapper { get; set; }
-		
-		/// <summary>
-		/// The connector method that returns the delegate for this marshal method. 
-		/// May be null for converted marshal methods where the connector has been removed.
-		/// </summary>
-		public MethodDefinition? Connector             { get; }
-		
-		/// <summary>
-		/// The original registered method that was marked with [Register] attribute.
-		/// This is the .NET method that should be called from native code.
-		/// </summary>
-		public MethodDefinition? RegisteredMethod      { get; }
-		
-		/// <summary>
-		/// The actual implementation method that contains the business logic.
-		/// This may be the same as RegisteredMethod or a different method.
-		/// </summary>
-		public MethodDefinition? ImplementedMethod     { get; }
-		
-		/// <summary>
-		/// The delegate field that holds the callback delegate. May be null if the field doesn't exist.
-		/// </summary>
-		public FieldDefinition? CallbackField          { get; }
-		
-		/// <summary>
-		/// The JNI type name (e.g., "com/example/MyClass") for the Java class that owns this method.
-		/// </summary>
-		public string JniTypeName                      { get; }
-		
-		/// <summary>
-		/// The JNI method name for this method as it appears in Java/JNI.
-		/// </summary>
-		public string JniMethodName                    { get; }
-		
-		/// <summary>
-		/// The JNI method signature (e.g., "(ILjava/lang/String;)V") describing parameter and return types.
-		/// </summary>
-		public string JniMethodSignature               { get; }
-		
-		/// <summary>
-		/// Indicates whether this method requires a blittable workaround wrapper due to 
-		/// non-blittable parameter or return types.
-		/// </summary>
-		public bool NeedsBlittableWorkaround           { get; }
-
-		/// <summary>
-		/// Gets the native callback method to use. Returns the wrapper if it exists, otherwise the real callback.
-		/// </summary>
-		public MethodDefinition NativeCallback         => NativeCallbackWrapper ?? nativeCallbackReal;
-		
-		/// <summary>
-		/// Indicates whether this is a special case marshal method (e.g., TypeManager methods).
-		/// </summary>
-		public bool IsSpecial                          { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodEntry"/> class for a standard marshal method.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="nativeCallback">The native callback method.</param>
-		/// <param name="connector">The connector method that returns the delegate.</param>
-		/// <param name="registeredMethod">The registered method marked with [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual implementation method.</param>
-		/// <param name="callbackField">The delegate field that holds the callback delegate.</param>
-		/// <param name="jniTypeName">The JNI type name for the Java class.</param>
-		/// <param name="jniName">The JNI method name.</param>
-		/// <param name="jniSignature">The JNI method signature.</param>
-		/// <param name="needsBlittableWorkaround">Whether this method needs a blittable workaround wrapper.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		/// <exception cref="ArgumentException">Thrown when JNI names or signatures are null or empty.</exception>
-		public MarshalMethodEntry (TypeDefinition declaringType, MethodDefinition nativeCallback, MethodDefinition connector, MethodDefinition
-		                           registeredMethod, MethodDefinition implementedMethod, FieldDefinition callbackField, string jniTypeName,
-		                           string jniName, string jniSignature, bool needsBlittableWorkaround)
-			: base (declaringType)
-		{
-			nativeCallbackReal = nativeCallback ?? throw new ArgumentNullException (nameof (nativeCallback));
-			Connector = connector;  // The connector will not exist for converted marshal methods
-			RegisteredMethod = registeredMethod ?? throw new ArgumentNullException (nameof (registeredMethod));
-			ImplementedMethod = implementedMethod ?? throw new ArgumentNullException (nameof (implementedMethod));
-			CallbackField = callbackField; // we don't require the callback field to exist
-			JniTypeName = EnsureNonEmpty (jniTypeName, nameof (jniTypeName));
-			JniMethodName = EnsureNonEmpty (jniName, nameof (jniName));
-			JniMethodSignature = EnsureNonEmpty (jniSignature, nameof (jniSignature));
-			NeedsBlittableWorkaround = needsBlittableWorkaround;
-			IsSpecial = false;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodEntry"/> class for a special case method.
-		/// Special case methods are typically hand-written methods like TypeManager methods.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="nativeCallback">The native callback method.</param>
-		/// <param name="jniTypeName">The JNI type name for the Java class.</param>
-		/// <param name="jniName">The JNI method name.</param>
-		/// <param name="jniSignature">The JNI method signature.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		/// <exception cref="ArgumentException">Thrown when JNI names or signatures are null or empty.</exception>
-		public MarshalMethodEntry (TypeDefinition declaringType, MethodDefinition nativeCallback, string jniTypeName, string jniName, string jniSignature)
-			: base (declaringType)
-		{
-			nativeCallbackReal = nativeCallback ?? throw new ArgumentNullException (nameof (nativeCallback));
-			JniTypeName = EnsureNonEmpty (jniTypeName, nameof (jniTypeName));
-			JniMethodName = EnsureNonEmpty (jniName, nameof (jniName));
-			JniMethodSignature = EnsureNonEmpty (jniSignature, nameof (jniSignature));
-			IsSpecial = true;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodEntry"/> class by copying from another entry
-		/// but with a different native callback method. Used when creating wrapper methods.
-		/// </summary>
-		/// <param name="other">The source marshal method entry to copy from.</param>
-		/// <param name="nativeCallback">The new native callback method to use.</param>
-		/// <exception cref="ArgumentNullException">Thrown when parameters are null.</exception>
-		public MarshalMethodEntry (MarshalMethodEntry other, MethodDefinition nativeCallback)
-			: this (other.DeclaringType, nativeCallback, other.Connector, other.RegisteredMethod,
-			        other.ImplementedMethod, other.CallbackField, other.JniTypeName, other.JniMethodName,
-			        other.JniMethodSignature, other.NeedsBlittableWorkaround)
-		{}
-
-		/// <summary>
-		/// Ensures that the specified string is not null or empty.
-		/// </summary>
-		/// <param name="s">The string to validate.</param>
-		/// <param name="argName">The name of the argument for error reporting.</param>
-		/// <returns>The validated string.</returns>
-		/// <exception cref="ArgumentException">Thrown when the string is null or empty.</exception>
-		string EnsureNonEmpty (string s, string argName)
-		{
-			if (String.IsNullOrEmpty (s)) {
-				throw new ArgumentException ("must not be null or empty", argName);
-			}
-
-			return s;
-		}
-
-		/// <summary>
-		/// Gets a unique key for storing this marshal method entry. The key includes
-		/// the type name, assembly information, and method name.
-		/// </summary>
-		/// <param name="tdCache">The type definition cache for resolving assembly information.</param>
-		/// <returns>A unique string key for this marshal method entry.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when RegisteredMethod is null.</exception>
-		public string GetStoreMethodKey (TypeDefinitionCache tdCache)
-		{
-			MethodDefinition registeredMethod = RegisteredMethod;
-			string typeName = registeredMethod.DeclaringType.FullName.Replace ('/', '+');
-			return $"{typeName}, {registeredMethod.DeclaringType.GetPartialAssemblyName (tdCache)}\t{registeredMethod.Name}";
-		}
-	}
-
-	/// <summary>
-	/// Represents a marshal method entry that has been converted from its original form
-	/// to an optimized native callback. This is used when marshal methods have been 
-	/// pre-processed and converted to a more efficient form.
-	/// </summary>
-	sealed class ConvertedMarshalMethodEntry : MarshalMethodEntry
-	{
-		/// <summary>
-		/// Gets the converted native callback method that has been optimized for performance.
-		/// </summary>
-		public MethodDefinition ConvertedNativeCallback { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ConvertedMarshalMethodEntry"/> class.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="nativeCallback">The original native callback method.</param>
-		/// <param name="connector">The connector method that returns the delegate.</param>
-		/// <param name="registeredMethod">The registered method marked with [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual implementation method.</param>
-		/// <param name="callbackField">The delegate field that holds the callback delegate.</param>
-		/// <param name="jniTypeName">The JNI type name for the Java class.</param>
-		/// <param name="jniName">The JNI method name.</param>
-		/// <param name="jniSignature">The JNI method signature.</param>
-		/// <param name="needsBlittableWorkaround">Whether this method needs a blittable workaround wrapper.</param>
-		/// <param name="convertedNativeCallback">The converted/optimized native callback method.</param>
-		/// <exception cref="ArgumentNullException">Thrown when convertedNativeCallback is null.</exception>
-		public ConvertedMarshalMethodEntry (TypeDefinition declaringType, MethodDefinition nativeCallback, MethodDefinition connector, MethodDefinition
-					   registeredMethod, MethodDefinition implementedMethod, FieldDefinition callbackField, string jniTypeName,
-					   string jniName, string jniSignature, bool needsBlittableWorkaround, MethodDefinition convertedNativeCallback)
-			: base (declaringType, nativeCallback, connector, registeredMethod, implementedMethod, callbackField, jniTypeName, jniName, jniSignature, needsBlittableWorkaround)
-		{
-			ConvertedNativeCallback = convertedNativeCallback ?? throw new ArgumentNullException (nameof (convertedNativeCallback));
-		}
-	}
-
-	/// <summary>
-	/// Represents a marshal method that cannot be converted to a static native callback
-	/// and must be registered dynamically at runtime. This typically happens when
-	/// the method signature or attributes don't meet the requirements for static marshaling.
-	/// </summary>
-	sealed class DynamicallyRegisteredMarshalMethodEntry : MethodEntry
-	{
-		/// <summary>
-		/// Gets the actual implementation method that contains the business logic.
-		/// </summary>
-		public MethodDefinition ImplementedMethod { get; }
-		
-		/// <summary>
-		/// Gets the [Register] attribute that was applied to the method.
-		/// </summary>
-		public CustomAttribute RegisterAttribute { get; }
-		
-		/// <summary>
-		/// Gets the registered method that was marked with the [Register] attribute.
-		/// </summary>
-		public MethodDefinition RegisteredMethod { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="DynamicallyRegisteredMarshalMethodEntry"/> class.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="implementedMethod">The actual implementation method.</param>
-		/// <param name="registeredMethod">The registered method marked with [Register] attribute.</param>
-		/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-		public DynamicallyRegisteredMarshalMethodEntry (TypeDefinition declaringType, MethodDefinition implementedMethod, MethodDefinition registeredMethod, CustomAttribute registerAttribute)
-			: base (declaringType)
-		{
-			ImplementedMethod = implementedMethod;
-			RegisteredMethod = registeredMethod;
-			RegisterAttribute = registerAttribute;
-		}
-	}
-
-	/// <summary>
-	/// Analyzes and classifies methods in .NET assemblies to determine which can be converted
-	/// to efficient marshal methods and which must be registered dynamically. This is a core
-	/// component of the marshal method generation pipeline that examines method signatures,
-	/// attributes, and types to make classification decisions.
-	/// </summary>
-	class MarshalMethodsClassifier
-	{
-		/// <summary>
-		/// Contains information about a connector method parsed from a connector specification string.
-		/// Connector methods are responsible for returning delegates that bridge between .NET and native code.
-		/// </summary>
-		public sealed class ConnectorInfo
-		{
-			/// <summary>
-			/// Gets the name of the connector method (e.g., "GetMyMethodHandler").
-			/// </summary>
-			public string MethodName                  { get; }
-			
-			/// <summary>
-			/// Gets the full type name that contains the connector method.
-			/// </summary>
-			public string TypeName                    { get; }
-			
-			/// <summary>
-			/// Gets the assembly name reference for the assembly containing the connector method.
-			/// </summary>
-			public AssemblyNameReference AssemblyName { get; }
-
-			/// <summary>
-			/// Initializes a new instance of the <see cref="ConnectorInfo"/> class by parsing
-			/// a connector specification string.
-			/// </summary>
-			/// <param name="spec">
-			/// The connector specification string in the format: "MethodName:TypeName, AssemblyName"
-			/// For example: "GetMyMethodHandler:MyNamespace.MyType, MyAssembly"
-			/// </param>
-			public ConnectorInfo (string spec)
-			{
-				// Parse connector specification: "MethodName:TypeName, AssemblyName"
-				string[] connectorSpec = spec.Split (':');
-				MethodName = connectorSpec[0];
-
-				if (connectorSpec.Length < 2) {
-					return;
-				}
-
-				// Extract type name and assembly name from the full type specification
-				string fullTypeName = connectorSpec[1];
-				int comma = fullTypeName.IndexOf (',');
-				TypeName = fullTypeName.Substring (0, comma);
-				AssemblyName = AssemblyNameReference.Parse (fullTypeName.Substring (comma + 1).Trim ());
-			}
-		}
-
-		/// <summary>
-		/// Interface for matching method signatures when searching for methods.
-		/// Implementations can provide custom logic for determining if a method's signature matches expected criteria.
-		/// </summary>
-		interface IMethodSignatureMatcher
-		{
-			/// <summary>
-			/// Determines whether the specified method matches the expected signature.
-			/// </summary>
-			/// <param name="method">The method to check.</param>
-			/// <returns>true if the method matches the expected signature; otherwise, false.</returns>
-			bool Matches (MethodDefinition method);
-		}
-
-		/// <summary>
-		/// Implements <see cref="IMethodSignatureMatcher"/> to match native callback method signatures.
-		/// This class generates the expected native callback signature based on a target .NET method
-		/// and can verify if candidate methods match that signature. Native callbacks must follow
-		/// specific patterns to be compatible with JNI and the marshal method system.
-		/// </summary>
-		sealed class NativeCallbackSignature : IMethodSignatureMatcher
-		{
-			/// <summary>
-			/// Set of .NET types that can be passed directly to native code without marshaling.
-			/// These are blittable types that have the same representation in both managed and native memory.
-			/// </summary>
-			static readonly HashSet<string> verbatimTypes = new HashSet<string> (StringComparer.Ordinal) {
-				"System.Boolean",
-				"System.Byte",
-				"System.Char",
-				"System.Double",
-				"System.Int16",
-				"System.Int32",
-				"System.Int64",
-				"System.IntPtr",
-				"System.SByte",
-				"System.Single",
-				"System.UInt16",
-				"System.UInt32",
-				"System.UInt64",
-				"System.Void",
-			};
-
-			readonly List<string> paramTypes;
-			readonly string returnType;
-			readonly TaskLoggingHelper log;
-			readonly TypeDefinitionCache cache;
-
-			/// <summary>
-			/// Initializes a new instance of the <see cref="NativeCallbackSignature"/> class.
-			/// Analyzes the target method and generates the expected native callback signature.
-			/// </summary>
-			/// <param name="target">The target .NET method to generate a native callback signature for.</param>
-			/// <param name="log">The logging helper for diagnostic messages.</param>
-			/// <param name="cache">The type definition cache for resolving types.</param>
-			public NativeCallbackSignature (MethodDefinition target, TaskLoggingHelper log, TypeDefinitionCache cache)
-			{
-				this.log = log;
-				this.cache = cache;
-				
-				// Map the return type to its native equivalent
-				returnType = MapType (target.ReturnType);
-				
-				// Native callbacks always start with JNIEnv* and jobject/jclass parameters
-				paramTypes = new List<string> {
-					"System.IntPtr", // jnienv
-					"System.IntPtr", // native__this
-				};
-
-				// Add mapped parameter types
-				foreach (ParameterDefinition pd in target.Parameters) {
-					paramTypes.Add (MapType (pd.ParameterType));
-				}
-			}
-
-			/// <summary>
-			/// Maps a .NET type reference to its corresponding native type for use in native callbacks.
-			/// This handles the conversion from managed types to types that can be passed through JNI.
-			/// </summary>
-			/// <param name="typeRef">The .NET type reference to map.</param>
-			/// <returns>The full name of the corresponding native type.</returns>
-			/// <exception cref="InvalidOperationException">Thrown when a type cannot be resolved.</exception>
-			string MapType (TypeReference typeRef)
-			{
-				string? typeName = null;
-				
-				// Handle non-generic, non-array types that might be enums
-				if (!typeRef.IsGenericParameter && !typeRef.IsArray) {
-					TypeDefinition typeDef = cache.Resolve (typeRef);
-					if (typeDef == null) {
-						throw new InvalidOperationException ($"Unable to resolve type '{typeRef.FullName}'");
-					}
-
-					// Enums are represented by their underlying type in native code
-					if (typeDef.IsEnum) {
-						return GetEnumUnderlyingType (typeDef).FullName;
-					}
-				}
-
-				// Use the full type name if not already determined
-				if (String.IsNullOrEmpty (typeName)) {
-					typeName = typeRef.FullName;
-				}
-
-				// Types that can be passed directly without conversion
-				if (verbatimTypes.Contains (typeName)) {
-					return typeName;
-				}
-
-				// Special case: Android.Graphics.Color is mapped to/from a native `int`
-				if (MonoAndroidHelper.StringEquals (typeName, "Android.Graphics.Color")) {
-					return "System.Int32";
-				}
-
-				// All other types are passed as IntPtr (jobject references)
-				return "System.IntPtr";
-			}
-
-			/// <summary>
-			/// Gets the underlying type of an enumeration. Enums in .NET have an underlying integral type
-			/// that is used when passing them through JNI.
-			/// </summary>
-			/// <param name="td">The enumeration type definition.</param>
-			/// <returns>The underlying type reference of the enumeration.</returns>
-			/// <exception cref="InvalidOperationException">Thrown when the underlying type cannot be determined.</exception>
-			static TypeReference GetEnumUnderlyingType (TypeDefinition td)
-			{
-				var fields = td.Fields;
-
-				// The first non-static field in an enum is the value field containing the underlying type
-				for (int i = 0; i < fields.Count; i++) {
-					var field = fields [i];
-					if (!field.IsStatic)
-						return field.FieldType;
-				}
-
-				throw new InvalidOperationException ($"Unable to determine underlying type of the '{td.FullName}' enum");
-			}
-
-			/// <summary>
-			/// Determines whether the specified method matches the expected native callback signature.
-			/// This includes checking parameter count, parameter types, return type, and that the method is static.
-			/// </summary>
-			/// <param name="method">The method to check against the expected signature.</param>
-			/// <returns>true if the method matches the expected signature; otherwise, false.</returns>
-			public bool Matches (MethodDefinition method)
-			{
-				// Native callbacks must be static and have the correct number of parameters
-				if (method.Parameters.Count != paramTypes.Count || !method.IsStatic) {
-					log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature (invalid parameter count or not static)");
-					return false;
-				}
-
-				// Check return type match
-				if (!TypeMatches (returnType, method.ReturnType.FullName)) {
-					log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature (invalid return type: expected '{returnType}', found '{method.ReturnType.FullName}')");
-					return false;
-				}
-
-				// Check each parameter type
-				for (int i = 0; i < method.Parameters.Count; i++) {
-					ParameterDefinition pd = method.Parameters[i];
-					string parameterTypeName;
-
-					// Handle array types specially
-					if (pd.ParameterType.IsArray) {
-						parameterTypeName = $"{pd.ParameterType.FullName}[]";
-					} else {
-						parameterTypeName = pd.ParameterType.FullName;
-					}
-
-					if (!TypeMatches (parameterTypeName, paramTypes[i])) {
-						log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature, expected parameter type '{paramTypes[i]}' at position {i}, found '{parameterTypeName}'");
-						return false;
-					}
-				}
-
-				return true;
-			}
-
-			/// <summary>
-			/// Array of equivalent type mappings for marshaling. Some .NET types are marshaled
-			/// as different blittable types when passed through JNI, so we need to treat them as equivalent
-			/// when matching signatures.
-			/// </summary>
-			// Because these types are marshaled as different blittable types,
-			// we need to accept them as equivalent
-			static readonly (string Source, string Replacement)[] equivalent_types = [
-				(Source: "System.Boolean", Replacement: "System.SByte"),
-				(Source: "System.Char", Replacement: "System.UInt16"),
-			];
-
-			/// <summary>
-			/// Determines whether two type names are equivalent for native callback matching purposes.
-			/// This handles both exact matches and equivalent type mappings used during marshaling.
-			/// </summary>
-			/// <param name="type">The expected type name.</param>
-			/// <param name="methodType">The actual method type name.</param>
-			/// <returns>true if the types are equivalent; otherwise, false.</returns>
-			static bool TypeMatches (string type, string methodType)
-			{
-				// Check for exact match first
-				if (MonoAndroidHelper.StringEquals (type, methodType))
-					return true;
-
-				// Check for equivalent type mappings in both directions
-				foreach (var eq in equivalent_types) {
-					if (string.Compare (eq.Source, type, StringComparison.Ordinal) == 0 && string.Compare (eq.Replacement, methodType, StringComparison.Ordinal) == 0)
-						return true;
-
-					if (string.Compare (eq.Source, methodType, StringComparison.Ordinal) == 0 && string.Compare (eq.Replacement, type, StringComparison.Ordinal) == 0)
-						return true;
-				}
-
-				return false;
-			}
-		}
-
-		// Core dependencies for the classifier
-		TypeDefinitionCache tdCache;
-		IAssemblyResolver resolver;
-		TaskLoggingHelper log;
-		readonly AndroidTargetArch targetArch;
-
-		/// <summary>
-		/// Gets the type definition cache used for resolving type references.
-		/// </summary>
-		public TypeDefinitionCache TypeDefinitionCache => tdCache;
-		
-		/// <summary>
-		/// Gets the logging helper for diagnostic messages.
-		/// </summary>
-		public TaskLoggingHelper Log => log;
-		
-		/// <summary>
-		/// Gets the assembly resolver for loading assembly definitions.
-		/// </summary>
-		public IAssemblyResolver Resolver => resolver;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodsClassifier"/> class with target architecture.
-		/// </summary>
-		/// <param name="targetArch">The target architecture for marshal method generation.</param>
-		/// <param name="tdCache">The type definition cache for resolving types.</param>
-		/// <param name="res">The assembly resolver for loading assemblies.</param>
-		/// <param name="log">The logging helper for diagnostic messages.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		public MarshalMethodsClassifier (AndroidTargetArch targetArch, TypeDefinitionCache tdCache, IAssemblyResolver res, TaskLoggingHelper log)
-		{
-			this.targetArch = targetArch;
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.tdCache = tdCache ?? throw new ArgumentNullException (nameof (tdCache));
-			resolver = res ?? throw new ArgumentNullException (nameof (tdCache));
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodsClassifier"/> class without target architecture.
-		/// Used when architecture-specific information is not needed for classification.
-		/// </summary>
-		/// <param name="tdCache">The type definition cache for resolving types.</param>
-		/// <param name="res">The assembly resolver for loading assemblies.</param>
-		/// <param name="log">The logging helper for diagnostic messages.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		public MarshalMethodsClassifier (TypeDefinitionCache tdCache, IAssemblyResolver res, TaskLoggingHelper log)
-		{
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.tdCache = tdCache ?? throw new ArgumentNullException (nameof (tdCache));
-			resolver = res ?? throw new ArgumentNullException (nameof (tdCache));
-		}
-
-		/// <summary>
-		/// Classifies a method to determine whether it can be converted to a marshal method
-		/// or must be registered dynamically. This is the main entry point for method classification.
-		/// </summary>
-		/// <param name="topType">The top-level type that owns this method (may differ from declaring type due to inheritance).</param>
-		/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual method implementation that contains the business logic.</param>
-		/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-		/// <returns>
-		/// A <see cref="MarshalMethodEntry"/> if the method can be converted to a marshal method,
-		/// or a <see cref="DynamicallyRegisteredMarshalMethodEntry"/> if it must be registered dynamically.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		public MethodEntry ClassifyMethod (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute? registerAttribute)
-		{
-			topType = topType ?? throw new ArgumentNullException (nameof (topType));
-			registeredMethod = registeredMethod ?? throw new ArgumentNullException (nameof (registeredMethod));
-			implementedMethod = implementedMethod ?? throw new ArgumentNullException (nameof (implementedMethod));
-			registerAttribute = registerAttribute ?? throw new ArgumentNullException (nameof (registerAttribute));
-
-			// Try to classify as a standard marshal method first
-			if (IsDynamicallyRegistered (topType, registeredMethod, implementedMethod, registerAttribute, out var marshalMethodEntry)) {
-				// Method must be registered dynamically at runtime
-				return new DynamicallyRegisteredMarshalMethodEntry (topType, implementedMethod, registeredMethod, registerAttribute);
-			}
-
-			// Method can be converted to a marshal method
-			return marshalMethodEntry;
-		}
-
-		// Helper methods for getting assembly path information for debugging/logging
-		/// <summary>
-		/// Gets assembly path information for a field, used in diagnostic messages.
-		/// </summary>
-		/// <param name="field">The field to get assembly information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (FieldDefinition? field)   => GetAssemblyPathInfo (field?.DeclaringType);
-		
-		/// <summary>
-		/// Gets assembly path information for a method, used in diagnostic messages.
-		/// </summary>
-		/// <param name="method">The method to get assembly information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (MethodDefinition? method) => GetAssemblyPathInfo (method?.DeclaringType);
-		
-		/// <summary>
-		/// Gets assembly path information for a type, used in diagnostic messages.
-		/// </summary>
-		/// <param name="type">The type to get assembly information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (TypeDefinition? type)     => GetAssemblyPathInfo (type?.Module?.Assembly);
-
-		/// <summary>
-		/// Gets assembly path information for an assembly definition, used in diagnostic messages.
-		/// </summary>
-		/// <param name="asmdef">The assembly definition to get path information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (AssemblyDefinition? asmdef)
-		{
-			if (asmdef == null) {
-				return "[assembly definition missing]";
-			}
-
-			string? path = asmdef.MainModule.FileName;
-			if (String.IsNullOrEmpty (path)) {
-				path = "unknown";
-			}
-
-			return $"[Arch: {targetArch}; Assembly: {path}]";
-		}
-
-		/// <summary>
-		/// Determines whether a method must be registered dynamically or can be converted to a marshal method.
-		/// This method analyzes the [Register] attribute and validates the method's compatibility with
-		/// the marshal method system.
-		/// </summary>
-		/// <param name="topType">The top-level type that owns this method.</param>
-		/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual method implementation.</param>
-		/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-		/// <param name="marshalMethodEntry">
-		/// When this method returns false, contains the marshal method entry for the convertible method.
-		/// When this method returns true, this parameter is null.
-		/// </param>
-		/// <returns>
-		/// true if the method must be registered dynamically; false if it can be converted to a marshal method.
-		/// </returns>
-		bool IsDynamicallyRegistered (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute registerAttribute, [NotNullWhen (false)] out MarshalMethodEntry? marshalMethodEntry)
-		{
-			marshalMethodEntry = null;
-			
-			// The [Register] attribute must have exactly 3 arguments: JNI name, JNI signature, and connector
-			if (registerAttribute.ConstructorArguments.Count != 3) {
-				log.LogWarning ($"Method '{registeredMethod.FullName}' will be registered dynamically, not enough arguments to the [Register] attribute to generate marshal method.");
-				return true;
-			}
-
-			// Parse the connector information from the third argument
-			var connector = new ConnectorInfo ((string)registerAttribute.ConstructorArguments[2].Value);
-
-			// Try to classify as a standard handler (most common case)
-			if (IsStandardHandler (topType, connector, registeredMethod, implementedMethod, jniName: (string)registerAttribute.ConstructorArguments[0].Value, jniSignature: (string)registerAttribute.ConstructorArguments[1].Value, out marshalMethodEntry)) {
-				return false; // Method can be converted to marshal method
-			}
-
-			// Method cannot be converted, must be registered dynamically
-			log.LogWarning ($"Method '{registeredMethod.FullName}' will be registered dynamically {GetAssemblyPathInfo (registeredMethod)}");
-			return true;
-		}
-
-		/// <summary>
-		/// Determines whether a method follows the "standard handler" pattern and can be converted to a marshal method.
-		/// The standard handler pattern involves a native callback method, a connector method that returns a delegate,
-		/// and optionally a delegate backing field. This method performs extensive validation to ensure all
-		/// components exist and are compatible.
-		/// </summary>
-		/// <param name="topType">The top-level type that owns this method.</param>
-		/// <param name="connector">Information about the connector method parsed from the [Register] attribute.</param>
-		/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual method implementation.</param>
-		/// <param name="jniName">The JNI method name from the [Register] attribute.</param>
-		/// <param name="jniSignature">The JNI method signature from the [Register] attribute.</param>
-		/// <param name="marshalMethodEntry">
-		/// When this method returns true, contains the marshal method entry for the convertible method.
-		/// When this method returns false, this parameter is null.
-		/// </param>
-		/// <returns>true if the method follows the standard handler pattern; false otherwise.</returns>
-		bool IsStandardHandler (TypeDefinition topType, ConnectorInfo connector, MethodDefinition registeredMethod, MethodDefinition implementedMethod, string jniName, string jniSignature, [NotNullWhen (true)] out MarshalMethodEntry? marshalMethodEntry)
-		{
-			marshalMethodEntry = null;
-
-			// Standard handler connector names must follow the pattern: "Get{Name}Handler"
-			const string HandlerNameStart = "Get";
-			const string HandlerNameEnd = "Handler";
-
-			string connectorName = connector.MethodName;
-			if (connectorName.Length < HandlerNameStart.Length + HandlerNameEnd.Length + 1 ||
-			    !connectorName.StartsWith (HandlerNameStart, StringComparison.Ordinal) ||
-			    !connectorName.EndsWith (HandlerNameEnd, StringComparison.Ordinal)) {
-				log.LogWarning ($"Connector name '{connectorName}' must start with '{HandlerNameStart}', end with '{HandlerNameEnd}' and have at least one character between the two parts.");
-				return false;
-			}
-
-			// Extract the core method name from the connector name
-			// e.g., "GetMyMethodHandler" -> "MyMethod"
-			// TODO: if we can't find native callback and/or delegate field using `callbackNameCore`, fall back to `jniName` (which is the first argument to the `[Register]`
-			// attribute). Or simply use `jniName` at once - needs testing.
-			string callbackNameCore = connectorName.Substring (HandlerNameStart.Length, connectorName.Length - HandlerNameStart.Length - HandlerNameEnd.Length);
-			
-			// Generate expected method and field names based on the core name
-			string nativeCallbackName = $"n_{callbackNameCore}";                           // e.g., "n_MyMethod"
-			string nativeConvertedCallbackName = $"n_{callbackNameCore}_mm_wrapper";       // e.g., "n_MyMethod_mm_wrapper"
-			string delegateFieldName = $"cb_{Char.ToLowerInvariant (callbackNameCore[0])}{callbackNameCore.Substring (1)}"; // e.g., "cb_myMethod"
-
-			// Find the type that contains the connector method
-			TypeDefinition connectorDeclaringType = connector.AssemblyName == null ? registeredMethod.DeclaringType : FindType (resolver.Resolve (connector.AssemblyName), connector.TypeName);
-
-			// Create a signature matcher to validate native callback methods
-			var ncbs = new NativeCallbackSignature (registeredMethod, log, tdCache);
-			
-			// Find the native callback method with matching signature
-			MethodDefinition nativeCallbackMethod = FindMethod (connectorDeclaringType, nativeCallbackName, ncbs);
-			if (nativeCallbackMethod == null) {
-				log.LogWarning ($"Unable to find native callback method '{nativeCallbackName}' in type '{connectorDeclaringType.FullName}', matching the '{registeredMethod.FullName}' signature (jniName: '{jniName}') {GetAssemblyPathInfo (connectorDeclaringType)}");
-				return false;
-			}
-
-			// Validate that the native callback can be used with [UnmanagedCallersOnly]
-			if (!EnsureIsValidUnmanagedCallersOnlyTarget (nativeCallbackMethod, out bool needsBlittableWorkaround)) {
-				return false;
-			}
-
-			// Look for a converted callback method (indicates the method has already been processed)
-			MethodDefinition? nativeConvertedCallbackMethod = FindMethod (connectorDeclaringType, nativeConvertedCallbackName, ncbs);
-
-			// Find the connector method that returns the delegate
-			MethodDefinition connectorMethod = FindMethod (connectorDeclaringType, connectorName);
-
-			// If the marshal method has already been converted, the connector method will have been removed
-			if (connectorMethod == null && nativeConvertedCallbackMethod == null) {
-				log.LogWarning ($"Connector method '{connectorName}' not found in type '{connectorDeclaringType.FullName}' {GetAssemblyPathInfo (connectorDeclaringType)}");
-				return false;
-			}
-
-			// Validate connector method return type
-			if (connectorMethod != null && !MonoAndroidHelper.StringEquals ("System.Delegate", connectorMethod.ReturnType.FullName)) {
-				log.LogWarning ($"Connector '{connectorName}' in type '{connectorDeclaringType.FullName}' has invalid return type, expected 'System.Delegate', found '{connectorMethod.ReturnType.FullName}' {GetAssemblyPathInfo (connectorDeclaringType)}");
-				return false;
-			}
-
-			// Find the delegate backing field (optional, but validates if present)
-			// In the standard handler "pattern", the native callback backing field is private, static and thus in the same type
-			// as the native callback.
-			FieldDefinition delegateField = FindField (nativeCallbackMethod.DeclaringType, delegateFieldName);
-			if (delegateField != null) {
-				if (!MonoAndroidHelper.StringEquals ("System.Delegate", delegateField.FieldType.FullName)) {
-					log.LogWarning ($"delegate field '{delegateFieldName}' in type '{nativeCallbackMethod.DeclaringType.FullName}' has invalid type, expected 'System.Delegate', found '{delegateField.FieldType.FullName}' {GetAssemblyPathInfo (delegateField)}");
-					return false;
-				}
-			}
-
-			// TODO: check where DeclaringType is lost between here and rewriter, for:
-			//
-			// The following debug output shows a complex inheritance scenario where the declaring type
-			// information gets lost between classification and rewriting. This needs investigation.
-			//
-			// Classifying:
-			//         method: Java.Lang.Object Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter::GetItem(System.Int32)
-			//         registered method: Java.Lang.Object Android.Widget.BaseAdapter::GetItem(System.Int32))
-			//         Attr: Android.Runtime.RegisterAttribute (parameter count: 3)
-			//         Top type: Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter
-			//         Managed type: Android.Widget.BaseAdapter, Mono.Android
-			//         connector: GetGetItem_IHandler (from spec: 'GetGetItem_IHandler')
-			//         connector name: GetGetItem_IHandler
-			//         native callback name: n_GetItem_I
-			//         delegate field name: cb_getItem_I
-			// ##G1: Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter -> crc640ec207abc449b2ca/ShellSearchViewAdapter
-			// ##G1: top type: Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter -> crc640ec207abc449b2ca/ShellSearchViewAdapter
-			// ##G1: connectorMethod: System.Delegate Android.Widget.BaseAdapter::GetGetItem_IHandler()
-			// ##G1: delegateField: System.Delegate Android.Widget.BaseAdapter::cb_getItem_I
-			//
-			// And in the rewriter:
-			//
-			//         System.IntPtr Android.Widget.BaseAdapter::n_GetItem_I(System.IntPtr,System.IntPtr,System.Int32) (token: 0x5fe3)
-			// Top type == 'Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter'
-			// 	NativeCallback == 'System.IntPtr Android.Widget.BaseAdapter::n_GetItem_I(System.IntPtr,System.IntPtr,System.Int32)'
-			// 	Connector == 'System.Delegate GetGetItem_IHandler()'
-			// 	method.NativeCallback.CustomAttributes == Mono.Collections.Generic.Collection`1[Mono.Cecil.CustomAttribute]
-			// 	method.Connector.DeclaringType == 'null'
-			// 	method.Connector.DeclaringType.Methods == 'null'
-			// 	method.CallbackField == System.Delegate cb_getItem_I
-			// 	method.CallbackField?.DeclaringType == 'null'
-			// 	method.CallbackField?.DeclaringType.Fields == 'null'
-
-			// Create the appropriate marshal method entry based on whether the method has been converted
-			if (nativeConvertedCallbackMethod is null) {
-				// Standard marshal method entry
-				marshalMethodEntry =
-					new MarshalMethodEntry (
-						topType,
-						nativeCallbackMethod,
-						connectorMethod,
-						registeredMethod,
-						implementedMethod,
-						delegateField,
-						JavaNativeTypeManager.ToJniName (topType, tdCache),
-						jniName,
-						jniSignature,
-						needsBlittableWorkaround
-					);
-			} else {
-				// Converted marshal method entry (method has already been processed)
-				marshalMethodEntry =
-					new ConvertedMarshalMethodEntry (
-						topType,
-						nativeCallbackMethod,
-						connectorMethod,
-						registeredMethod,
-						implementedMethod,
-						delegateField,
-						JavaNativeTypeManager.ToJniName (topType, tdCache),
-						jniName,
-						jniSignature,
-						needsBlittableWorkaround,
-						nativeConvertedCallbackMethod
-					);
-			}
-
-			return true;
-		}
-
-		/// <summary>
-		/// Validates that a method is suitable for use with the [UnmanagedCallersOnly] attribute.
-		/// This attribute has strict requirements for method signatures and parameters that must be met
-		/// for marshal methods to work correctly.
-		/// </summary>
-		/// <param name="method">The method to validate.</param>
-		/// <param name="needsBlittableWorkaround">
-		/// When this method returns true, indicates whether the method requires a blittable workaround
-		/// due to non-blittable parameter or return types.
-		/// </param>
-		/// <returns>
-		/// true if the method can be used with [UnmanagedCallersOnly] (possibly with workarounds); 
-		/// false if it has incompatible characteristics.
-		/// </returns>
-		bool EnsureIsValidUnmanagedCallersOnlyTarget (MethodDefinition method, out bool needsBlittableWorkaround)
-		{
-			needsBlittableWorkaround = false;
-
-			// Requirements: https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0#remarks
-			
-			// Method must be static
-			if (!method.IsStatic) {
-				return LogReasonWhyAndReturnFailure ($"is not static");
-			}
-
-			// Method cannot have generic parameters
-			if (method.HasGenericParameters) {
-				return LogReasonWhyAndReturnFailure ($"has generic parameters");
-			}
-
-			// Check return type for blittability
-			TypeReference type;
-			if (!MonoAndroidHelper.StringEquals ("System.Void", method.ReturnType.FullName)) {
-				type = GetRealType (method.ReturnType);
-				if (!IsAcceptable (type)) {
-					needsBlittableWorkaround = true;
-					WarnWhy ($"has a non-blittable return type '{type.FullName}'");
-				}
-			}
-
-			// Declaring type cannot have generic parameters
-			if (method.DeclaringType.HasGenericParameters) {
-				return LogReasonWhyAndReturnFailure ($"is declared in a type with generic parameters");
-			}
-
-			// If method has no parameters, it's valid
-			if (!method.HasParameters) {
-				return true;
-			}
-
-			// Check each parameter for blittability
-			foreach (ParameterDefinition pdef in method.Parameters) {
-				type = GetRealType (pdef.ParameterType);
-
-				if (!IsAcceptable (type)) {
-					needsBlittableWorkaround = true;
-					WarnWhy ($"has a parameter ({pdef.Name}) of non-blittable type '{type.FullName}'");
-				}
-			}
-
-			return true;
-
-			/// <summary>
-			/// Determines if a type is acceptable for [UnmanagedCallersOnly] methods.
-			/// This includes blittable types and single-dimensional arrays of blittable types.
-			/// </summary>
-			/// <param name="type">The type to check.</param>
-			/// <returns>true if the type is acceptable; otherwise, false.</returns>
-			bool IsAcceptable (TypeReference type)
-			{
-				// Multi-dimensional arrays are not allowed
-				if (type.IsArray) {
-					var array = new ArrayType (type);
-					if (array.Rank > 1) {
-						return false;
-					}
-				}
-
-				return type.IsBlittable ();
-			}
-
-			/// <summary>
-			/// Gets the real type from a type reference, handling array types by returning their element type.
-			/// </summary>
-			/// <param name="type">The type reference to process.</param>
-			/// <returns>The element type for arrays, or the original type for non-arrays.</returns>
-			TypeReference GetRealType (TypeReference type)
-			{
-				if (type.IsArray) {
-					return type.GetElementType ();
-				}
-
-				return type;
-			}
-
-			/// <summary>
-			/// Logs a reason why a method cannot be used with [UnmanagedCallersOnly] and returns false.
-			/// </summary>
-			/// <param name="why">The reason why the method is not compatible.</param>
-			/// <returns>Always returns false.</returns>
-			bool LogReasonWhyAndReturnFailure (string why)
-			{
-				log.LogWarning ($"Method '{method.FullName}' {why}. It cannot be used with the `[UnmanagedCallersOnly]` attribute");
-				return false;
-			}
-
-			/// <summary>
-			/// Logs a warning about why a method needs a blittable workaround.
-			/// </summary>
-			/// <param name="why">The reason why a workaround is needed.</param>
-			void WarnWhy (string why)
-			{
-				// TODO: change to LogWarning once the generator can output code which requires no non-blittable wrappers
-				log.LogDebugMessage ($"Method '{method.FullName}' {why}. A workaround is required, this may make the application slower");
-			}
-		}
-
-		/// <summary>
-		/// Finds a type definition by name within an assembly. This method searches through
-		/// all modules in the assembly and handles nested types recursively.
-		/// </summary>
-		/// <param name="asm">The assembly to search in.</param>
-		/// <param name="typeName">The full name of the type to find.</param>
-		/// <returns>The type definition if found; otherwise, null.</returns>
-		TypeDefinition FindType (AssemblyDefinition asm, string typeName)
-		{
-			// Search through all modules in the assembly
-			foreach (ModuleDefinition md in asm.Modules) {
-				foreach (TypeDefinition td in md.Types) {
-					TypeDefinition match = GetMatchingType (td);
-					if (match != null) {
-						return match;
-					}
-				}
-			}
-
-			return null;
-
-			/// <summary>
-			/// Recursively searches for a type with the specified name, including nested types.
-			/// </summary>
-			/// <param name="def">The type definition to check.</param>
-			/// <returns>The matching type definition if found; otherwise, null.</returns>
-			TypeDefinition GetMatchingType (TypeDefinition def)
-			{
-				// Check if this type matches
-				if (MonoAndroidHelper.StringEquals (def.FullName, typeName)) {
-					return def;
-				}
-
-				// Search nested types if they exist
-				if (!def.HasNestedTypes) {
-					return null;
-				}
-
-				TypeDefinition ret;
-				foreach (TypeDefinition nested in def.NestedTypes) {
-					ret = GetMatchingType (nested);
-					if (ret != null) {
-						return ret;
-					}
-				}
-
-				return null;
-			}
-		}
-
-		/// <summary>
-		/// Finds a method definition by name within a type, optionally using a signature matcher.
-		/// This method searches the type hierarchy if the method is not found in the specified type.
-		/// </summary>
-		/// <param name="type">The type to search in.</param>
-		/// <param name="methodName">The name of the method to find.</param>
-		/// <param name="signatureMatcher">Optional signature matcher for additional validation.</param>
-		/// <returns>The method definition if found; otherwise, null.</returns>
-		MethodDefinition FindMethod (TypeDefinition type, string methodName, IMethodSignatureMatcher signatureMatcher = null)
-		{
-			// Search through all methods in the type
-			foreach (MethodDefinition method in type.Methods) {
-				// Skip unmanaged methods and constructors
-				if (!method.IsManaged || method.IsConstructor) {
-					continue;
-				}
-
-				// Check method name match
-				if (!MonoAndroidHelper.StringEquals (methodName, method.Name)) {
-					continue;
-				}
-
-				// Validate signature if matcher is provided
-				if (signatureMatcher == null || signatureMatcher.Matches (method)) {
-					return method;
-				}
-			}
-
-			// Search base type if method not found in current type
-			if (type.BaseType == null) {
-				return null;
-			}
-
-			return FindMethod (tdCache.Resolve (type.BaseType), methodName, signatureMatcher);
-		}
-
-		/// <summary>
-		/// Finds a field definition by name within a type, optionally searching inherited fields.
-		/// </summary>
-		/// <param name="type">The type to search in.</param>
-		/// <param name="fieldName">The name of the field to find.</param>
-		/// <param name="lookForInherited">Whether to search base types if the field is not found.</param>
-		/// <returns>The field definition if found; otherwise, null.</returns>
-		FieldDefinition FindField (TypeDefinition type, string fieldName, bool lookForInherited = false)
-		{
-			// Search through all fields in the type
-			foreach (FieldDefinition field in type.Fields) {
-				if (MonoAndroidHelper.StringEquals (field.Name, fieldName)) {
-					return field;
-				}
-			}
-
-			// Search base type if requested and available
-			if (!lookForInherited || type.BaseType == null) {
-				return null;
-			}
-
-			return FindField (tdCache.Resolve (type.BaseType), fieldName, lookForInherited);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs
deleted file mode 100644
index 8933f91df82..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs
+++ /dev/null
@@ -1,418 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Android.Runtime;
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.Diagnostics;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Collects and manages marshal methods from .NET assemblies, organizing them by type and
-/// determining which can be converted to native LLVM marshal methods versus those that
-/// must be registered dynamically. This class extends <see cref="JavaCallableMethodClassifier"/>
-/// to integrate with the Java callable wrapper generation pipeline.
-/// </summary>
-class MarshalMethodsCollection : JavaCallableMethodClassifier
-{
-	/// <summary>
-	/// Assemblies that contain convertible marshal methods. These assemblies need to
-	/// have the proper assembly references added to them.
-	/// </summary>
-	public HashSet<AssemblyDefinition> AssembliesWithMarshalMethods { get; } = [];
-
-	/// <summary>
-	/// Marshal methods that have already been rewritten as LLVM marshal methods.
-	/// </summary>
-	public IDictionary<string, IList<ConvertedMarshalMethodEntry>> ConvertedMarshalMethods { get; } = new Dictionary<string, IList<ConvertedMarshalMethodEntry>> (StringComparer.Ordinal);
-
-	/// <summary>
-	/// Marshal methods that cannot be rewritten and must be registered dynamically.
-	/// </summary>
-	public List<DynamicallyRegisteredMarshalMethodEntry> DynamicallyRegisteredMarshalMethods { get; } = [];
-
-	/// <summary>
-	/// Marshal methods that can be rewritten as LLVM marshal methods.
-	/// </summary>
-	public IDictionary<string, IList<MarshalMethodEntry>> MarshalMethods { get; } = new Dictionary<string, IList<MarshalMethodEntry>> (StringComparer.Ordinal);
-
-	readonly MarshalMethodsClassifier classifier;
-	readonly TaskLoggingHelper log;
-	readonly IAssemblyResolver resolver;
-	readonly HashSet<TypeDefinition> typesWithDynamicallyRegisteredMarshalMethods = [];
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="MarshalMethodsCollection"/> class.
-	/// </summary>
-	/// <param name="classifier">The marshal methods classifier to use for method classification.</param>
-	/// <exception cref="ArgumentNullException">Thrown when classifier is null.</exception>
-	public MarshalMethodsCollection (MarshalMethodsClassifier classifier)
-	{
-		this.classifier = classifier;
-		log = classifier.Log;
-		resolver = classifier.Resolver;
-	}
-
-	/// <summary>
-	/// Adds marshal method entries for special case methods that won't be detected by the 
-	/// standard JavaInterop type scanner. This primarily handles hand-written methods
-	/// like Java.Interop.TypeManager+JavaTypeManager::n_Activate.
-	/// </summary>
-	/// <remarks>
-	/// Special case methods are typically internal framework methods that don't follow
-	/// the standard Java callable wrapper patterns but still need marshal method generation.
-	/// </remarks>
-	public void AddSpecialCaseMethods ()
-	{
-		AddTypeManagerSpecialCaseMethods ();
-	}
-
-	/// <summary>
-	/// Checks a method for marshal method compatibility and adds it to the collection if suitable.
-	/// This method examines the [Register] attributes on the method and filters out Kotlin-mangled
-	/// methods that cannot be properly overridden.
-	/// </summary>
-	/// <param name="collection">The collection to add the method to.</param>
-	/// <param name="type">The top-level type that owns this method.</param>
-	/// <param name="registeredMethod">The method that was registered with [Register] attributes.</param>
-	/// <param name="implementedMethod">The actual method implementation.</param>
-	/// <param name="methodClassifier">The classifier to use for method classification.</param>
-	/// <param name="cache">The type definition cache for resolving types.</param>
-	static void CheckMethod (MarshalMethodsCollection collection, TypeDefinition type, MethodDefinition registeredMethod, MethodDefinition implementedMethod, MarshalMethodsClassifier methodClassifier, TypeDefinitionCache cache)
-	{
-		foreach (RegisterAttribute attr in CecilExtensions.GetMethodRegistrationAttributes (registeredMethod)) {
-			// Check for Kotlin-mangled methods that cannot be overridden
-			// These methods have names ending with "-impl" or contain a hyphen 8 characters from the end
-			if (attr.Name.Contains ("-impl") || (attr.Name.Length > 7 && attr.Name [attr.Name.Length - 8] == '-'))
-				continue;
-
-			collection.AddMethod (type, registeredMethod, implementedMethod, attr.OriginAttribute);
-		}
-	}
-
-	/// <summary>
-	/// Creates a <see cref="MarshalMethodsCollection"/> by scanning the specified assemblies for
-	/// marshal method candidates. This is the main entry point for building a complete collection
-	/// of marshal methods from a set of .NET assemblies.
-	/// </summary>
-	/// <param name="arch">The target Android architecture.</param>
-	/// <param name="assemblies">The list of assemblies to scan for marshal methods.</param>
-	/// <param name="resolver">The assembly resolver for loading referenced assemblies.</param>
-	/// <param name="log">The logging helper for diagnostic messages.</param>
-	/// <returns>A populated <see cref="MarshalMethodsCollection"/> containing all discovered marshal methods.</returns>
-	public static MarshalMethodsCollection FromAssemblies (AndroidTargetArch arch, List<ITaskItem> assemblies, XAAssemblyResolver resolver, TaskLoggingHelper log)
-	{
-		var cache = new TypeDefinitionCache ();
-		var classifier = new MarshalMethodsClassifier (cache, resolver, log);
-		var collection = new MarshalMethodsCollection (classifier);
-		var scanner = new XAJavaTypeScanner (arch, log, cache);
-
-		// Get all Java-callable types from the assemblies
-		var javaTypes = scanner.GetJavaTypes (assemblies, resolver);
-
-		// Scan each type for marshal method candidates
-		foreach (var type in javaTypes) {
-			// Skip interfaces and types that shouldn't have Java callable wrappers
-			if (type.IsInterface || JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (type, cache))
-				continue;
-
-			ScanTypeForMarshalMethods (type, collection, resolver, cache, log, classifier);
-		}
-
-		return collection;
-	}
-
-	/// <summary>
-	/// Scans a specific type definition for marshal method candidates, including both
-	/// direct methods and methods inherited from implemented interfaces.
-	/// </summary>
-	/// <param name="type">The type definition to scan.</param>
-	/// <param name="collection">The collection to add discovered marshal methods to.</param>
-	/// <param name="resolver">The assembly resolver for loading referenced types.</param>
-	/// <param name="cache">The type definition cache for resolving types.</param>
-	/// <param name="log">The logging helper for diagnostic messages.</param>
-	/// <param name="classifier">The classifier to use for method classification.</param>
-	static void ScanTypeForMarshalMethods (TypeDefinition type, MarshalMethodsCollection collection, XAAssemblyResolver resolver, TypeDefinitionCache cache, TaskLoggingHelper log, MarshalMethodsClassifier classifier)
-	{
-		// Scan direct methods (excluding constructors)
-		foreach (var minfo in type.Methods.Where (m => !m.IsConstructor)) {
-			var baseRegisteredMethod = CecilExtensions.GetBaseRegisteredMethod (minfo, cache);
-
-			if (baseRegisteredMethod is not null)
-				CheckMethod (collection, type, baseRegisteredMethod, minfo, classifier, cache);
-		}
-
-		// Scan methods from implemented interfaces
-		foreach (InterfaceImplementation ifaceInfo in type.Interfaces) {
-			var typeReference = ifaceInfo.InterfaceType;
-			var typeDefinition = cache.Resolve (typeReference);
-
-			if (typeDefinition is null) {
-				Diagnostic.Error (4204,
-					CecilExtensions.LookupSource (type),
-					Java.Interop.Localization.Resources.JavaCallableWrappers_XA4204,
-					typeReference.FullName);
-			}
-
-			// Only process interfaces that have [Register] attributes
-			if (!CecilExtensions.GetTypeRegistrationAttributes (typeDefinition).Any ())
-				continue;
-
-			// Check all non-static methods in the interface
-			foreach (MethodDefinition imethod in typeDefinition.Methods) {
-				if (imethod.IsStatic)
-					continue;
-
-				CheckMethod (collection, type, imethod, imethod, classifier, cache);
-			}
-		}
-	}
-
-	/// <summary>
-	/// Determines whether a method should be registered dynamically rather than converted to a marshal method.
-	/// This method is called by the Java callable wrapper generation pipeline to make registration decisions.
-	/// </summary>
-	/// <param name="topType">The top-level type that owns this method.</param>
-	/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-	/// <param name="implementedMethod">The actual method implementation.</param>
-	/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-	/// <returns>
-	/// true if the method should be registered dynamically; false if it can be converted to a marshal method.
-	/// </returns>
-	public override bool ShouldBeDynamicallyRegistered (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute? registerAttribute)
-	{
-		var method = AddMethod (topType, registeredMethod, implementedMethod, registerAttribute);
-
-		return method is DynamicallyRegisteredMarshalMethodEntry;
-	}
-
-	/// <summary>
-	/// Determines whether a type has any methods that must be registered dynamically.
-	/// This is used during code generation to decide whether to include dynamic registration logic.
-	/// </summary>
-	/// <param name="type">The type to check.</param>
-	/// <returns>true if the type has dynamically registered methods; otherwise, false.</returns>
-	public bool TypeHasDynamicallyRegisteredMethods (TypeDefinition type)
-	{
-		return typesWithDynamicallyRegisteredMarshalMethods.Contains (type);
-	}
-
-	/// <summary>
-	/// Adds a method to the appropriate collection based on its classification result.
-	/// This method coordinates with the classifier to determine the method's type and
-	/// stores it in the correct collection with proper tracking of associated assemblies.
-	/// </summary>
-	/// <param name="topType">The top-level type that owns this method.</param>
-	/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-	/// <param name="implementedMethod">The actual method implementation.</param>
-	/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-	/// <returns>The method entry that was added to the collection.</returns>
-	MethodEntry AddMethod (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute? registerAttribute)
-	{
-		// Classify the method using the classifier
-		var marshalMethod = classifier.ClassifyMethod (topType, registeredMethod, implementedMethod, registerAttribute);
-
-		// Handle dynamically registered methods
-		if (marshalMethod is DynamicallyRegisteredMarshalMethodEntry dynamicMethod) {
-			DynamicallyRegisteredMarshalMethods.Add (dynamicMethod);
-			typesWithDynamicallyRegisteredMarshalMethods.Add (topType);
-
-			return dynamicMethod;
-		}
-
-		// Handle converted marshal methods (already processed)
-		if (marshalMethod is ConvertedMarshalMethodEntry convertedMethod) {
-			var key = convertedMethod.GetStoreMethodKey (classifier.TypeDefinitionCache);
-
-			if (!ConvertedMarshalMethods.TryGetValue (key, out var list)) {
-				list = new List<ConvertedMarshalMethodEntry> ();
-				ConvertedMarshalMethods.Add (key, list);
-			}
-
-			list.Add (convertedMethod);
-
-			return convertedMethod;
-		}
-
-		// Handle standard marshal methods
-		if (marshalMethod is MarshalMethodEntry marshalMethodEntry) {
-			var key = marshalMethodEntry.GetStoreMethodKey (classifier.TypeDefinitionCache);
-
-			if (!MarshalMethods.TryGetValue (key, out var list)) {
-				list = new List<MarshalMethodEntry> ();
-				MarshalMethods.Add (key, list);
-			}
-
-			list.Add (marshalMethodEntry);
-
-			// Track assemblies that contain marshal methods - these need special handling
-			AssembliesWithMarshalMethods.Add (marshalMethodEntry.NativeCallback.Module.Assembly);
-
-			if (marshalMethodEntry.Connector is not null)
-				AssembliesWithMarshalMethods.Add (marshalMethodEntry.Connector.Module.Assembly);
-
-			if (marshalMethodEntry.CallbackField is not null)
-				AssembliesWithMarshalMethods.Add (marshalMethodEntry.CallbackField.Module.Assembly);
-		}
-
-		return marshalMethod;
-	}
-
-	/// <summary>
-	/// Adds special case marshal methods for the TypeManager class. The TypeManager contains
-	/// hand-written native callback methods that are essential for the Android runtime but
-	/// don't follow the standard Java callable wrapper patterns.
-	/// </summary>
-	/// <remarks>
-	/// The TypeManager's n_Activate method is critical for object activation in the Android runtime.
-	/// This method manually creates marshal method entries for these special cases that would
-	/// otherwise be missed by the standard type scanning process.
-	/// </remarks>
-	void AddTypeManagerSpecialCaseMethods ()
-	{
-		const string FullTypeName = "Java.Interop.TypeManager+JavaTypeManager, Mono.Android";
-
-		// Resolve the TypeManager types from Mono.Android
-		AssemblyDefinition? monoAndroid = resolver.Resolve ("Mono.Android");
-		TypeDefinition? typeManager = monoAndroid?.MainModule.FindType ("Java.Interop.TypeManager");
-		TypeDefinition? javaTypeManager = typeManager?.GetNestedType ("JavaTypeManager");
-
-		if (javaTypeManager == null) {
-			throw new InvalidOperationException ($"Internal error: unable to find the {FullTypeName} type in the Mono.Android assembly");
-		}
-
-		MethodDefinition? nActivate_mm = null;
-		MethodDefinition? nActivate = null;
-
-		// Find the n_Activate methods - both the marshal method and the original
-		foreach (MethodDefinition method in javaTypeManager.Methods) {
-			if (nActivate_mm == null && IsMatchingMethod (method, "n_Activate_mm")) {
-				// Ensure the marshal method has the [UnmanagedCallersOnly] attribute
-				if (method.GetCustomAttributes ("System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute").Any (cattr => cattr != null)) {
-					nActivate_mm = method;
-				} else {
-					log.LogWarning ($"Method '{method.FullName}' isn't decorated with the UnmanagedCallersOnly attribute");
-					continue;
-				}
-			}
-
-			if (nActivate == null && IsMatchingMethod (method, "n_Activate")) {
-				nActivate = method;
-			}
-
-			// Stop searching once we've found both methods
-			if (nActivate_mm != null && nActivate != null) {
-				break;
-			}
-		}
-
-		// Ensure we found the required methods
-		if (nActivate_mm == null) {
-			ThrowMissingMethod ("nActivate_mm");
-		}
-
-		if (nActivate == null) {
-			ThrowMissingMethod ("nActivate");
-		}
-
-		// Extract JNI information from [Register] attributes
-		string? jniTypeName = null;
-		foreach (CustomAttribute cattr in javaTypeManager.GetCustomAttributes ("Android.Runtime.RegisterAttribute")) {
-			if (cattr.ConstructorArguments.Count != 1) {
-				log.LogDebugMessage ($"[Register] attribute on type '{FullTypeName}' is expected to have 1 constructor argument, found {cattr.ConstructorArguments.Count}");
-				continue;
-			}
-
-			jniTypeName = (string) cattr.ConstructorArguments [0].Value;
-			if (!String.IsNullOrEmpty (jniTypeName)) {
-				break;
-			}
-		}
-
-		string? jniMethodName = null;
-		string? jniSignature = null;
-		foreach (CustomAttribute cattr in nActivate.GetCustomAttributes ("Android.Runtime.RegisterAttribute")) {
-			if (cattr.ConstructorArguments.Count != 3) {
-				log.LogDebugMessage ($"[Register] attribute on method '{nActivate.FullName}' is expected to have 3 constructor arguments, found {cattr.ConstructorArguments.Count}");
-				continue;
-			}
-
-			jniMethodName = (string) cattr.ConstructorArguments [0].Value;
-			jniSignature = (string) cattr.ConstructorArguments [1].Value;
-
-			if (!String.IsNullOrEmpty (jniMethodName) && !String.IsNullOrEmpty (jniSignature)) {
-				break;
-			}
-		}
-
-		// Validate that we have all required JNI information
-		bool missingInfo = false;
-		if (String.IsNullOrEmpty (jniTypeName)) {
-			missingInfo = true;
-			log.LogDebugMessage ($"Failed to obtain Java type name from the [Register] attribute on type '{FullTypeName}'");
-		}
-
-		if (String.IsNullOrEmpty (jniMethodName)) {
-			missingInfo = true;
-			log.LogDebugMessage ($"Failed to obtain Java method name from the [Register] attribute on method '{nActivate.FullName}'");
-		}
-
-		if (String.IsNullOrEmpty (jniSignature)) {
-			missingInfo = true;
-			log.LogDebugMessage ($"Failed to obtain Java method signature from the [Register] attribute on method '{nActivate.FullName}'");
-		}
-
-		if (missingInfo) {
-			throw new InvalidOperationException ($"Missing information while constructing marshal method for the '{nActivate_mm.FullName}' method");
-		}
-
-		// Create the special case marshal method entry
-		var entry = new MarshalMethodEntry (javaTypeManager, nActivate_mm, jniTypeName!, jniMethodName!, jniSignature!);  // NRT- Guarded above
-		MarshalMethods.Add (".:!SpEcIaL:Java.Interop.TypeManager+JavaTypeManager::n_Activate_mm", new List<MarshalMethodEntry> { entry });
-
-		/// <summary>
-		/// Throws an exception indicating that a required method was not found.
-		/// This is a local function used for error handling within AddTypeManagerSpecialCaseMethods.
-		/// </summary>
-		/// <param name="name">The name of the missing method.</param>
-		[DoesNotReturn]
-		void ThrowMissingMethod (string name)
-		{
-			throw new InvalidOperationException ($"Internal error: unable to find the '{name}' method in the '{FullTypeName}' type");
-		}
-
-		/// <summary>
-		/// Checks if a method matches the expected criteria for TypeManager special case methods.
-		/// The method must have the correct name, be static, and be private.
-		/// </summary>
-		/// <param name="method">The method to check.</param>
-		/// <param name="name">The expected method name.</param>
-		/// <returns>true if the method matches all criteria; otherwise, false.</returns>
-		bool IsMatchingMethod (MethodDefinition method, string name)
-		{
-			if (!MonoAndroidHelper.StringEquals (name, method.Name)) {
-				return false;
-			}
-
-			if (!method.IsStatic) {
-				log.LogWarning ($"Method '{method.FullName}' is not static");
-				return false;
-			}
-
-			if (!method.IsPrivate) {
-				log.LogWarning ($"Method '{method.FullName}' is not private");
-				return false;
-			}
-
-			return true;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs
deleted file mode 100644
index 9c24e13fd58..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-
-using Mono.Cecil;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Provides helper methods for working with marshal methods, particularly for
-	/// determining type blittability and compatibility with native interop.
-	/// </summary>
-	static class MarshalMethodsHelpers
-	{
-		/// <summary>
-		/// Set of .NET types that are blittable (can be directly passed between managed and native code
-		/// without marshaling). Based on Microsoft's documentation for blittable and non-blittable types.
-		/// </summary>
-		/// <remarks>
-		/// Reference: https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types
-		/// Blittable types have the same representation in managed and unmanaged memory and can be
-		/// passed directly without marshaling overhead.
-		/// </remarks>
-		// From: https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types
-		static readonly HashSet<string> blittableTypes = new HashSet<string> (StringComparer.Ordinal) {
-			"System.Byte",
-			"System.SByte",
-			"System.Int16",
-			"System.UInt16",
-			"System.Int32",
-			"System.UInt32",
-			"System.Int64",
-			"System.UInt64",
-			"System.IntPtr",
-			"System.UIntPtr",
-			"System.Single",
-			"System.Double",
-		};
-
-		/// <summary>
-		/// Extension method that determines whether a type reference represents a blittable type.
-		/// Blittable types can be passed directly between managed and native code without marshaling,
-		/// making them ideal for use in marshal methods and [UnmanagedCallersOnly] methods.
-		/// </summary>
-		/// <param name="type">The type reference to check for blittability.</param>
-		/// <returns>true if the type is blittable; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="type"/> is null.</exception>
-		/// <remarks>
-		/// This method only checks the type name against a predefined set of known blittable types.
-		/// It does not perform deep analysis of structs or other complex types that might also be blittable.
-		/// </remarks>
-		public static bool IsBlittable (this TypeReference type)
-		{
-			if (type == null) {
-				throw new ArgumentNullException (nameof (type));
-			}
-
-			return blittableTypes.Contains (type.FullName);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
index c82b689738c..53a165ca1c1 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
@@ -1,20 +1,80 @@
-#nullable enable
+using System;
 using System.Collections.Generic;
 using Microsoft.Build.Utilities;
-using Xamarin.Android.Tools;
+using Xamarin.Android.Tasks.LLVMIR;
 
 namespace Xamarin.Android.Tasks;
 
-class MarshalMethodsNativeAssemblyGenerator : MarshalMethodsNativeAssemblyGeneratorBase
+// The native host still expects xamarin_app_init even though marshal methods are disabled.
+class MarshalMethodsNativeAssemblyGenerator : LlvmIrComposer
 {
-	/// <summary>
-	/// Constructor to be used ONLY when marshal methods are DISABLED
-	/// </summary>
-	public MarshalMethodsNativeAssemblyGenerator (TaskLoggingHelper log, AndroidTargetArch targetArch, ICollection<string> uniqueAssemblyNames)
-		: base (log, targetArch, uniqueAssemblyNames)
+	[NativeClass]
+	sealed class _JNIEnv
 	{}
 
-	public MarshalMethodsNativeAssemblyGenerator (TaskLoggingHelper log, ICollection<string> uniqueAssemblyNames, NativeCodeGenStateObject codeGenState)
-		: base (log, uniqueAssemblyNames, codeGenState)
+	public MarshalMethodsNativeAssemblyGenerator (TaskLoggingHelper log) : base (log)
 	{}
+
+	protected override void Construct (LlvmIrModule module)
+	{
+		module.DefaultStringGroup = "mm";
+
+		var getFunctionPtrVariable = module.AddGlobalVariable (
+			typeof (IntPtr),
+			"get_function_pointer",
+			null,
+			LlvmIrVariableOptions.LocalWritableInsignificantAddr,
+			" get_function_pointer (uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr)"
+		);
+
+		var initParams = new List<LlvmIrFunctionParameter> {
+			new (typeof (_JNIEnv), "env") {
+				NoCapture = true,
+				NoUndef = true,
+				ReadNone = true,
+			},
+			new (typeof (IntPtr), "fn") {
+				NoUndef = true,
+			},
+		};
+
+		var initSignature = new LlvmIrFunctionSignature (
+			name: "xamarin_app_init",
+			returnType: typeof (void),
+			parameters: initParams
+		);
+
+		var attributes = module.AddAttributeSet (new LlvmIrFunctionAttributeSet {
+			new MustprogressFunctionAttribute (),
+			new NofreeFunctionAttribute (),
+			new NorecurseFunctionAttribute (),
+			new NosyncFunctionAttribute (),
+			new NounwindFunctionAttribute (),
+			new WillreturnFunctionAttribute (),
+			new MemoryFunctionAttribute {
+				Default = MemoryAttributeAccessKind.Write,
+				Argmem = MemoryAttributeAccessKind.None,
+				InaccessibleMem = MemoryAttributeAccessKind.None,
+			},
+			new UwtableFunctionAttribute (),
+			new MinLegalVectorWidthFunctionAttribute (0),
+			new NoTrappingMathFunctionAttribute (true),
+			new StackProtectorBufferSizeFunctionAttribute (8),
+		});
+		var init = new LlvmIrFunction (initSignature, attributes);
+
+		// Name these variables so LLVM's unnamed labels remain sequential.
+		var fnNullResult = init.CreateLocalVariable (typeof (bool), "fnIsNull");
+		LlvmIrVariable putsResult = init.CreateLocalVariable (typeof (int), "putsResult");
+		var ifThenInstructions = new List<LlvmIrInstruction> {
+			module.CreatePuts ("get_function_pointer MUST be specified\n", putsResult),
+			module.CreateAbort (),
+			new LlvmIrInstructions.Unreachable (),
+		};
+
+		module.AddIfThenElse (init, fnNullResult, LlvmIrIcmpCond.Equal, initParams [1], null, ifThenInstructions);
+		init.Body.Store (initParams [1], getFunctionPtrVariable, module.TbaaAnyPointer);
+		init.Body.Ret (typeof (void));
+		module.Add (init);
+	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs
deleted file mode 100644
index aba0e7c7db6..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs
+++ /dev/null
@@ -1,919 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tasks.LLVMIR;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	abstract partial class MarshalMethodsNativeAssemblyGeneratorBase : LlvmIrComposer
-	{
-		const string GetFunctionPointerVariableName = "get_function_pointer";
-
-		// This is here only to generate strongly-typed IR
-		internal sealed class MonoClass
-		{}
-
-		[NativeClass]
-		sealed class _JNIEnv
-		{}
-
-		// Empty class must have at least one member so that the class address can be obtained
-		[NativeClass]
-		class _jobject
-		{
-#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value - likely populated by native code
-			public byte b;
-#pragma warning restore CS0649
-		}
-
-		sealed class _jclass : _jobject
-		{}
-
-		sealed class _jstring : _jobject
-		{}
-
-		sealed class _jthrowable : _jobject
-		{}
-
-		class _jarray : _jobject
-		{}
-
-		sealed class _jobjectArray : _jarray
-		{}
-
-		sealed class _jbooleanArray : _jarray
-		{}
-
-		sealed class _jbyteArray : _jarray
-		{}
-
-		sealed class _jcharArray : _jarray
-		{}
-
-		sealed class _jshortArray : _jarray
-		{}
-
-		sealed class _jintArray : _jarray
-		{}
-
-		sealed class _jlongArray : _jarray
-		{}
-
-		sealed class _jfloatArray : _jarray
-		{}
-
-		sealed class _jdoubleArray : _jarray
-		{}
-
-		protected sealed class MarshalMethodInfo
-		{
-			public MarshalMethodEntryObject Method          { get; }
-			public string NativeSymbolName                  { get; set; }
-			public List<LlvmIrFunctionParameter> Parameters { get; }
-			public Type ReturnType                          { get; }
-			public uint ClassCacheIndex                     { get; }
-
-			// This one isn't known until the generation time, which happens after we instantiate the class
-			// in Init and it may be different between architectures/ABIs, hence it needs to be settable from
-			// the outside.
-			public uint AssemblyCacheIndex                  { get; set; }
-
-			public MarshalMethodInfo (MarshalMethodEntryObject method, Type returnType, string nativeSymbolName, int classCacheIndex)
-			{
-				Method = method ?? throw new ArgumentNullException (nameof (method));
-				ReturnType = returnType ?? throw new ArgumentNullException (nameof (returnType));
-				if (String.IsNullOrEmpty (nativeSymbolName)) {
-					throw new ArgumentException ("must not be null or empty", nameof (nativeSymbolName));
-				}
-				NativeSymbolName = nativeSymbolName;
-				Parameters = new List<LlvmIrFunctionParameter> {
-					new LlvmIrFunctionParameter (typeof (_JNIEnv), "env"), // JNIEnv *env
-					new LlvmIrFunctionParameter (typeof (_jclass), "klass"), // jclass klass
-				};
-				ClassCacheIndex = (uint)classCacheIndex;
-			}
-		}
-
-		sealed class MarshalMethodsManagedClassDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var klass = EnsureType<MarshalMethodsManagedClass> (data);
-
-				if (MonoAndroidHelper.StringEquals ("token", fieldName)) {
-					return $" class name: {klass.ClassName}";
-				}
-
-				return String.Empty;
-			}
-		}
-
-		[NativeAssemblerStructContextDataProvider (typeof(MarshalMethodsManagedClassDataProvider))]
-		protected sealed class MarshalMethodsManagedClass
-		{
-			[NativeAssembler (UsesDataProvider = true, NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-			public uint       token;
-
-			[NativePointer (IsNull = true)]
-			public MonoClass  klass;
-
-			[NativeAssembler (Ignore = true)]
-			public string ClassName;
-		};
-
-		protected sealed class AssemblyCacheState
-		{
-			public Dictionary<string, uint> AsmNameToIndexData32 = new (StringComparer.Ordinal);
-			public Dictionary<uint, (string name, uint index)> Hashes32 = new ();
-			public List<uint> Keys32 = [];
-			public List<uint> Indices32 = new ();
-
-			public Dictionary<string, uint> AsmNameToIndexData64 = new (StringComparer.Ordinal);
-			public Dictionary<ulong, (string name, uint index)> Hashes64 = new ();
-			public List<ulong> Keys64 = [];
-			public List<uint> Indices64 = new ();
-		}
-
-		sealed class MarshalMethodsWriteState
-		{
-			public AssemblyCacheState AssemblyCacheState;
-			public LlvmIrFunctionAttributeSet AttributeSet;
-			public Dictionary<string, ulong> UniqueAssemblyId;
-			public Dictionary<string, LlvmIrVariable> UsedBackingFields;
-			public LlvmIrVariable GetFunctionPtrVariable;
-			public LlvmIrFunction GetFunctionPtrFunction;
-		}
-
-		sealed class MarshalMethodAssemblyIndexValuePlaceholder : LlvmIrInstructionArgumentValuePlaceholder
-		{
-			MarshalMethodInfo mmi;
-			AssemblyCacheState acs;
-
-			public MarshalMethodAssemblyIndexValuePlaceholder (MarshalMethodInfo mmi, AssemblyCacheState acs)
-			{
-				this.mmi = mmi;
-				this.acs = acs;
-			}
-
-			public override object? GetValue (LlvmIrModuleTarget target)
-			{
-				// What a monstrosity...
-				string asmName = mmi.Method.NativeCallback.DeclaringType.Module.Assembly.NameName;
-				Dictionary<string, uint> asmNameToIndex = target.Is64Bit ? acs.AsmNameToIndexData64 : acs.AsmNameToIndexData32;
-				if (!asmNameToIndex.TryGetValue (asmName, out uint asmIndex)) {
-					throw new InvalidOperationException ($"Unable to translate assembly name '{asmName}' to its index");
-				}
-				return asmIndex;
-			}
-		}
-
-		static readonly Dictionary<char, Type> jniSimpleTypeMap = new Dictionary<char, Type> {
-			{ 'Z', typeof(bool) },
-			{ 'B', typeof(byte) },
-			{ 'C', typeof(char) },
-			{ 'S', typeof(short) },
-			{ 'I', typeof(int) },
-			{ 'J', typeof(long) },
-			{ 'F', typeof(float) },
-			{ 'D', typeof(double) },
-		};
-
-		static readonly Dictionary<char, Type> jniArrayTypeMap = new Dictionary<char, Type> {
-			{ 'Z', typeof(_jbooleanArray) },
-			{ 'B', typeof(_jbyteArray) },
-			{ 'C', typeof(_jcharArray) },
-			{ 'S', typeof(_jshortArray) },
-			{ 'I', typeof(_jintArray) },
-			{ 'J', typeof(_jlongArray) },
-			{ 'F', typeof(_jfloatArray) },
-			{ 'D', typeof(_jdoubleArray) },
-			{ 'L', typeof(_jobjectArray) },
-		};
-
-		readonly ICollection<string> uniqueAssemblyNames;
-
-		StructureInfo marshalMethodsManagedClassStructureInfo;
-
-		List<MarshalMethodInfo> methods;
-		protected List<StructureInstance<MarshalMethodsManagedClass>> classes = new List<StructureInstance<MarshalMethodsManagedClass>> ();
-
-#pragma warning disable CS0414 // Field is assigned but its value is never used - might be used for debugging or future functionality
-		readonly LlvmIrCallMarker defaultCallMarker;
-#pragma warning restore CS0414
-		readonly bool generateEmptyCode;
-		readonly AndroidTargetArch targetArch;
-		readonly NativeCodeGenStateObject? codeGenState;
-
-		protected bool GenerateEmptyCode => generateEmptyCode;
-		protected List<MarshalMethodInfo> Methods => methods;
-
-		/// <summary>
-		/// Constructor to be used ONLY when marshal methods are DISABLED
-		/// </summary>
-		protected MarshalMethodsNativeAssemblyGeneratorBase (TaskLoggingHelper log, AndroidTargetArch targetArch, ICollection<string> uniqueAssemblyNames)
-			: base (log)
-		{
-			this.targetArch = targetArch;
-			this.uniqueAssemblyNames = uniqueAssemblyNames ?? throw new ArgumentNullException (nameof (uniqueAssemblyNames));
-			generateEmptyCode = true;
-			defaultCallMarker = LlvmIrCallMarker.Tail;
-		}
-
-		/// <summary>
-		/// Constructor to be used ONLY when marshal methods are ENABLED
-		/// </summary>
-		protected MarshalMethodsNativeAssemblyGeneratorBase (TaskLoggingHelper log, ICollection<string> uniqueAssemblyNames, NativeCodeGenStateObject codeGenState)
-			: base (log)
-		{
-			this.uniqueAssemblyNames = uniqueAssemblyNames ?? throw new ArgumentNullException (nameof (uniqueAssemblyNames));
-			this.codeGenState = codeGenState ?? throw new ArgumentNullException (nameof (codeGenState));
-
-			generateEmptyCode = false;
-			defaultCallMarker = LlvmIrCallMarker.Tail;
-		}
-
-		void Init ()
-		{
-			if (generateEmptyCode || codeGenState.MarshalMethods.Count == 0) {
-				return;
-			}
-
-			var seenClasses = new Dictionary<string, int> (StringComparer.Ordinal);
-			var allMethods = new List<MarshalMethodInfo> ();
-			IDictionary<string, IList<MarshalMethodEntryObject>> marshalMethods = codeGenState.MarshalMethods;
-
-			// It's possible that several otherwise different methods (from different classes, but with the same
-			// names and similar signatures) will actually share the same **short** native symbol name. In this case we must
-			// ensure that they all use long symbol names.  This has to be done as a post-processing step, after we
-			// have already iterated over the entire method collection.
-			//
-			// A handful of examples from the Hello World MAUI app:
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onActionItemClicked
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean Android.Views.ActionMode/ICallback::OnActionItemClicked(Android.Views.ActionMode,Android.Views.IMenuItem))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean AndroidX.AppCompat.View.ActionMode/ICallback::OnActionItemClicked(AndroidX.AppCompat.View.ActionMode,Android.Views.IMenuItem))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onActionItemClicked__Landroidx_appcompat_view_ActionMode_2Landroid_view_MenuItem_2
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onCreateActionMode
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean Android.Views.ActionMode/ICallback::OnCreateActionMode(Android.Views.ActionMode,Android.Views.IMenu))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean AndroidX.AppCompat.View.ActionMode/ICallback::OnCreateActionMode(AndroidX.AppCompat.View.ActionMode,Android.Views.IMenu))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onCreateActionMode__Landroidx_appcompat_view_ActionMode_2Landroid_view_Menu_2
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onDestroyActionMode
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Void Android.Views.ActionMode/ICallback::OnDestroyActionMode(Android.Views.ActionMode))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Void AndroidX.AppCompat.View.ActionMode/ICallback::OnDestroyActionMode(AndroidX.AppCompat.View.ActionMode))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onDestroyActionMode__Landroidx_appcompat_view_ActionMode_2
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onPrepareActionMode
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean Android.Views.ActionMode/ICallback::OnPrepareActionMode(Android.Views.ActionMode,Android.Views.IMenu))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean AndroidX.AppCompat.View.ActionMode/ICallback::OnPrepareActionMode(AndroidX.AppCompat.View.ActionMode,Android.Views.IMenu))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onPrepareActionMode__Landroidx_appcompat_view_ActionMode_2Landroid_view_Menu_2
-			//
-			var overloadedNativeSymbolNames = new Dictionary<string, List<MarshalMethodInfo>> (StringComparer.Ordinal);
-			foreach (IList<MarshalMethodEntryObject> entryList in marshalMethods.Values) {
-				bool useFullNativeSignature = entryList.Count > 1;
-				foreach (MarshalMethodEntryObject entry in entryList) {
-					Log.LogDebugMessage ($"MM: processing {entry.DeclaringType.FullName} {entry.NativeCallback.FullName}");
-					ProcessAndAddMethod (allMethods, entry, useFullNativeSignature, seenClasses, overloadedNativeSymbolNames);
-				}
-			}
-
-			foreach (List<MarshalMethodInfo> mmiList in overloadedNativeSymbolNames.Values) {
-				if (mmiList.Count <= 1) {
-					continue;
-				}
-
-				foreach (MarshalMethodInfo overloadedMethod in mmiList) {
-					overloadedMethod.NativeSymbolName = MakeNativeSymbolName (overloadedMethod.Method, useFullNativeSignature: true);
-				}
-			}
-
-			// In some cases it's possible that a single type implements two different interfaces which have methods with the same native signature:
-			//
-			//   Microsoft.Maui.Controls.Handlers.TabbedPageManager/Listeners
-			//      System.Void AndroidX.ViewPager.Widget.ViewPager/IOnPageChangeListener::OnPageSelected(System.Int32)
-			//      System.Void AndroidX.ViewPager2.Widget.ViewPager2/OnPageChangeCallback::OnPageSelected(System.Int32)
-			//
-			// Both of the above methods will have the same native implementation and symbol name. e.g. (Java type name being `crc649ff77a65592e7d55/TabbedPageManager_Listeners`):
-			//     Java_crc649ff77a65592e7d55_TabbedPageManager_1Listeners_n_1onPageSelected__I
-			//
-			// We need to de-duplicate the entries or the generated native code will fail to build.
-			var seenNativeSymbols = new HashSet<string> (StringComparer.Ordinal);
-			methods = new List<MarshalMethodInfo> ();
-
-			foreach (MarshalMethodInfo method in allMethods) {
-				if (seenNativeSymbols.Contains (method.NativeSymbolName)) {
-					Log.LogDebugMessage ($"Removed MM duplicate '{method.NativeSymbolName}' (implemented: {method.Method.ImplementedMethod.FullName}; registered: {method.Method.RegisteredMethod.FullName}");
-					continue;
-				}
-
-				seenNativeSymbols.Add (method.NativeSymbolName);
-				methods.Add (method);
-			}
-		}
-
-		string MakeNativeSymbolName (MarshalMethodEntryObject entry, bool useFullNativeSignature)
-		{
-			var sb = new StringBuilder ("Java_");
-			sb.Append (MangleForJni (entry.JniTypeName));
-			sb.Append ('_');
-			sb.Append (MangleForJni ($"n_{entry.JniMethodName}"));
-
-			if (useFullNativeSignature) {
-				string signature = entry.JniMethodSignature;
-				if (signature.Length < 2) {
-					ThrowInvalidSignature (signature, "must be at least two characters long");
-				}
-
-				if (signature[0] != '(') {
-					ThrowInvalidSignature (signature, "must start with '('");
-				}
-
-				int sigEndIdx = signature.LastIndexOf (')');
-				if (sigEndIdx < 1) { // the first position where ')' can appear is 1, for a method without parameters
-					ThrowInvalidSignature (signature, "missing closing parenthesis");
-				}
-
-				string sigParams = signature.Substring (1, sigEndIdx - 1);
-				bool haveParams = sigParams.Length > 0;
-				if (useFullNativeSignature || haveParams) {
-					// We always append the underscores for overloaded methods, see https://github.com/dotnet/android/issues/10417#issuecomment-3210789627
-					// for the reason why
-					sb.Append ("__");
-					if (haveParams) {
-						sb.Append (MangleForJni (sigParams));
-					}
-				}
-			}
-
-			return sb.ToString ();
-
-			void ThrowInvalidSignature (string signature, string reason)
-			{
-				throw new InvalidOperationException ($"Invalid JNI signature '{signature}': {reason}");
-			}
-		}
-
-		void ProcessAndAddMethod (List<MarshalMethodInfo> allMethods, MarshalMethodEntryObject entry, bool useFullNativeSignature, Dictionary<string, int> seenClasses, Dictionary<string, List<MarshalMethodInfo>> overloadedNativeSymbolNames)
-		{
-			MarshalMethodEntryMethodObject nativeCallback = entry.NativeCallback;
-			string nativeSymbolName = MakeNativeSymbolName (entry, useFullNativeSignature);
-			string klass = $"{nativeCallback.DeclaringType.FullName}, {nativeCallback.DeclaringType.Module.Assembly.FullName}";
-
-			if (!seenClasses.TryGetValue (klass, out int classIndex)) {
-				classIndex = classes.Count;
-				seenClasses.Add (klass, classIndex);
-
-				var mc = new MarshalMethodsManagedClass {
-					token = nativeCallback.DeclaringType.MetadataToken,
-					ClassName = klass,
-				};
-
-				classes.Add (new StructureInstance<MarshalMethodsManagedClass> (marshalMethodsManagedClassStructureInfo, mc));
-			}
-
-			// Methods with `IsSpecial == true` are "synthetic" methods - they contain only the callback reference
-			(Type returnType, List<LlvmIrFunctionParameter>? parameters) = ParseJniSignature (entry.JniMethodSignature, entry.IsSpecial ? entry.NativeCallback : entry.ImplementedMethod);
-
-			var method = new MarshalMethodInfo (entry, returnType, nativeSymbolName: nativeSymbolName, classIndex);
-			if (parameters != null && parameters.Count > 0) {
-				method.Parameters.AddRange (parameters);
-			}
-
-			if (!overloadedNativeSymbolNames.TryGetValue (method.NativeSymbolName, out List<MarshalMethodInfo> overloadedMethods)) {
-				overloadedMethods = new List<MarshalMethodInfo> ();
-				overloadedNativeSymbolNames.Add (method.NativeSymbolName, overloadedMethods);
-			}
-			overloadedMethods.Add (method);
-
-			allMethods.Add (method);
-		}
-
-		string MangleForJni (string name)
-		{
-			var sb = new StringBuilder ();
-
-			foreach (char ch in name) {
-				switch (ch) {
-					case '/':
-					case '.':
-						sb.Append ('_');
-						break;
-
-					case '_':
-						sb.Append ("_1");
-						break;
-
-					case ';':
-						sb.Append ("_2");
-						break;
-
-					case '[':
-						sb.Append ("_3");
-						break;
-
-					default:
-						if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9')) {
-							sb.Append (ch);
-						} else {
-							sb.Append ("_0");
-							sb.Append (((int)ch).ToString ("x04"));
-						}
-						break;
-				}
-			}
-
-			return sb.ToString ();
-		}
-
-		(Type returnType, List<LlvmIrFunctionParameter>? functionParams) ParseJniSignature (string signature, MarshalMethodEntryMethodObject implementedMethod)
-		{
-			Type returnType = null;
-			List<LlvmIrFunctionParameter>? parameters = null;
-			bool paramsDone = false;
-			int idx = 0;
-			while (!paramsDone && idx < signature.Length) {
-				char jniType = signature[idx];
-
-				if (jniType == '(') {
-					idx++;
-					continue;
-				}
-
-				if (jniType == ')') {
-					paramsDone = true;
-					continue;
-				}
-
-				Type? managedType = JniTypeToManaged (jniType);
-				if (managedType != null) {
-					AddParameter (managedType);
-					continue;
-				}
-
-				throw new InvalidOperationException ($"Unsupported JNI type '{jniType}' at position {idx} of signature '{signature}'");
-			}
-
-			if (!paramsDone || idx >= signature.Length || signature[idx] != ')') {
-				throw new InvalidOperationException ($"Missing closing arguments parenthesis: '{signature}'");
-			}
-
-			idx++;
-			if (signature[idx] == 'V') {
-				returnType = typeof(void);
-			} else {
-				returnType = JniTypeToManaged (signature[idx]);
-			}
-
-			return (returnType, parameters);
-
-			Type? JniTypeToManaged (char jniType)
-			{
-				if (jniSimpleTypeMap.TryGetValue (jniType, out Type managedType)) {
-					idx++;
-					return managedType;
-				}
-
-				if (jniType == 'L') {
-					return JavaClassToManaged (justSkip: false);
-				}
-
-				if (jniType == '[') {
-					// Arrays of arrays (any rank) are bound as a simple pointer, which makes the generated code much simpler (no need to generate pointers to
-					// pointers to pointers etc), especially that we don't need to dereference these pointers in generated code, we simply pass them along to
-					// the managed land after all.
-					while (signature[idx] == '[') {
-						idx++;
-					}
-
-					jniType = signature[idx];
-					if (jniArrayTypeMap.TryGetValue (jniType, out managedType)) {
-						if (jniType == 'L') {
-							JavaClassToManaged (justSkip: true);
-						} else {
-							idx++;
-						}
-
-						return managedType;
-					}
-
-					throw new InvalidOperationException ($"Unsupported JNI array type '{jniType}' at index {idx} of signature '{signature}'");
-				}
-
-				return null;
-			}
-
-			Type? JavaClassToManaged (bool justSkip)
-			{
-				idx++;
-				StringBuilder sb = null;
-				if (!justSkip) {
-					sb = new StringBuilder ();
-				}
-
-				while (idx < signature.Length) {
-					if (signature[idx] == ')') {
-						throw new InvalidOperationException ($"Syntax error: unterminated class type (missing ';' before closing parenthesis) in signature '{signature}'");
-					}
-
-					if (signature[idx] == ';') {
-						idx++;
-						break;
-					}
-
-					sb?.Append (signature[idx]);
-					idx++;
-				}
-
-				if (justSkip) {
-					return null;
-				}
-
-				string typeName = sb.ToString ();
-				if (MonoAndroidHelper.StringEquals (typeName, "java/lang/Class")) {
-					return typeof(_jclass);
-				}
-
-				if (MonoAndroidHelper.StringEquals (typeName, "java/lang/String")) {
-					return typeof(_jstring);
-				}
-
-				if (MonoAndroidHelper.StringEquals (typeName, "java/lang/Throwable")) {
-					return typeof(_jthrowable);
-				}
-
-				return typeof(_jobject);
-			}
-
-			void AddParameter (Type type)
-			{
-				if (parameters == null) {
-					parameters = new List<LlvmIrFunctionParameter> ();
-				}
-
-				if (implementedMethod.Parameters.Count <= parameters.Count) {
-					throw new InvalidOperationException ($"Method {implementedMethod.FullName} managed signature doesn't match its JNI signature '{signature}' (not enough parameters)");
-				}
-
-				// Every parameter which isn't a primitive type becomes a pointer
-				// If the parameter name is null, empty, or whitespace, pass null to let LlvmIrFunction assign a numeric name
-				string? paramName = implementedMethod.Parameters[parameters.Count].Name;
-				if (String.IsNullOrWhiteSpace (paramName)) {
-					paramName = null;
-				}
-				parameters.Add (new LlvmIrFunctionParameter (type, paramName));
-			}
-		}
-
-		protected override void Construct (LlvmIrModule module)
-		{
-			module.DefaultStringGroup = "mm";
-
-			MapStructures (module);
-
-			Init ();
-			AssemblyCacheState acs = CreateAssemblyCache ();
-			AddAssemblyImageCache (module, acs);
-			AddClassCache (module);
-			AddClassNames (module);
-
-			AddMarshalMethodNames (module, acs);
-			(LlvmIrVariable getFunctionPtrVariable, LlvmIrFunction getFunctionPtrFunction) = AddXamarinAppInitFunction (module);
-
-			AddMarshalMethods (module, acs, getFunctionPtrVariable, getFunctionPtrFunction);
-		}
-
-		protected virtual void MapStructures (LlvmIrModule module)
-		{
-			marshalMethodsManagedClassStructureInfo = module.MapStructure<MarshalMethodsManagedClass> ();
-		}
-
-		protected virtual void AddClassNames (LlvmIrModule module)
-		{}
-
-		protected virtual void AddClassCache (LlvmIrModule module)
-		{}
-
-		void AddMarshalMethods (LlvmIrModule module, AssemblyCacheState acs, LlvmIrVariable getFunctionPtrVariable, LlvmIrFunction getFunctionPtrFunction)
-		{
-			if (generateEmptyCode || methods == null || methods.Count == 0) {
-				return;
-			}
-
-			// This will make all the backing fields to appear in a block without empty lines separating them.
-			module.Add (
-				new LlvmIrGroupDelimiterVariable () {
-					Comment = " Marshal methods backing fields, pointers to native functions"
-				}
-			);
-
-			var writeState = new MarshalMethodsWriteState {
-				AssemblyCacheState = acs,
-				AttributeSet = MakeMarshalMethodAttributeSet (module),
-				UsedBackingFields = new Dictionary<string, LlvmIrVariable> (StringComparer.Ordinal),
-				UniqueAssemblyId = new Dictionary<string, ulong> (StringComparer.OrdinalIgnoreCase),
-				GetFunctionPtrVariable = getFunctionPtrVariable,
-				GetFunctionPtrFunction = getFunctionPtrFunction,
-			};
-			foreach (MarshalMethodInfo mmi in methods) {
-				MarshalMethodEntryMethodObject nativeCallback = mmi.Method.NativeCallback;
-				string asmName = nativeCallback.DeclaringType.Module.Assembly.NameName;
-
-				if (!writeState.UniqueAssemblyId.TryGetValue (asmName, out ulong asmId)) {
-					asmId = (ulong)writeState.UniqueAssemblyId.Count;
-					writeState.UniqueAssemblyId.Add (asmName, asmId);
-				}
-
-				AddMarshalMethod (module, mmi, asmId, writeState);
-			}
-
-			module.Add (new LlvmIrGroupDelimiterVariable ());
-		}
-
-		void AddMarshalMethod (LlvmIrModule module, MarshalMethodInfo method, ulong asmId, MarshalMethodsWriteState writeState)
-		{
-			Log.LogDebugMessage ($"MM: generating code for {method.Method.DeclaringType.FullName} (native cb: '{method.Method.NativeCallback.FullName}'; native symbol name: '{method.NativeSymbolName}')");
-			MarshalMethodEntryMethodObject nativeCallback = method.Method.NativeCallback;
-			string backingFieldName = $"native_cb_{method.Method.JniMethodName}_{asmId}_{method.ClassCacheIndex}_{nativeCallback.MetadataToken:x}";
-
-			if (!writeState.UsedBackingFields.TryGetValue (backingFieldName, out LlvmIrVariable backingField)) {
-				backingField = module.AddGlobalVariable (typeof(IntPtr), backingFieldName, null, LlvmIrVariableOptions.LocalWritableInsignificantAddr);
-				writeState.UsedBackingFields.Add (backingFieldName, backingField);
-			}
-
-			var funcComment = new StringBuilder (" Method: ");
-			funcComment.AppendLine (nativeCallback.FullName);
-			funcComment.Append (" Assembly: ");
-			funcComment.AppendLine (nativeCallback.DeclaringType.Module.Assembly.NameFullName);
-			funcComment.Append (" Registered: ");
-			funcComment.AppendLine (method.Method.RegisteredMethod?.FullName ?? "none");
-			funcComment.Append (" Implemented: ");
-			funcComment.AppendLine (method.Method.ImplementedMethod?.FullName ?? "none");
-
-			var func = new LlvmIrFunction (method.NativeSymbolName, method.ReturnType, method.Parameters, writeState.AttributeSet) {
-				Comment = funcComment.ToString (),
-			};
-
-			WriteBody (func.Body);
-			module.Add (func);
-
-			void WriteBody (LlvmIrFunctionBody body)
-			{
-				LlvmIrLocalVariable cb1 = func.CreateLocalVariable (typeof(IntPtr), "cb1");
-				body.Load (backingField, cb1, tbaa: module.TbaaAnyPointer);
-
-				LlvmIrLocalVariable isNullResult = func.CreateLocalVariable (typeof(bool), "isNull");
-				body.Icmp (LlvmIrIcmpCond.Equal, cb1, null, isNullResult);
-
-				var loadCallbackLabel = new LlvmIrFunctionLabelItem ("loadCallback");
-				var callbackLoadedLabel = new LlvmIrFunctionLabelItem ("callbackLoaded");
-				body.Br (isNullResult, loadCallbackLabel, callbackLoadedLabel);
-
-				// Callback variable was null
-				body.Add (loadCallbackLabel);
-
-				LlvmIrLocalVariable getFuncPtrResult = func.CreateLocalVariable (typeof(IntPtr), "get_func_ptr");
-				body.Load (writeState.GetFunctionPtrVariable, getFuncPtrResult, tbaa: module.TbaaAnyPointer);
-
-				var placeholder = new MarshalMethodAssemblyIndexValuePlaceholder (method, writeState.AssemblyCacheState);
-				var getFunctionPointerArguments = new List<object?> { placeholder, method.ClassCacheIndex, nativeCallback.MetadataToken, backingField };
-
-				LlvmIrInstructions.Call call = body.Call (writeState.GetFunctionPtrFunction, arguments: getFunctionPointerArguments, funcPointer: getFuncPtrResult);
-
-				LlvmIrLocalVariable cb2 = func.CreateLocalVariable (typeof(IntPtr), "cb2");
-				body.Load (backingField, cb2, tbaa: module.TbaaAnyPointer);
-				body.Br (callbackLoadedLabel);
-
-				// Callback variable has just been set or it wasn't null
-				body.Add (callbackLoadedLabel);
-				LlvmIrLocalVariable fn = func.CreateLocalVariable (typeof(IntPtr), "fn");
-
-				// Preceding blocks are ordered from the newest to the oldest, so we need to pass the variables referring to our callback in "reverse" order
-				body.Phi (fn, cb2, body.PrecedingBlock1, cb1, body.PrecedingBlock2);
-
-				var nativeFunc = new LlvmIrFunction (method.NativeSymbolName, method.ReturnType, method.Parameters);
-				nativeFunc.Signature.ReturnAttributes.NoUndef = true;
-
-				var arguments = new List<object?> ();
-				foreach (LlvmIrFunctionParameter parameter in nativeFunc.Signature.Parameters) {
-					arguments.Add (new LlvmIrLocalVariable (parameter.Type, parameter.Name));
-				}
-				LlvmIrLocalVariable? result = nativeFunc.ReturnsValue ? func.CreateLocalVariable (nativeFunc.Signature.ReturnType) : null;
-				call = body.Call (nativeFunc, result, arguments, funcPointer: fn);
-				call.CallMarker = LlvmIrCallMarker.Tail;
-
-				body.Ret (nativeFunc.Signature.ReturnType, result);
-			}
-
-		}
-
-		LlvmIrFunctionAttributeSet MakeMarshalMethodAttributeSet (LlvmIrModule module)
-		{
-			var attrSet = new LlvmIrFunctionAttributeSet {
-				new MustprogressFunctionAttribute (),
-				new UwtableFunctionAttribute (),
-				new MinLegalVectorWidthFunctionAttribute (0),
-				new NoTrappingMathFunctionAttribute (true),
-				new StackProtectorBufferSizeFunctionAttribute (8),
-			};
-
-			return module.AddAttributeSet (attrSet);
-		}
-
-		(LlvmIrVariable getFuncPtrVariable, LlvmIrFunction getFuncPtrFunction) AddXamarinAppInitFunction (LlvmIrModule module)
-		{
-			var getFunctionPtrParams = new List<LlvmIrFunctionParameter> {
-				new (typeof(uint), "mono_image_index") {
-					NoUndef = true,
-				},
-				new (typeof(uint), "class_index") {
-					NoUndef = true,
-				},
-				new (typeof(uint), "method_token") {
-					NoUndef = true,
-				},
-				new (typeof(IntPtr), "target_ptr") {
-					NoUndef = true,
-					NonNull = true,
-					Align = 0, // 0 means use natural pointer alignment
-					Dereferenceable = 0, // ditto 👆
-					IsCplusPlusReference = true,
-				},
-			};
-
-			var getFunctionPtrComment = new StringBuilder (" ");
-			getFunctionPtrComment.Append (GetFunctionPointerVariableName);
-			getFunctionPtrComment.Append (" (");
-			for (int i = 0; i < getFunctionPtrParams.Count; i++) {
-				if (i > 0) {
-					getFunctionPtrComment.Append (", ");
-				}
-				LlvmIrFunctionParameter parameter = getFunctionPtrParams[i];
-				getFunctionPtrComment.Append (LlvmIrGenerator.MapManagedTypeToNative (parameter.Type));
-				if (parameter.IsCplusPlusReference.HasValue && parameter.IsCplusPlusReference.Value) {
-				 	getFunctionPtrComment.Append ('&');
-				}
-				getFunctionPtrComment.Append (' ');
-				getFunctionPtrComment.Append (parameter.Name);
-			}
-			getFunctionPtrComment.Append (')');
-
-			LlvmIrFunction getFunctionPtrFunc = new LlvmIrFunction (
-				name: GetFunctionPointerVariableName,
-				returnType: typeof(void),
-				parameters: getFunctionPtrParams
-			);
-
-			LlvmIrVariable getFunctionPtrVariable = module.AddGlobalVariable (
-				typeof(IntPtr),
-				GetFunctionPointerVariableName,
-				null,
-				LlvmIrVariableOptions.LocalWritableInsignificantAddr,
-				getFunctionPtrComment.ToString ()
-			);
-
-			var init_params = new List<LlvmIrFunctionParameter> {
-				new (typeof(_JNIEnv), "env") {
-					NoCapture = true,
-					NoUndef = true,
-					ReadNone = true,
-				},
-				new (typeof(IntPtr), "fn") {
-					NoUndef = true,
-				},
-			};
-
-			var init_signature = new LlvmIrFunctionSignature (
-				name: "xamarin_app_init",
-				returnType: typeof(void),
-				parameters: init_params
-			);
-
-			LlvmIrFunctionAttributeSet attrSet = MakeXamarinAppInitAttributeSet (module);
-			var xamarin_app_init = new LlvmIrFunction (init_signature, attrSet);
-
-			// If `fn` is nullptr, print a message and abort...
-			//
-			// We must allocate result variables for both the null comparison and puts call here and with names, because
-			// labels and local unnamed variables must be numbered sequentially otherwise and the `AddIfThenElse` call will
-			// allocate up to 3 labels which would have been **defined** after these labels, but **used** before them - and
-			// thus the numbering sequence would be out of order and the .ll file wouldn't build.
-			var fnNullResult = xamarin_app_init.CreateLocalVariable (typeof(bool), "fnIsNull");
-			LlvmIrVariable putsResult = xamarin_app_init.CreateLocalVariable (typeof(int), "putsResult");
-			var ifThenInstructions = new List<LlvmIrInstruction> {
-				module.CreatePuts ("get_function_pointer MUST be specified\n", putsResult),
-				module.CreateAbort (),
-				new LlvmIrInstructions.Unreachable (),
-			};
-
-			module.AddIfThenElse (xamarin_app_init, fnNullResult, LlvmIrIcmpCond.Equal, init_params[1], null, ifThenInstructions);
-
-			// ...otherwise store the pointer and return
-			xamarin_app_init.Body.Store (init_params[1], getFunctionPtrVariable, module.TbaaAnyPointer);
-			xamarin_app_init.Body.Ret (typeof(void));
-
-			module.Add (xamarin_app_init);
-
-			return (getFunctionPtrVariable, getFunctionPtrFunc);
-		}
-
-		LlvmIrFunctionAttributeSet MakeXamarinAppInitAttributeSet (LlvmIrModule module)
-		{
-			var attrSet = new LlvmIrFunctionAttributeSet {
-				new MustprogressFunctionAttribute (),
-				new NofreeFunctionAttribute (),
-				new NorecurseFunctionAttribute (),
-				new NosyncFunctionAttribute (),
-				new NounwindFunctionAttribute (),
-				new WillreturnFunctionAttribute (),
-				new MemoryFunctionAttribute {
-					Default = MemoryAttributeAccessKind.Write,
-					Argmem = MemoryAttributeAccessKind.None,
-					InaccessibleMem = MemoryAttributeAccessKind.None,
-				},
-				new UwtableFunctionAttribute (),
-				new MinLegalVectorWidthFunctionAttribute (0),
-				new NoTrappingMathFunctionAttribute (true),
-				new StackProtectorBufferSizeFunctionAttribute (8),
-			};
-
-			return module.AddAttributeSet (attrSet);
-		}
-
-		protected virtual void AddMarshalMethodNames (LlvmIrModule module, AssemblyCacheState acs)
-		{}
-
-		AssemblyCacheState CreateAssemblyCache ()
-		{
-			var acs = new AssemblyCacheState ();
-			uint index = 0;
-
-			foreach (string name in uniqueAssemblyNames) {
-				// We must make sure we keep the possible culture prefix, which will be treated as "directory" path here
-				string cultureName = Path.GetDirectoryName (name) ?? String.Empty;
-				string clippedName = Path.Combine (cultureName, Path.GetFileNameWithoutExtension (name)).Replace (@"\", "/");
-				string inArchiveName;
-
-				if (cultureName.Length == 0) {
-					// Regular assemblies get the 'lib_' prefix
-					inArchiveName = $"{MonoAndroidHelper.MANGLED_ASSEMBLY_REGULAR_ASSEMBLY_MARKER}{name}{MonoAndroidHelper.MANGLED_ASSEMBLY_NAME_EXT}";
-				} else {
-					// Satellite assemblies get the 'lib-{CULTURE}-' prefix
-					inArchiveName = $"{MonoAndroidHelper.MANGLED_ASSEMBLY_SATELLITE_ASSEMBLY_MARKER}{cultureName}-{Path.GetFileName (name)}{MonoAndroidHelper.MANGLED_ASSEMBLY_NAME_EXT}";
-				}
-
-				ulong hashFull32 = MonoAndroidHelper.GetXxHash (name, is64Bit: false);
-				ulong hashInArchive32 = MonoAndroidHelper.GetXxHash (inArchiveName, is64Bit: false);
-				ulong hashClipped32 = MonoAndroidHelper.GetXxHash (clippedName, is64Bit: false);
-
-				ulong hashFull64 = MonoAndroidHelper.GetXxHash (name, is64Bit: true);
-				ulong hashInArchive64 = MonoAndroidHelper.GetXxHash (inArchiveName, is64Bit: true);
-				ulong hashClipped64 = MonoAndroidHelper.GetXxHash (clippedName, is64Bit: true);
-
-				//
-				// If the number of name forms changes, xamarin-app.hh MUST be updated to set value of the
-				// `number_of_assembly_name_forms_in_image_cache` constant to the number of forms.
-				//
-				acs.Hashes32.Add ((uint)Convert.ChangeType (hashFull32, typeof(uint)), (name, index));
-				acs.Hashes32.Add ((uint)Convert.ChangeType (hashInArchive32, typeof(uint)), (inArchiveName, index));
-				acs.Hashes32.Add ((uint)Convert.ChangeType (hashClipped32, typeof(uint)), (clippedName, index));
-
-				acs.Hashes64.Add (hashFull64, (name, index));
-				acs.Hashes64.Add (hashInArchive64, (inArchiveName, index));
-				acs.Hashes64.Add (hashClipped64, (clippedName, index));
-
-				index++;
-			}
-
-			acs.Keys32 = acs.Hashes32.Keys.ToList ();
-			acs.Keys32.Sort ();
-			for (int i = 0; i < acs.Keys32.Count; i++) {
-				(string name, uint idx) = acs.Hashes32[acs.Keys32[i]];
-				acs.Indices32.Add (idx);
-				acs.AsmNameToIndexData32.Add (name, idx);
-			}
-
-			acs.Keys64 = acs.Hashes64.Keys.ToList ();
-			acs.Keys64.Sort ();
-			for (int i = 0; i < acs.Keys64.Count; i++) {
-				(string name, uint idx) = acs.Hashes64[acs.Keys64[i]];
-				acs.Indices64.Add (idx);
-				acs.AsmNameToIndexData64.Add (name, idx);
-			}
-
-			return acs;
-		}
-
-		protected virtual void AddAssemblyImageCache (LlvmIrModule module, AssemblyCacheState acs)
-		{}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs
deleted file mode 100644
index 7576c4ccf25..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Represents the state of marshal methods for a specific compilation unit.
-	/// This class encapsulates the collection of marshal methods that have been
-	/// classified and are ready for native code generation.
-	/// </summary>
-	sealed class MarshalMethodsState
-	{
-		/// <summary>
-		/// Gets the dictionary of marshal methods organized by their unique keys.
-		/// Each key typically represents a type-method combination, and the value
-		/// is a list of marshal method entries for that key (allowing for method overloads).
-		/// </summary>
-		public IDictionary<string, IList<MarshalMethodEntry>> MarshalMethods { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodsState"/> class.
-		/// </summary>
-		/// <param name="marshalMethods">
-		/// The dictionary of marshal methods organized by their unique keys.
-		/// Cannot be null.
-		/// </param>
-		/// <exception cref="ArgumentNullException">
-		/// Thrown when <paramref name="marshalMethods"/> is null.
-		/// </exception>
-		/// <remarks>
-		/// This constructor also dumps the marshal methods to the console for debugging purposes
-		/// when diagnostic logging is enabled.
-		/// </remarks>
-		public MarshalMethodsState (IDictionary<string, IList<MarshalMethodEntry>> marshalMethods)
-		{
-			// Debug output for troubleshooting marshal method classification
-			MonoAndroidHelper.DumpMarshalMethodsToConsole ("Classified ethods in MarshalMethodsState ctor", marshalMethods);
-
-			MarshalMethods = marshalMethods ?? throw new ArgumentNullException (nameof (marshalMethods));
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
index 099679af4a2..09e4798c301 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
@@ -32,13 +32,9 @@ public partial class MonoAndroidHelper
 		public static AndroidVersions   SupportedVersions;
 		public static AndroidSdkInfo    AndroidSdk;
 
-		internal static XAAssemblyResolver MakeResolver (TaskLoggingHelper log, bool useMarshalMethods, AndroidTargetArch targetArch, Dictionary<string, ITaskItem> assemblies, bool loadDebugSymbols = true)
+		internal static XAAssemblyResolver MakeResolver (TaskLoggingHelper log, AndroidTargetArch targetArch, Dictionary<string, ITaskItem> assemblies, bool loadDebugSymbols = true)
 		{
 			var readerParams = new ReaderParameters ();
-			if (useMarshalMethods) {
-				readerParams.ReadWrite = true;
-				readerParams.InMemory = true;
-			}
 
 			var res = new XAAssemblyResolver (targetArch, log, loadDebugSymbols: loadDebugSymbols, loadReaderParameters: readerParams);
 			var uniqueDirs = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
@@ -772,7 +768,7 @@ static Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> GetPerArchAs
 				assemblies.Add (GetAssemblyNameWithCulture (assembly), assembly);
 			}
 
-			// It's possible some assembly collections will be empty (e.g. `ResolvedUserAssemblies` as passed to the `GenerateJavaStubs` task), which
+			// It's possible some assembly collections will be empty (e.g. `ResolvedUserAssemblies`), which
 			// isn't a problem and such empty collections should not be validated, as it will end in the "should never happen" exception below being
 			// thrown as a false negative.
 			if (assembliesPerArch.Count == 0 || !validate) {
@@ -812,18 +808,6 @@ void EnsureDictionariesHaveTheSameEntries (Dictionary<string, ITaskItem> templat
 			}
 		}
 
-		internal static void DumpMarshalMethodsToConsole (string heading, IDictionary<string, IList<MarshalMethodEntry>> marshalMethods)
-		{
-			Console.WriteLine ();
-			Console.WriteLine ($"{heading}:");
-			foreach (var kvp in marshalMethods) {
-				Console.WriteLine ($"  {kvp.Key}");
-				foreach (var method in kvp.Value) {
-					Console.WriteLine ($"    {method.DeclaringType.FullName} {method.NativeCallback.FullName}");
-				}
-			}
-		}
-
 		public static uint ZipAlignmentToPageSize (int alignment) => ZipAlignmentToMaskOrPageSize (alignment, needMask: false);
 
 		static uint ZipAlignmentToMaskOrPageSize (int alignment, bool needMask)
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs
deleted file mode 100644
index 35a52e9b695..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-
-using Java.Interop.Tools.Cecil;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Holds state for typemap and marshal methods generators.  A single instance of this
-/// class is created for each enabled target architecture.
-/// </summary>
-class NativeCodeGenState
-{
-	public static bool TemplateJniAddNativeMethodRegistrationAttributePresent { get; set; }
-
-	/// <summary>
-	/// Target architecture for which this instance was created.
-	/// </summary>
-	public AndroidTargetArch TargetArch                        { get; }
-
-	/// <summary>
-	/// Classifier used when scanning for Java types in the target architecture's
-	/// assemblies.  Will be **null** if marshal methods are disabled.
-	/// </summary>
-	public MarshalMethodsCollection? Classifier                { get; }
-
-	/// <summary>
-	/// All the Java types discovered in the target architecture's assemblies.
-	/// </summary>
-	public List<TypeDefinition> AllJavaTypes                   { get; }
-
-	/// <summary>
-	/// Contains information about p/invokes used by the managed assemblies included in the
-	/// application. Will be **null** unless native runtime linking at application build time
-	/// is enabled.
-	/// </summary>
-	public List<PinvokeScanner.PinvokeEntryInfo>? PinvokeInfos { get; set; }
-
-	public List<TypeDefinition> JavaTypesForJCW                { get; }
-	public XAAssemblyResolver Resolver                         { get; }
-	public TypeDefinitionCache TypeCache                       { get; }
-	public bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
-
-
-	public NativeCodeGenState (AndroidTargetArch arch, TypeDefinitionCache tdCache, XAAssemblyResolver resolver, List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW, MarshalMethodsCollection? classifier)
-	{
-		TargetArch = arch;
-		TypeCache = tdCache;
-		Resolver = resolver;
-		AllJavaTypes = allJavaTypes;
-		JavaTypesForJCW = javaTypesForJCW;
-		Classifier = classifier;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs
deleted file mode 100644
index 1ac17b55fd9..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Microsoft.Build.Utilities;
-using Microsoft.Android.Build.Tasks;
-
-namespace Xamarin.Android.Tasks
-{
-	class NativeTypeMappingData
-	{
-		public TypeMapGenerator.ModuleReleaseData[] Modules { get; }
-		public TypeMapGenerator.TypeMapReleaseEntry[] JavaTypes { get; }
-
-		public uint MapModuleCount { get; }
-		public uint JavaTypeCount  { get; }
-
-		public NativeTypeMappingData (TaskLoggingHelper log, TypeMapGenerator.ModuleReleaseData[] modules)
-		{
-			Modules = modules ?? throw new ArgumentNullException (nameof (modules));
-
-			MapModuleCount = (uint)modules.Length;
-
-			var tempJavaTypes = new Dictionary<string, TypeMapGenerator.TypeMapReleaseEntry> (StringComparer.Ordinal);
-			var moduleComparer = new TypeMapGenerator.ModuleUUIDArrayComparer ();
-
-			TypeMapGenerator.ModuleReleaseData? monoAndroid = null;
-			foreach (TypeMapGenerator.ModuleReleaseData data in modules) {
-				if (data.AssemblyName == "Mono.Android") {
-					monoAndroid = data;
-					break;
-				}
-			}
-
-			if (monoAndroid != null) {
-				ProcessModule (monoAndroid);
-			}
-
-			foreach (TypeMapGenerator.ModuleReleaseData data in modules) {
-				if (data.AssemblyName == "Mono.Android") {
-					continue;
-				}
-				ProcessModule (data);
-			};
-
-			void ProcessModule (TypeMapGenerator.ModuleReleaseData data)
-			{
-				int moduleIndex = Array.BinarySearch (modules, data, moduleComparer);
-				if (moduleIndex < 0)
-					throw new InvalidOperationException ($"Unable to map module with MVID {data.Mvid} to array index");
-
-				foreach (TypeMapGenerator.TypeMapReleaseEntry entry in data.Types) {
-					entry.ModuleIndex = moduleIndex;
-					if (tempJavaTypes.ContainsKey (entry.JavaName)) {
-						log.LogDebugMessage ($"Skipping typemap entry for `{entry.ManagedTypeName}, {data.AssemblyName}`; `{entry.JavaName}` is already mapped.");
-						continue;
-					}
-					tempJavaTypes.Add (entry.JavaName, entry);
-				}
-			}
-
-			JavaTypes = tempJavaTypes.Values.ToArray ();
-			JavaTypeCount = (uint)JavaTypes.Length;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
index f2685f783e5..251fd345d66 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
@@ -71,24 +71,21 @@ sealed class ConstructionState
 		{ "mono-android.release",        String.Empty },
 	};
 
-	readonly NativeCodeGenStateObject state;
+	readonly AndroidTargetArch targetArch;
+	readonly List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos;
 	readonly ITaskItem[] monoComponents;
 
-	public PreservePinvokesNativeAssemblyGenerator (TaskLoggingHelper log, NativeCodeGenStateObject codeGenState, ITaskItem[] monoComponents)
+	public PreservePinvokesNativeAssemblyGenerator (TaskLoggingHelper log, AndroidTargetArch targetArch, List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos, ITaskItem[] monoComponents)
 		: base (log)
 	{
-		if (codeGenState.PinvokeInfos == null) {
-			throw new InvalidOperationException ($"Internal error: {nameof (codeGenState)} `{nameof (codeGenState.PinvokeInfos)}` property is `null`");
-		}
-
-		this.state = codeGenState;
+		this.targetArch = targetArch;
+		this.pinvokeInfos = pinvokeInfos ?? throw new ArgumentNullException (nameof (pinvokeInfos));
 		this.monoComponents = monoComponents;
 	}
 
 	protected override void Construct (LlvmIrModule module)
 	{
-		Log.LogDebugMessage ($"[{state.TargetArch}] Constructing p/invoke preserve code");
-		List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos = state.PinvokeInfos!;
+		Log.LogDebugMessage ($"[{targetArch}] Constructing p/invoke preserve code");
 		if (pinvokeInfos.Count == 0) {
 			// This is a very unlikely scenario, but we will work just fine.  The module that this generator produces will merely result
 			// in an empty (but valid) .ll file and an "empty" object file to link into the shared library.
@@ -127,14 +124,14 @@ protected override void Construct (LlvmIrModule module)
 			return;
 		}
 
-		switch (state.TargetArch) {
+		switch (targetArch) {
 			case AndroidTargetArch.Arm64:
 			case AndroidTargetArch.X86_64:
 			case AndroidTargetArch.Arm:
 			case AndroidTargetArch.X86:
 				break;
 			default:
-				throw new NotSupportedException ($"Architecture {state.TargetArch} is not supported here");
+				throw new NotSupportedException ($"Architecture {targetArch} is not supported here");
 		}
 
 		Log.LogDebugMessage ("  Checking discovered p/invokes against the list of components");
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs
deleted file mode 100644
index 53dde75784c..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Java.Interop.Tools.Cecil;
-using Mono.Cecil;
-
-using ReflectionAssemblyContentType = System.Reflection.AssemblyContentType;
-using ReflectionAssemblyName = System.Reflection.AssemblyName;
-using ReflectionAssemblyNameFlags = System.Reflection.AssemblyNameFlags;
-using ModuleReleaseData = Xamarin.Android.Tasks.TypeMapGenerator.ModuleReleaseData;
-using ReleaseGenerationState = Xamarin.Android.Tasks.TypeMapGenerator.ReleaseGenerationState;
-using TypeMapDebugEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugEntry;
-using TypeMapReleaseEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapReleaseEntry;
-using TypeMapDebugDataSets = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugDataSets;
-using TypeMapDebugAssembly = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugAssembly;
-
-namespace Xamarin.Android.Tasks;
-
-// Converts types from Mono.Cecil to the format used by the typemap generator.
-class TypeMapCecilAdapter
-{
-	public static TypeMapDebugDataSets GetDebugNativeEntries (NativeCodeGenState state, bool needUniqueAssemblies)
-	{
-		var (dataSets, foundJniNativeRegistration) = GetDebugNativeEntries (state.AllJavaTypes, state.TypeCache, needUniqueAssemblies);
-
-		state.JniAddNativeMethodRegistrationAttributePresent = foundJniNativeRegistration;
-
-		return dataSets;
-	}
-
-	public static (TypeMapDebugDataSets dataSets, bool foundJniNativeRegistration) GetDebugNativeEntries (List<TypeDefinition> types, TypeDefinitionCache cache, bool needUniqueAssemblies)
-	{
-		var javaDuplicates = new Dictionary<string, List<TypeMapDebugEntry>> (StringComparer.Ordinal);
-		var uniqueAssemblies = needUniqueAssemblies ? new Dictionary<string, TypeMapDebugAssembly> (StringComparer.OrdinalIgnoreCase) : null;
-		var javaToManaged = new List<TypeMapDebugEntry> ();
-		var managedToJava = new List<TypeMapDebugEntry> ();
-		var foundJniNativeRegistration = false;
-
-		foreach (var td in types) {
-			foundJniNativeRegistration = JniAddNativeMethodRegistrationAttributeFound (foundJniNativeRegistration, td);
-
-			TypeMapDebugEntry entry = GetDebugEntry (td, cache);
-			HandleDebugDuplicates (javaDuplicates, entry, td, cache);
-
-			javaToManaged.Add (entry);
-			managedToJava.Add (entry);
-
-			if (uniqueAssemblies == null) {
-				continue;
-			}
-
-			string? asmName = td.Module.Assembly.Name.Name;
-			if (String.IsNullOrEmpty (asmName) || uniqueAssemblies.ContainsKey (asmName)) {
-				continue;
-			}
-
-			var asmInfo = new TypeMapDebugAssembly {
-				MVID = td.Module.Mvid,
-				Name = asmName,
-			};
-			asmInfo.MVIDBytes = asmInfo.MVID.ToByteArray ();
-			uniqueAssemblies.Add (asmName, asmInfo);
-		}
-
-		SyncDebugDuplicates (javaDuplicates);
-
-		return (new TypeMapDebugDataSets {
-			JavaToManaged = javaToManaged,
-			ManagedToJava = managedToJava,
-			UniqueAssemblies = uniqueAssemblies != null ? new List<TypeMapDebugAssembly> (uniqueAssemblies.Values) : null
-		}, foundJniNativeRegistration);
-	}
-
-	public static ReleaseGenerationState GetReleaseGenerationState (NativeCodeGenState state)
-	{
-		var genState = new ReleaseGenerationState ();
-
-		foreach (TypeDefinition td in state.AllJavaTypes) {
-			UpdateApplicationConfig (state, td);
-			ProcessReleaseType (state.TypeCache, genState, td);
-		}
-
-		return genState;
-	}
-
-	public static ReleaseGenerationState GetReleaseGenerationState (List<TypeDefinition> types, TypeDefinitionCache cache, out bool foundJniNativeRegistration)
-	{
-		var genState = new ReleaseGenerationState ();
-		foundJniNativeRegistration = false;
-
-		foreach (TypeDefinition td in types) {
-			foundJniNativeRegistration = JniAddNativeMethodRegistrationAttributeFound (foundJniNativeRegistration, td);
-			ProcessReleaseType (cache, genState, td);
-		}
-
-		return genState;
-	}
-
-	static void ProcessReleaseType (TypeDefinitionCache cache, ReleaseGenerationState genState, TypeDefinition td)
-	{
-		// We must NOT use Guid here! The reason is that Guid sort order is different than its corresponding
-		// byte array representation and on the runtime we need the latter in order to be able to binary search
-		// through the module array.
-		byte [] moduleUUID;
-		if (!genState.MvidCache.TryGetValue (td.Module.Mvid, out moduleUUID)) {
-			moduleUUID = td.Module.Mvid.ToByteArray ();
-			genState.MvidCache.Add (td.Module.Mvid, moduleUUID);
-		}
-
-		Dictionary<byte [], ModuleReleaseData> tempModules = genState.TempModules;
-		if (!tempModules.TryGetValue (moduleUUID, out ModuleReleaseData moduleData)) {
-			moduleData = new ModuleReleaseData {
-				Mvid = td.Module.Mvid,
-				MvidBytes = moduleUUID,
-				AssemblyName = td.Module.Assembly.Name.Name,
-				TypesScratch = new Dictionary<string, TypeMapReleaseEntry> (StringComparer.Ordinal),
-				DuplicateTypes = new List<TypeMapReleaseEntry> (),
-			};
-
-			tempModules.Add (moduleUUID, moduleData);
-		}
-
-		string javaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td, cache);
-		// We will ignore generic types and interfaces when generating the Java to Managed map, but we must not
-		// omit them from the table we output - we need the same number of entries in both java-to-managed and
-		// managed-to-java tables.  `SkipInJavaToManaged` set to `true` will cause the native assembly generator
-		// to output `0` as the token id for the type, thus effectively causing the runtime unable to match such
-		// a Java type name to a managed type. This fixes https://github.com/dotnet/android/issues/4660
-		var entry = new TypeMapReleaseEntry {
-			JavaName = javaName,
-			ManagedTypeName = td.FullName,
-			Token = td.MetadataToken.ToUInt32 (),
-			SkipInJavaToManaged = ShouldSkipInJavaToManaged (td),
-		};
-
-		if (moduleData.TypesScratch.ContainsKey (entry.JavaName)) {
-			// This is disabled because it costs a lot of time (around 150ms per standard XF Integration app
-			// build) and has no value for the end user. The message is left here because it may be useful to us
-			// in our devloop at some point.
-			//log.LogDebugMessage ($"Warning: duplicate Java type name '{entry.JavaName}' in assembly '{moduleData.AssemblyName}' (new token: {entry.Token}).");
-			moduleData.DuplicateTypes.Add (entry);
-		} else {
-			moduleData.TypesScratch.Add (entry.JavaName, entry);
-		}
-	}
-
-	static TypeMapDebugEntry GetDebugEntry (TypeDefinition td, TypeDefinitionCache cache)
-	{
-		return new TypeMapDebugEntry {
-			JavaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td, cache),
-			ManagedName = GetManagedTypeName (td),
-			ManagedTypeTokenId = td.MetadataToken.ToUInt32 (),
-			TypeDefinition = td,
-			SkipInJavaToManaged = ShouldSkipInJavaToManaged (td),
-			AssemblyName = td.Module.Assembly.Name.Name,
-			AssemblyFullName = GetRuntimeAssemblyFullName (td.Module.Assembly.Name),
-		};
-	}
-
-	// Cecil's FullName does not escape assembly display names in the same way as Assembly.FullName.
-	public static string GetRuntimeAssemblyFullName (AssemblyNameReference assemblyName)
-	{
-		var runtimeAssemblyName = new ReflectionAssemblyName {
-			Name = assemblyName.Name,
-			Version = assemblyName.Version,
-			CultureName = assemblyName.Culture ?? "",
-			Flags = assemblyName.IsRetargetable ? ReflectionAssemblyNameFlags.Retargetable : ReflectionAssemblyNameFlags.None,
-			ContentType = assemblyName.IsWindowsRuntime ? ReflectionAssemblyContentType.WindowsRuntime : ReflectionAssemblyContentType.Default,
-		};
-		runtimeAssemblyName.SetPublicKeyToken (assemblyName.PublicKeyToken);
-
-		return runtimeAssemblyName.FullName ?? throw new InvalidOperationException ($"Unable to format assembly name '{assemblyName.Name}'.");
-	}
-
-	static string GetManagedTypeName (TypeDefinition td)
-	{
-		// This is necessary because Mono runtime will return to us type name with a `.` for nested types (not a
-		// `/` or a `+`. So, for instance, a type named `DefaultRenderer` found in the
-		// `Xamarin.Forms.Platform.Android.Platform` class in the `Xamarin.Forms.Platform.Android` assembly will
-		// be seen here as
-		//
-		//   Xamarin.Forms.Platform.Android.Platform/DefaultRenderer
-		//
-		// The managed land name for the type will be rendered as
-		//
-		//   Xamarin.Forms.Platform.Android.Platform+DefaultRenderer
-		//
-		// And this is the form that we need in the map file
-		//
-		string managedTypeName = td.FullName.Replace ('/', '+');
-
-		return $"{managedTypeName}, {td.Module.Assembly.Name.Name}";
-	}
-
-	static void HandleDebugDuplicates (Dictionary<string, List<TypeMapDebugEntry>> javaDuplicates, TypeMapDebugEntry entry, TypeDefinition td, TypeDefinitionCache cache)
-	{
-		List<TypeMapDebugEntry> duplicates;
-
-		if (!javaDuplicates.TryGetValue (entry.JavaName, out duplicates)) {
-			javaDuplicates.Add (entry.JavaName, new List<TypeMapDebugEntry> { entry });
-		} else {
-			TypeMapDebugEntry oldEntry = duplicates [0];
-			if ((td.IsAbstract || td.IsInterface) &&
-					!oldEntry.TypeDefinition.IsAbstract &&
-					!oldEntry.TypeDefinition.IsInterface &&
-					td.IsAssignableFrom (oldEntry.TypeDefinition, cache)) {
-				// We found the `Invoker` type *before* the declared type
-				// Fix things up so the abstract type is first, and the `Invoker` is considered a duplicate.
-				duplicates.Insert (0, entry);
-				oldEntry.SkipInJavaToManaged = false;
-				oldEntry.IsInvoker = true;
-			} else {
-				// ¯\_(ツ)_/¯
-				duplicates.Add (entry);
-			}
-		}
-	}
-
-	static bool ShouldSkipInJavaToManaged (TypeDefinition td)
-	{
-		return td.IsInterface || td.HasGenericParameters;
-	}
-
-	static void SyncDebugDuplicates (Dictionary<string, List<TypeMapDebugEntry>> javaDuplicates)
-	{
-		foreach (List<TypeMapDebugEntry> duplicates in javaDuplicates.Values) {
-			if (duplicates.Count < 2) {
-				continue;
-			}
-
-			// Java duplicates must all point to the same managed type
-			// Managed types, however, must point back to the original Java type instead
-			// File/assembly generator use the `DuplicateForJavaToManaged` field to know to which managed type the
-			// duplicate Java type must be mapped.
-			TypeMapDebugEntry template = GetDebugDuplicateTemplate (duplicates);
-			foreach (TypeMapDebugEntry duplicate in duplicates) {
-				if (duplicate == template) {
-					continue;
-				}
-				duplicate.DuplicateForJavaToManaged = template;
-			}
-		}
-	}
-
-	static TypeMapDebugEntry GetDebugDuplicateTemplate (List<TypeMapDebugEntry> duplicates)
-	{
-		foreach (TypeMapDebugEntry duplicate in duplicates) {
-			if (duplicate.AssemblyName == "Mono.Android") {
-				return duplicate;
-			}
-		}
-		return duplicates [0];
-	}
-
-	static void UpdateApplicationConfig (NativeCodeGenState state, TypeDefinition javaType)
-	{
-		state.JniAddNativeMethodRegistrationAttributePresent = JniAddNativeMethodRegistrationAttributeFound (state.JniAddNativeMethodRegistrationAttributePresent, javaType);
-	}
-
-	static bool JniAddNativeMethodRegistrationAttributeFound (bool alreadyFound, TypeDefinition javaType)
-	{
-		if (alreadyFound || !javaType.HasCustomAttributes) {
-			return alreadyFound;
-		}
-
-		foreach (CustomAttribute ca in javaType.CustomAttributes) {
-			if (string.Equals ("JniAddNativeMethodRegistrationAttribute", ca.AttributeType.Name, StringComparison.Ordinal)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
deleted file mode 100644
index b0c9cdd8088..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-using static Xamarin.Android.Tasks.TypeMapGenerator;
-
-namespace Xamarin.Android.Tasks
-{
-	class TypeMapGenerator
-	{
-		internal sealed class ModuleUUIDArrayComparer : IComparer<ModuleReleaseData>
-		{
-			int Compare (byte[] left, byte[] right)
-			{
-				int ret;
-
-				for (int i = 0; i < 16; i++) {
-					ret = left[i].CompareTo (right[i]);
-					if (ret != 0)
-						return ret;
-				}
-
-				return 0;
-			}
-
-			public int Compare (ModuleReleaseData left, ModuleReleaseData right)
-			{
-				return Compare (left.MvidBytes, right.MvidBytes);
-			}
-		}
-
-		internal sealed class TypeMapReleaseEntry
-		{
-			public string JavaName;
-			public string ManagedTypeName;
-			public uint Token;
-			public int ModuleIndex = -1;
-			public bool SkipInJavaToManaged;
-		}
-
-		internal sealed class ModuleReleaseData
-		{
-			public Guid Mvid;
-			public byte[] MvidBytes;
-			public TypeMapReleaseEntry[] Types;
-			public List<TypeMapReleaseEntry> DuplicateTypes;
-			public string AssemblyName;
-
-			public Dictionary<string, TypeMapReleaseEntry> TypesScratch;
-		}
-
-		internal sealed class TypeMapDebugEntry
-		{
-			public string JavaName;
-			public string ManagedName;
-			public uint ManagedTypeTokenId;
-			public bool SkipInJavaToManaged;
-			public TypeMapDebugEntry DuplicateForJavaToManaged;
-			public string AssemblyName;
-			public string AssemblyFullName;
-
-			// This field is only used by the Cecil adapter for temp storage while reading.
-			// It is not used to create the typemap.
-			public TypeDefinition TypeDefinition;
-
-			// These fields are only used by the XML adapter for temp storage while reading.
-			// It is not used to create the typemap.
-			public string? DuplicateForJavaToManagedKey { get; set; }
-			public bool IsInvoker { get; set; }
-			public bool IsMonoAndroid { get; set; } // Types in Mono.Android take precedence over other assemblies
-
-			public string Key => $"{JavaName}|{ManagedName}";
-
-			public override string ToString ()
-			{
-				return $"TypeMapDebugEntry{{JavaName={JavaName}, ManagedName={ManagedName}, SkipInJavaToManaged={SkipInJavaToManaged}, DuplicateForJavaToManaged={DuplicateForJavaToManaged}}}";
-			}
-		}
-
-		internal sealed class TypeMapDebugAssembly
-		{
-			public Guid MVID;
-			public byte[] MVIDBytes;
-			public string Name;
-		}
-
-		internal sealed class TypeMapDebugDataSets
-		{
-			public List<TypeMapDebugEntry> JavaToManaged ;
-			public List<TypeMapDebugEntry> ManagedToJava;
-			public List<TypeMapDebugAssembly>? UniqueAssemblies;
-		}
-
-		// Widths include the terminating nul character but not the padding!
-		internal sealed class ModuleDebugData
-		{
-			public uint EntryCount;
-			public List<TypeMapDebugEntry> JavaToManagedMap;
-			public List<TypeMapDebugEntry> ManagedToJavaMap;
-			public List<TypeMapDebugAssembly>? UniqueAssemblies;
-		}
-
-		internal sealed class ReleaseGenerationState
-		{
-			// This field is only used by the Cecil adapter for temp storage while reading.
-			// It is not used to create the typemap.
-			public readonly Dictionary<Guid, byte []> MvidCache;
-
-			public readonly Dictionary<byte [], ModuleReleaseData> TempModules;
-
-			public ReleaseGenerationState ()
-			{
-				MvidCache = new Dictionary<Guid, byte []> ();
-				TempModules = new Dictionary<byte [], ModuleReleaseData> ();
-			}
-		}
-
-		readonly TaskLoggingHelper log;
-		readonly ITypeMapGeneratorAdapter state;
-		readonly AndroidRuntime runtime;
-
-		public IList<string> GeneratedBinaryTypeMaps { get; } = new List<string> ();
-
-		/// <summary>
-		/// Whether to write descriptive comments into the generated LLVM IR type maps.
-		/// See <see cref="LLVMIR.LlvmIrGenerator.EmitComments" />.
-		/// </summary>
-		public bool EmitComments { get; set; }
-
-		public TypeMapGenerator (TaskLoggingHelper log, ITypeMapGeneratorAdapter state, AndroidRuntime runtime)
-		{
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.state = state ?? throw new ArgumentNullException (nameof (state));
-			this.runtime = runtime;
-		}
-
-		public void Generate (bool debugBuild, bool skipJniAddNativeMethodRegistrationAttributeScan, string outputDirectory)
-		{
-			if (String.IsNullOrEmpty (outputDirectory)) {
-				throw new ArgumentException ("must not be null or empty", nameof (outputDirectory));
-			}
-			Directory.CreateDirectory (outputDirectory);
-
-			state.JniAddNativeMethodRegistrationAttributePresent = skipJniAddNativeMethodRegistrationAttributeScan;
-			string typemapsOutputDirectory = Path.Combine (outputDirectory, "typemaps");
-			if (debugBuild) {
-				GenerateDebugNativeAssembly (typemapsOutputDirectory);
-				return;
-			}
-
-			GenerateRelease (typemapsOutputDirectory);
-		}
-
-		void GenerateDebugNativeAssembly (string outputDirectory)
-		{
-			TypeMapDebugDataSets dataSets = state.GetDebugNativeEntries (needUniqueAssemblies: runtime == AndroidRuntime.CoreCLR);
-
-			var data = new ModuleDebugData {
-				EntryCount = (uint)dataSets.JavaToManaged.Count,
-				JavaToManagedMap = dataSets.JavaToManaged,
-				ManagedToJavaMap = dataSets.ManagedToJava,
-				UniqueAssemblies = dataSets.UniqueAssemblies,
-			};
-
-			data.JavaToManagedMap.Sort ((TypeMapDebugEntry a, TypeMapDebugEntry b) => String.Compare (a.JavaName, b.JavaName, StringComparison.Ordinal));
-			data.ManagedToJavaMap.Sort ((TypeMapDebugEntry a, TypeMapDebugEntry b) => String.Compare (a.ManagedName, b.ManagedName, StringComparison.Ordinal));
-
-			LLVMIR.LlvmIrComposer composer = runtime switch {
-				AndroidRuntime.CoreCLR => new TypeMappingDebugNativeAssemblyGenerator (log, data),
-				_ => throw new NotSupportedException ($"Internal error: unsupported runtime {runtime}")
-			};
-			GenerateNativeAssembly (composer, composer.Construct (), outputDirectory);
-		}
-
-		void GenerateRelease (string outputDirectory)
-		{
-			var genState = state.GetReleaseGenerationState ();
-
-			ModuleReleaseData [] modules = genState.TempModules.Values.ToArray ();
-			Array.Sort (modules, new ModuleUUIDArrayComparer ());
-
-			foreach (ModuleReleaseData module in modules) {
-				if (module.TypesScratch.Count == 0) {
-					module.Types = [];
-					continue;
-				}
-
-				// No need to sort here, the LLVM IR generator will compute hashes and sort
-				// the array on write.
-				module.Types = module.TypesScratch.Values.ToArray ();
-			}
-
-			LLVMIR.LlvmIrComposer composer = runtime switch {
-				AndroidRuntime.CoreCLR => new TypeMappingReleaseNativeAssemblyGenerator (log, new NativeTypeMappingData (log, modules)),
-				_ => throw new NotSupportedException ($"Internal error: unsupported runtime {runtime}")
-			};
-
-			GenerateNativeAssembly (composer, composer.Construct (), outputDirectory);
-		}
-
-		void GenerateNativeAssembly (LLVMIR.LlvmIrComposer composer, LLVMIR.LlvmIrModule typeMapModule, string baseFileName)
-		{
-			string outputFile = $"{baseFileName}.{MonoAndroidHelper.ArchToAbi (state.TargetArch)}.ll";
-
-			composer.EmitComments = EmitComments;
-
-			// TODO: each .ll file should have a comment which lists paths to all the DLLs that were used to generate
-			// the native code
-			using (var sw = MemoryStreamPool.Shared.CreateStreamWriter ()) {
-				try {
-					composer.Generate (typeMapModule, state.TargetArch, sw, outputFile);
-				} catch {
-					throw;
-				} finally {
-					sw.Flush ();
-					Files.CopyIfStreamChanged (sw.BaseStream, outputFile);
-				}
-			}
-		}
-	}
-
-	interface ITypeMapGeneratorAdapter
-	{
-		AndroidTargetArch TargetArch { get; }
-		bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
-		TypeMapDebugDataSets GetDebugNativeEntries (bool needUniqueAssemblies);
-		ReleaseGenerationState GetReleaseGenerationState ();
-	}
-
-	class NativeCodeGenStateAdapter : ITypeMapGeneratorAdapter
-	{
-		readonly NativeCodeGenState state;
-
-		public NativeCodeGenStateAdapter (NativeCodeGenState state)
-		{
-			this.state = state ?? throw new ArgumentNullException (nameof (state));
-		}
-
-		public AndroidTargetArch TargetArch => state.TargetArch;
-
-		public bool JniAddNativeMethodRegistrationAttributePresent {
-			get => state.JniAddNativeMethodRegistrationAttributePresent;
-			set => state.JniAddNativeMethodRegistrationAttributePresent = value;
-		}
-
-		public TypeMapDebugDataSets GetDebugNativeEntries (bool needUniqueAssemblies)
-		{
-			return TypeMapCecilAdapter.GetDebugNativeEntries (state, needUniqueAssemblies);
-		}
-
-		public ReleaseGenerationState GetReleaseGenerationState ()
-		{
-			return TypeMapCecilAdapter.GetReleaseGenerationState (state);
-		}
-	}
-
-	class TypeMapObjectsFileAdapter : ITypeMapGeneratorAdapter
-	{
-		public List<TypeMapObjectsXmlFile> XmlFiles { get; } = [];
-		public AndroidTargetArch TargetArch { get; }
-
-		public TypeMapObjectsFileAdapter (AndroidTargetArch targetArch)
-		{
-			TargetArch = targetArch;
-		}
-
-		public bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
-
-		public TypeMapDebugDataSets GetDebugNativeEntries (bool needUniqueAssemblies)
-		{
-			var javaToManaged = new List<TypeMapDebugEntry> ();
-			var managedToJava = new List<TypeMapDebugEntry> ();
-			var uniqueAssemblies = new Dictionary<string, TypeMapDebugAssembly> (StringComparer.OrdinalIgnoreCase);
-
-			foreach (var xml in XmlFiles) {
-				if (!uniqueAssemblies.ContainsKey (xml.AssemblyName)) {
-					var assm = new TypeMapDebugAssembly {
-						MVID = xml.AssemblyMvid,
-						MVIDBytes = xml.AssemblyMvid.ToByteArray (),
-						Name = xml.AssemblyName,
-					};
-					uniqueAssemblies.Add (xml.AssemblyName, assm);
-				}
-
-				javaToManaged.AddRange (xml.JavaToManagedDebugEntries);
-				managedToJava.AddRange (xml.ManagedToJavaDebugEntries);
-			}
-
-			// Handle entries with duplicate JavaNames
-			GroupDuplicateDebugEntries (javaToManaged);
-			GroupDuplicateDebugEntries (managedToJava);
-
-			return new TypeMapDebugDataSets {
-				JavaToManaged = javaToManaged,
-				ManagedToJava = managedToJava,
-				UniqueAssemblies = uniqueAssemblies.Values.ToList (),
-			};
-		}
-
-		void GroupDuplicateDebugEntries (List<TypeMapDebugEntry> debugEntries)
-		{
-			foreach (var group in debugEntries.GroupBy (ent => ent.JavaName).Where (g => g.Count () > 1)) {
-				// We need to sort:
-				// - Types in Mono.Android come first
-				// - Types that are not invokers come first
-				var entries = group
-					.OrderBy (e => e.IsMonoAndroid ? 0 : 1)
-					.ThenBy (e => e.IsInvoker ? 1 : 0)
-					.ToList ();
-
-				for (var i = 1; i < entries.Count; i++)
-					entries [i].DuplicateForJavaToManaged = entries [0];
-			}
-		}
-
-		public ReleaseGenerationState GetReleaseGenerationState ()
-		{
-			var state = new ReleaseGenerationState ();
-
-			foreach (var xml in XmlFiles)
-				if (xml.HasReleaseEntries)
-					state.TempModules.Add (xml.ModuleReleaseData.MvidBytes, xml.ModuleReleaseData);
-
-			return state;
-		}
-
-		public static TypeMapObjectsFileAdapter? Create (AndroidTargetArch targetArch, List<ITaskItem> assemblies, TaskLoggingHelper log)
-		{
-			var adapter = new TypeMapObjectsFileAdapter (targetArch);
-
-			foreach (var assembly in assemblies) {
-				var typeMapPath = TypeMapObjectsXmlFile.GetTypeMapObjectsXmlFilePath (assembly);
-
-				if (!File.Exists (typeMapPath)) {
-					log.LogError ($"'{typeMapPath}' not found.");
-					return null;
-				}
-
-				var xml = TypeMapObjectsXmlFile.Import (typeMapPath);
-
-				if (xml.WasScanned)
-					adapter.XmlFiles.Add (xml);
-			}
-
-			return adapter;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs
deleted file mode 100644
index 5a610af49d1..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Xml;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-using ModuleReleaseData = Xamarin.Android.Tasks.TypeMapGenerator.ModuleReleaseData;
-using TypeMapDebugEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugEntry;
-using TypeMapReleaseEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapReleaseEntry;
-
-namespace Xamarin.Android.Tasks;
-
-class TypeMapObjectsXmlFile
-{
-	static readonly XmlWriterSettings settings = new XmlWriterSettings {
-		Indent = true,
-		NewLineOnAttributes = false,
-		OmitXmlDeclaration = true,
-	};
-
-	static readonly TypeMapObjectsXmlFile unscanned = new TypeMapObjectsXmlFile { WasScanned = false };
-
-	public string? AssemblyName { get; set; }
-	public string? AssemblyFullName { get; set; }
-	public Guid AssemblyMvid { get; set; } = Guid.Empty;
-	public bool FoundJniNativeRegistration { get; set; }
-	public List<TypeMapDebugEntry> JavaToManagedDebugEntries { get; } = [];
-	public List<TypeMapDebugEntry> ManagedToJavaDebugEntries { get; } = [];
-	public ModuleReleaseData? ModuleReleaseData { get; set; }
-	public bool HasDebugEntries => JavaToManagedDebugEntries.Count > 0 || ManagedToJavaDebugEntries.Count > 0;
-	public bool HasReleaseEntries => ModuleReleaseData is not null;
-
-	public bool WasScanned { get; private set; }
-
-	public void Export (string filename, TaskLoggingHelper log)
-	{
-		if (!HasDebugEntries && ModuleReleaseData == null) {
-			WriteEmptyFile (filename, log);
-			return;
-		}
-
-		using var sw = MemoryStreamPool.Shared.CreateStreamWriter ();
-
-		using (var xml = XmlWriter.Create (sw, settings))
-			Export (xml);
-
-		sw.Flush ();
-
-		Files.CopyIfStreamChanged (sw.BaseStream, filename);
-
-		log.LogDebugMessage ($"Wrote '{filename}', {JavaToManagedDebugEntries.Count} JavaToManagedDebugEntries, {ManagedToJavaDebugEntries.Count} ManagedToJavaDebugEntries, FoundJniNativeRegistration: {FoundJniNativeRegistration}");
-	}
-
-	void Export (XmlWriter xml)
-	{
-		xml.WriteStartElement ("api");
-		xml.WriteAttributeString ("type", HasDebugEntries ? "debug" : "release");
-		xml.WriteAttributeStringIfNotDefault ("assembly-name", AssemblyName);
-		xml.WriteAttributeStringIfNotDefault ("assembly-full-name", AssemblyFullName);
-
-		if (AssemblyMvid != Guid.Empty) {
-			xml.WriteAttributeString ("mvid", AssemblyMvid.ToString ("N"));
-		}
-		xml.WriteAttributeStringIfNotDefault ("found-jni-native-registration", FoundJniNativeRegistration);
-
-		if (HasDebugEntries)
-			ExportDebugData (xml);
-		else if (HasReleaseEntries)
-			ExportReleaseData (xml);
-
-		xml.WriteEndElement ();
-	}
-
-	void ExportDebugData (XmlWriter xml)
-	{
-		if (JavaToManagedDebugEntries.Count > 0) {
-			xml.WriteStartElement ("java-to-managed");
-
-			foreach (var entry in JavaToManagedDebugEntries)
-				WriteTypeMapDebugEntry (xml, entry);
-
-			xml.WriteEndElement ();
-		}
-
-		if (ManagedToJavaDebugEntries.Count > 0) {
-			xml.WriteStartElement ("managed-to-java");
-
-			foreach (var entry in ManagedToJavaDebugEntries)
-				WriteTypeMapDebugEntry (xml, entry);
-
-			xml.WriteEndElement ();
-		}
-	}
-
-	void WriteTypeMapDebugEntry (XmlWriter xml, TypeMapDebugEntry entry)
-	{
-		xml.WriteStartElement ("entry");
-		xml.WriteAttributeStringIfNotDefault ("java-name", entry.JavaName);
-		xml.WriteAttributeStringIfNotDefault ("managed-name", entry.ManagedName);
-		xml.WriteAttributeStringIfNotDefault ("skip-in-java-to-managed", entry.SkipInJavaToManaged);
-		xml.WriteAttributeStringIfNotDefault ("is-invoker", entry.IsInvoker);
-		xml.WriteAttributeString ("managed-type-token-id", entry.ManagedTypeTokenId.ToString (CultureInfo.InvariantCulture));
-		xml.WriteEndElement ();
-	}
-
-	void ExportReleaseData (XmlWriter xml)
-	{
-		if (ModuleReleaseData is null)
-			return;
-
-		xml.WriteStartElement ("module");
-
-		xml.WriteAttributeStringIfNotDefault ("assembly-name", ModuleReleaseData.AssemblyName);
-		xml.WriteAttributeStringIfNotDefault ("mvid", ModuleReleaseData.Mvid.ToString ("N"));
-		xml.WriteAttributeStringIfNotDefault ("mvid-bytes", Convert.ToBase64String (ModuleReleaseData.MvidBytes));
-
-		if (ModuleReleaseData.Types?.Length > 0) {
-			xml.WriteStartElement ("types");
-
-			foreach (var entry in ModuleReleaseData.DuplicateTypes)
-				ExportTypeMapReleaseEntry (xml, entry, null);
-
-			xml.WriteEndElement ();
-		}
-
-		if (ModuleReleaseData.DuplicateTypes?.Count > 0) {
-			xml.WriteStartElement ("duplicates");
-
-			foreach (var entry in ModuleReleaseData.DuplicateTypes)
-				ExportTypeMapReleaseEntry (xml, entry, null);
-
-			xml.WriteEndElement ();
-		}
-
-		if (ModuleReleaseData.TypesScratch?.Count > 0) {
-			xml.WriteStartElement ("types-scratch");
-
-			foreach (var kvp in ModuleReleaseData.TypesScratch)
-				ExportTypeMapReleaseEntry (xml, kvp.Value, kvp.Key);
-
-			xml.WriteEndElement ();
-		}
-
-		xml.WriteEndElement ();
-	}
-
-	void ExportTypeMapReleaseEntry (XmlWriter xml, TypeMapReleaseEntry entry, string? key)
-	{
-		xml.WriteStartElement ("entry");
-
-		xml.WriteAttributeStringIfNotDefault ("key", key);
-		xml.WriteAttributeStringIfNotDefault ("java-name", entry.JavaName);
-		xml.WriteAttributeStringIfNotDefault ("managed-type-name", entry.ManagedTypeName);
-		xml.WriteAttributeStringIfNotDefault ("token", entry.Token.ToString ());
-		xml.WriteAttributeStringIfNotDefault ("skip-in-java-to-managed", entry.SkipInJavaToManaged);
-
-		xml.WriteEndElement ();
-	}
-
-	/// <summary>
-	/// Given an assembly path, return the path to the ".typemap.xml" file that should be next to it.
-	/// </summary>
-	public static string GetTypeMapObjectsXmlFilePath (string assemblyPath)
-		=> Path.ChangeExtension (assemblyPath, ".typemap.xml");
-
-	public static string GetTypeMapObjectsXmlFilePath (ITaskItem assembly)
-	{
-		var path = assembly.GetMetadata ("TypeMapObjectsXmlFile");
-		return path.IsNullOrEmpty () ? GetTypeMapObjectsXmlFilePath (assembly.ItemSpec) : path;
-	}
-
-	public static TypeMapObjectsXmlFile Import (string filename)
-	{
-		// If the file has zero length, then the assembly wasn't scanned because it couldn't contain JLOs.
-		// This check is much faster than loading and parsing an empty XML file.
-		var fi = new FileInfo (filename);
-
-		if (fi.Length == 0)
-			return unscanned;
-
-		using var reader = XmlReader.Create (filename);
-
-		if (!reader.ReadToFollowing ("api"))
-			throw new InvalidOperationException ($"Invalid XML file '{filename}'");
-
-		var type = reader.GetAttribute ("type");
-
-		if (type.IsNullOrWhiteSpace ())
-			throw new InvalidOperationException ($"Missing required attribute 'type' in '{filename}'");
-
-		var assemblyName = reader.GetAttribute ("assembly-name");
-		var assemblyFullName = reader.GetAttribute ("assembly-full-name");
-		var mvidValue = reader.GetAttribute ("mvid");
-		var mvid = mvidValue.IsNullOrWhiteSpace () ? Guid.Empty : Guid.Parse (mvidValue);
-		var foundJniNativeRegistration = GetAttributeOrDefault (reader, "found-jni-native-registration", false);
-
-		var file = new TypeMapObjectsXmlFile {
-			WasScanned = true,
-			AssemblyName = assemblyName,
-			AssemblyFullName = assemblyFullName,
-			AssemblyMvid = mvid,
-			FoundJniNativeRegistration = foundJniNativeRegistration,
-		};
-
-		if (type == "debug")
-			ImportDebugData (reader, file);
-		else if (type == "release")
-			ImportReleaseData (reader, file);
-
-		return file;
-	}
-
-	static void ImportDebugData (XmlReader reader, TypeMapObjectsXmlFile file)
-	{
-		var assemblyName = file.AssemblyName ?? string.Empty;
-		var assemblyFullName = file.AssemblyFullName ?? string.Empty;
-		var isMonoAndroid = assemblyName == "Mono.Android";
-
-		while (reader.Read ()) {
-			if (reader.NodeType != XmlNodeType.Element)
-				continue;
-
-			if (reader.Name == "java-to-managed")
-				ReadDebugEntries (reader, file.JavaToManagedDebugEntries, assemblyName, assemblyFullName, isMonoAndroid);
-			else if (reader.Name == "managed-to-java")
-				ReadDebugEntries (reader, file.ManagedToJavaDebugEntries, assemblyName, assemblyFullName, isMonoAndroid);
-		}
-	}
-
-	static void ImportReleaseData (XmlReader reader, TypeMapObjectsXmlFile file)
-	{
-		if (!reader.ReadToFollowing ("module"))
-			return;
-
-		var mvidValue = reader.GetAttribute ("mvid");
-		file.ModuleReleaseData = new ModuleReleaseData {
-			AssemblyName = reader.GetAttribute ("assembly-name") ?? string.Empty,
-			Mvid = mvidValue.IsNullOrWhiteSpace () ? Guid.Empty : Guid.Parse (mvidValue),
-			MvidBytes = Convert.FromBase64String (GetAttributeOrDefault (reader, "mvid-bytes", string.Empty)),
-			TypesScratch = new Dictionary<string, TypeMapReleaseEntry> (StringComparer.Ordinal),
-			DuplicateTypes = new List<TypeMapReleaseEntry> (),
-		};
-
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType != XmlNodeType.Element)
-				continue;
-
-			switch (reader.Name) {
-				case "types":
-					var types = new List<TypeMapReleaseEntry> ();
-					ReadReleaseEntries (reader, types);
-					file.ModuleReleaseData.Types = types.ToArray ();
-					break;
-				case "duplicates":
-					ReadReleaseEntries (reader, file.ModuleReleaseData.DuplicateTypes);
-					break;
-				case "types-scratch":
-					ReadReleaseScratchEntries (reader, file.ModuleReleaseData.TypesScratch);
-					break;
-			}
-		}
-	}
-
-	public static void WriteEmptyFile (string destination, TaskLoggingHelper log)
-	{
-		log.LogDebugMessage ($"Writing empty file '{destination}'");
-
-		// We write a zero byte file to indicate the file couldn't have JLO types and wasn't scanned
-		File.Create (destination).Dispose ();
-	}
-
-	static TypeMapDebugEntry FromDebugEntryXml (XmlReader reader, string assemblyName, string assemblyFullName, bool isMonoAndroid)
-	{
-		return new TypeMapDebugEntry {
-			JavaName = reader.GetAttribute ("java-name") ?? string.Empty,
-			ManagedName = reader.GetAttribute ("managed-name") ?? string.Empty,
-			ManagedTypeTokenId = GetAttributeOrDefault (reader, "managed-type-token-id", 0u),
-			SkipInJavaToManaged = GetAttributeOrDefault (reader, "skip-in-java-to-managed", false),
-			IsInvoker = GetAttributeOrDefault (reader, "is-invoker", false),
-			IsMonoAndroid = isMonoAndroid,
-			AssemblyName = assemblyName,
-			AssemblyFullName = assemblyFullName,
-		};
-	}
-
-	static TypeMapReleaseEntry FromReleaseEntryXml (XmlReader reader)
-	{
-		return new TypeMapReleaseEntry {
-			JavaName = reader.GetAttribute ("java-name") ?? string.Empty,
-			ManagedTypeName = reader.GetAttribute ("managed-type-name") ?? string.Empty,
-			Token = GetAttributeOrDefault (reader, "token", 0u),
-			SkipInJavaToManaged = GetAttributeOrDefault (reader, "skip-in-java-to-managed", false),
-		};
-	}
-
-	static T GetAttributeOrDefault<T> (XmlReader reader, string name, T defaultValue)
-	{
-		var value = reader.GetAttribute (name);
-
-		if (value.IsNullOrWhiteSpace ())
-			return defaultValue;
-
-		return (T) Convert.ChangeType (value, typeof (T), CultureInfo.InvariantCulture);
-	}
-
-	static void ReadDebugEntries (XmlReader reader, List<TypeMapDebugEntry> entries, string assemblyName, string assemblyFullName, bool isMonoAndroid)
-	{
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType == XmlNodeType.Element && reader.Name == "entry")
-				entries.Add (FromDebugEntryXml (reader, assemblyName, assemblyFullName, isMonoAndroid));
-		}
-	}
-
-	static void ReadReleaseEntries (XmlReader reader, List<TypeMapReleaseEntry> entries)
-	{
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType == XmlNodeType.Element && reader.Name == "entry")
-				entries.Add (FromReleaseEntryXml (reader));
-		}
-	}
-
-	static void ReadReleaseScratchEntries (XmlReader reader, Dictionary<string, TypeMapReleaseEntry> entries)
-	{
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType == XmlNodeType.Element && reader.Name == "entry") {
-				var key = reader.GetAttribute ("key") ?? string.Empty;
-				entries.Add (key, FromReleaseEntryXml (reader));
-			}
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs
deleted file mode 100644
index 7b188b18a5e..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-#nullable enable
-using System;
-using Xamarin.Android.Tasks.LLVMIR;
-
-using Microsoft.Build.Utilities;
-
-namespace Xamarin.Android.Tasks
-{
-	abstract class TypeMappingAssemblyGenerator : LlvmIrComposer
-	{
-		protected TypeMappingAssemblyGenerator (TaskLoggingHelper log)
-			: base (log)
-		{
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
deleted file mode 100644
index 17064c7c5e6..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tasks.LLVMIR;
-
-namespace Xamarin.Android.Tasks;
-
-class TypeMappingDebugNativeAssemblyGenerator : LlvmIrComposer
-{
-	const string JavaToManagedSymbol = "map_java_to_managed";
-	const string ManagedToJavaSymbol = "map_managed_to_java";
-
-	// These names MUST match src/native/clr/include/xamarin-app.hh
-	const string TypeMapSymbol = "type_map";
-	const string AssemblyNamesBlobSymbol = "type_map_assembly_names";
-	const string ManagedTypeNamesBlobSymbol = "type_map_managed_type_names";
-	const string JavaTypeNamesBlobSymbol = "type_map_java_type_names";
-	const string TypeMapManagedTypeInfoSymbol = "type_map_managed_type_info";
-
-	sealed class TypeMapContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override ulong GetBufferSize (object data, string fieldName)
-		{
-			var map_module = EnsureType<TypeMap> (data);
-			return fieldName switch {
-				"java_to_managed" => map_module.entry_count,
-				"managed_to_java" => map_module.entry_count,
-				_ => 0
-			};
-		}
-
-		public override string? GetPointedToSymbolName (object data, string fieldName)
-		{
-			var map_module = EnsureType<TypeMap> (data);
-
-			if (MonoAndroidHelper.StringEquals ("java_to_managed", fieldName)) {
-				return map_module.JavaToManagedCount == 0 ? null : JavaToManagedSymbol;
-			}
-
-			if (MonoAndroidHelper.StringEquals ("managed_to_java", fieldName)) {
-				return map_module.ManagedToJavaCount == 0 ? null : ManagedToJavaSymbol;
-			}
-
-			return base.GetPointedToSymbolName (data, fieldName);
-		}
-	}
-
-	sealed class TypeMapEntryContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override string GetComment (object data, string fieldName)
-		{
-			var entry = EnsureType<TypeMapEntry> (data);
-
-			if (MonoAndroidHelper.StringEquals ("from", fieldName)) {
-				return $" from: '{entry.From}'";
-			}
-
-			if (MonoAndroidHelper.StringEquals ("to", fieldName)) {
-				return $" to: '{entry.To}'";
-			}
-
-			return String.Empty;
-		}
-	}
-
-	sealed class TypeMapManagedTypeInfoContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override string GetComment (object data, string fieldName)
-		{
-			var entry = EnsureType<TypeMapManagedTypeInfo> (data);
-
-			if (MonoAndroidHelper.StringEquals ("assembly_name_index", fieldName)) {
-				return $" '{entry.AssemblyName}'";
-			}
-
-			if (MonoAndroidHelper.StringEquals ("managed_type_token_id", fieldName)) {
-				return $" '{entry.ManagedTypeName}'";
-			}
-
-			return String.Empty;
-		}
-	}
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh TypeMapEntry structure
-	[NativeAssemblerStructContextDataProvider (typeof (TypeMapEntryContextDataProvider))]
-	sealed class TypeMapEntry
-	{
-		[NativeAssembler (Ignore = true)]
-		public string From = String.Empty;
-
-		[NativeAssembler (Ignore = true)]
-		public string To = String.Empty;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint from;
-
-		[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-		public uint from_hash;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint to;
-	};
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh TypeMapManagedTypeInfo structure
-	[NativeAssemblerStructContextDataProvider (typeof (TypeMapManagedTypeInfoContextDataProvider))]
-	sealed class TypeMapManagedTypeInfo
-	{
-		[NativeAssembler (Ignore = true)]
-		public string AssemblyName = String.Empty;
-
-		[NativeAssembler (Ignore = true)]
-		public string ManagedTypeName = String.Empty;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint assembly_name_index;
-
-		[NativeAssembler (UsesDataProvider = true, NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-		public uint managed_type_token_id;
-	};
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh TypeMap structure
-	[NativeAssemblerStructContextDataProvider (typeof (TypeMapContextDataProvider))]
-	sealed class TypeMap
-	{
-		[NativeAssembler (Ignore = true)]
-		public int    JavaToManagedCount;
-
-		[NativeAssembler (Ignore = true)]
-		public int    ManagedToJavaCount;
-
-		public uint   entry_count;
-
-		[NativeAssembler (UsesDataProvider = true), NativePointer (PointsToSymbol = "")]
-		public TypeMapEntry? java_to_managed = null;
-
-		[NativeAssembler (UsesDataProvider = true), NativePointer (PointsToSymbol = "")]
-		public TypeMapEntry? managed_to_java = null;
-	};
-
-	readonly TypeMapGenerator.ModuleDebugData data;
-	StructureInfo? typeMapEntryStructureInfo;
-	StructureInfo? typeMapStructureInfo;
-	StructureInfo? typeMapManagedTypeInfoStructureInfo;
-	List<StructureInstance<TypeMapEntry>> javaToManagedMap;
-	List<StructureInstance<TypeMapEntry>> managedToJavaMap;
-	List<StructureInstance<TypeMapManagedTypeInfo>> managedTypeInfos;
-	StructureInstance<TypeMap>? type_map;
-
-	public TypeMappingDebugNativeAssemblyGenerator (TaskLoggingHelper log, TypeMapGenerator.ModuleDebugData data)
-		: base (log)
-	{
-		if (data.UniqueAssemblies == null || data.UniqueAssemblies.Count == 0) {
-			throw new InvalidOperationException ("Internal error: set of unique assemblies must be provided.");
-		}
-
-		this.data = data;
-
-		javaToManagedMap = new ();
-		managedToJavaMap = new ();
-		managedTypeInfos = new ();
-	}
-
-	protected override void Construct (LlvmIrModule module)
-	{
-		module.DefaultStringGroup = "tmd";
-
-		if (data.UniqueAssemblies == null) {
-			throw new InvalidOperationException ("Internal error: unique assemblies collection must be present");
-		}
-
-		MapStructures (module);
-
-		var managedTypeNames = new LlvmIrStringBlob ();
-		var javaTypeNames = new LlvmIrStringBlob ();
-
-		// CoreCLR supports only 64-bit targets, so we can make things simpler by hashing all the things here instead of
-		// in a callback during code generation
-
-		foreach (TypeMapGenerator.TypeMapDebugEntry entry in data.ManagedToJavaMap) {
-			if (String.IsNullOrEmpty (entry.AssemblyFullName)) {
-				throw new InvalidOperationException ($"Internal error: assembly full name is missing for managed type '{entry.ManagedName}'.");
-			}
-
-			if (!entry.ManagedName.EndsWith (entry.AssemblyName, StringComparison.Ordinal)) {
-				throw new InvalidOperationException ($"Internal error: managed type name '{entry.ManagedName}' does not end with assembly name '{entry.AssemblyName}'.");
-			}
-
-			string managedName = entry.ManagedName.Substring (0, entry.ManagedName.Length - entry.AssemblyName.Length) + entry.AssemblyFullName;
-			(int managedTypeNameOffset, int _) = managedTypeNames.Add (managedName);
-			(int javaTypeNameOffset, int _) = javaTypeNames.Add (entry.JavaName);
-			var m2j = new TypeMapEntry {
-				From = managedName,
-				To = entry.JavaName,
-
-				from = (uint)managedTypeNameOffset,
-				from_hash = TypeMapHelper.HashNameForCLR (managedName),
-				to = (uint)javaTypeNameOffset,
-			};
-			managedToJavaMap.Add (new StructureInstance<TypeMapEntry> (typeMapEntryStructureInfo, m2j));
-		}
-
-		// Input is sorted on name, we need to re-sort it on hashes.
-		managedToJavaMap.Sort ((StructureInstance<TypeMapEntry> a, StructureInstance<TypeMapEntry> b) => {
-			if (a.Instance == null) {
-				return b.Instance == null ? 0 : -1;
-			}
-
-			if (b.Instance == null) {
-				return 1;
-			}
-
-			return a.Instance.from_hash.CompareTo (b.Instance.from_hash);
-		});
-
-		var assemblyNamesBlob = new LlvmIrStringBlob ();
-		data.UniqueAssemblies.Sort ((a, b) => String.Compare (a.Name, b.Name, StringComparison.Ordinal));
-		foreach (TypeMapGenerator.TypeMapDebugAssembly asm in data.UniqueAssemblies) {
-			assemblyNamesBlob.Add (asm.Name);
-		}
-
-		var managedTypeInfos = new List<StructureInstance<TypeMapManagedTypeInfo>> ();
-		// Java-to-managed maps don't use hashes since many mappings have multiple instances
-		foreach (TypeMapGenerator.TypeMapDebugEntry entry in data.JavaToManagedMap) {
-			TypeMapGenerator.TypeMapDebugEntry managedEntry = entry.DuplicateForJavaToManaged != null ? entry.DuplicateForJavaToManaged : entry;
-			(int managedTypeNameOffset, int _) = managedTypeNames.Add (managedEntry.ManagedName);
-			(int javaTypeNameOffset, int _) = javaTypeNames.Add (entry.JavaName);
-
-			var j2m = new TypeMapEntry {
-				From = entry.JavaName,
-				To = managedEntry.SkipInJavaToManaged ? String.Empty : managedEntry.ManagedName,
-
-				from = (uint)javaTypeNameOffset,
-				from_hash = 0,
-				to = managedEntry.SkipInJavaToManaged ? uint.MaxValue : (uint)managedTypeNameOffset,
-			};
-			javaToManagedMap.Add (new StructureInstance<TypeMapEntry> (typeMapEntryStructureInfo, j2m));
-
-			int assemblyNameOffset = assemblyNamesBlob.GetIndexOf (managedEntry.AssemblyName);
-			if (assemblyNameOffset < 0) {
-				throw new InvalidOperationException ($"Internal error: assembly name '{managedEntry.AssemblyName}' not found in the assembly names blob.");
-			}
-
-			var typeInfo = new TypeMapManagedTypeInfo {
-				AssemblyName = managedEntry.AssemblyName,
-				ManagedTypeName = managedEntry.ManagedName,
-
-				assembly_name_index = (uint)assemblyNameOffset,
-				managed_type_token_id = managedEntry.ManagedTypeTokenId,
-			};
-			managedTypeInfos.Add (new StructureInstance<TypeMapManagedTypeInfo> (typeMapManagedTypeInfoStructureInfo, typeInfo));
-		}
-
-		var map = new TypeMap {
-			JavaToManagedCount = data.JavaToManagedMap == null ? 0 : data.JavaToManagedMap.Count,
-			ManagedToJavaCount = data.ManagedToJavaMap == null ? 0 : data.ManagedToJavaMap.Count,
-
-			entry_count = data.EntryCount,
-		};
-		type_map = new StructureInstance<TypeMap> (typeMapStructureInfo, map);
-
-		module.AddGlobalVariable (TypeMapSymbol, type_map, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (ManagedToJavaSymbol, managedToJavaMap, LlvmIrVariableOptions.LocalConstant);
-		module.AddGlobalVariable (JavaToManagedSymbol, javaToManagedMap, LlvmIrVariableOptions.LocalConstant);
-		module.AddGlobalVariable (TypeMapManagedTypeInfoSymbol, managedTypeInfos, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (AssemblyNamesBlobSymbol, assemblyNamesBlob, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (ManagedTypeNamesBlobSymbol, managedTypeNames, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (JavaTypeNamesBlobSymbol, javaTypeNames, LlvmIrVariableOptions.GlobalConstant);
-	}
-
-	void MapStructures (LlvmIrModule module)
-	{
-		typeMapEntryStructureInfo = module.MapStructure<TypeMapEntry> ();
-		typeMapStructureInfo = module.MapStructure<TypeMap> ();
-		typeMapManagedTypeInfoStructureInfo = module.MapStructure<TypeMapManagedTypeInfo> ();
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
deleted file mode 100644
index 9283922719d..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
+++ /dev/null
@@ -1,486 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tasks.LLVMIR;
-
-namespace Xamarin.Android.Tasks
-{
-	partial class TypeMappingReleaseNativeAssemblyGenerator : LlvmIrComposer
-	{
-		sealed class TypeMapModuleContextDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var map_module = EnsureType<TypeMapModule> (data);
-
-				if (MonoAndroidHelper.StringEquals ("module_uuid", fieldName)) {
-					return $" module_uuid: {map_module.MVID}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("assembly_name_index", fieldName)) {
-					return $" assembly_name: {map_module.AssemblyName}";
-				}
-
-				return String.Empty;
-			}
-
-			public override ulong GetBufferSize (object data, string fieldName)
-			{
-				var map_module = EnsureType<TypeMapModule> (data);
-
-				if (MonoAndroidHelper.StringEquals ("map", fieldName)) {
-					return map_module.entry_count;
-				}
-
-				if (MonoAndroidHelper.StringEquals ("duplicate_map", fieldName)) {
-					return map_module.duplicate_count;
-				}
-
-				return base.GetBufferSize (data, fieldName);
-			}
-		}
-
-		sealed class TypeMapJavaContextDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var java_map_entry = EnsureType<TypeMapJava> (data);
-
-				if (MonoAndroidHelper.StringEquals ("managed_type_name_index", fieldName)) {
-					return $" managed type name: {java_map_entry.ManagedTypeName}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("java_name_index", fieldName)) {
-					return $" Java type name: {java_map_entry.JavaName}";
-				}
-
-				return String.Empty;
-			}
-		};
-
-		sealed class TypeMapModuleEntryContextDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var module_map_entry = EnsureType<TypeMapModuleEntry> (data);
-
-				if (MonoAndroidHelper.StringEquals ("managed_type_name_hash", fieldName)) {
-					return $" managed type name: {module_map_entry.ManagedTypeName}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("java_map_index", fieldName)) {
-					return $" Java type name: {module_map_entry.JavaTypeMapEntry.JavaName}";
-				}
-
-				return String.Empty;
-			}
-		};
-
-		// Order of fields and their type must correspond *exactly* to that in
-		// src/native/clr/include/xamarin-app.hh TypeMapModuleEntry structure
-		[NativeAssemblerStructContextDataProvider (typeof (TypeMapModuleEntryContextDataProvider))]
-		sealed class TypeMapModuleEntry
-		{
-			[NativeAssembler (Ignore = true)]
-			public TypeMapJava JavaTypeMapEntry;
-
-			[NativeAssembler (Ignore = true)]
-			public string ManagedTypeName;
-
-			[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-			public uint managed_type_name_hash;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint managed_type_name_index;
-
-			public uint managed_type_name_length;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint java_map_index;
-		}
-
-		// Order of fields and their type must correspond *exactly* to that in
-		// src/native/clr/include/xamarin-app.hh TypeMapModule structure
-		[NativeAssemblerStructContextDataProvider (typeof (TypeMapModuleContextDataProvider))]
-		sealed class TypeMapModule
-		{
-			[NativeAssembler (Ignore = true)]
-			public Guid    MVID;
-
-			[NativeAssembler (Ignore = true)]
-			public TypeMapGenerator.ModuleReleaseData Data;
-
-			[NativeAssembler (Ignore = true)]
-			public string AssemblyName;
-
-			[NativeAssembler (UsesDataProvider = true, InlineArray = true, InlineArraySize = 16)]
-			public byte[]  module_uuid;
-			public uint    entry_count;
-			public uint    duplicate_count;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint    assembly_name_index;
-			public uint    assembly_name_length;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint map_index;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint duplicate_map_index;
-		}
-
-		// Order of fields and their type must correspond *exactly* to that in
-		// src/native/clr/include/xamarin-app.hh TypeMapJava structure
-		[NativeAssemblerStructContextDataProvider (typeof (TypeMapJavaContextDataProvider))]
-		sealed class TypeMapJava
-		{
-			[NativeAssembler (Ignore = true)]
-			public string JavaName;
-
-			[NativeAssembler (Ignore = true)]
-			public string ManagedTypeName;
-
-			[NativeAssembler (Ignore = true)]
-			public uint JavaNameHash;
-
-			public uint module_index;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint managed_type_name_index;
-			public uint managed_type_name_length;
-
-			[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-			public uint managed_type_token_id;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint java_name_index;
-			public uint java_name_length;
-		}
-
-		sealed class ModuleMapData
-		{
-			public List<StructureInstance<TypeMapModuleEntry>> Entries { get; }
-
-			public ModuleMapData (List<StructureInstance<TypeMapModuleEntry>> entries)
-			{
-				Entries = entries;
-			}
-		}
-
-		sealed class JavaNameHashComparer : IComparer<StructureInstance<TypeMapJava>>
-		{
-			public int Compare (StructureInstance<TypeMapJava> a, StructureInstance<TypeMapJava> b)
-			{
-				int hashCompare = a.Instance.JavaNameHash.CompareTo (b.Instance.JavaNameHash);
-				if (hashCompare != 0) {
-					return hashCompare;
-				}
-
-				return StringComparer.Ordinal.Compare (a.Instance.JavaName, b.Instance.JavaName);
-			}
-		}
-
-		sealed class ConstructionState
-		{
-			public List<StructureInstance<TypeMapModule>> MapModules;
-			public Dictionary<string, TypeMapJava> JavaTypesByName;
-			public List<StructureInstance<TypeMapJava>> JavaMap;
-			public List<ModuleMapData> AllModulesData;
-			public LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>> AllModulesMaps;
-			public LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>> AllModulesDuplicates;
-			public LlvmIrStringBlob AssemblyNamesBlob;
-			public LlvmIrStringBlob JavaTypeNamesBlob;
-			public LlvmIrStringBlob ManagedTypeNamesBlob;
-		}
-
-		readonly NativeTypeMappingData mappingData;
-		StructureInfo typeMapJavaStructureInfo;
-		StructureInfo typeMapModuleStructureInfo;
-		StructureInfo typeMapModuleEntryStructureInfo;
-		JavaNameHashComparer javaNameHashComparer;
-
-		public TypeMappingReleaseNativeAssemblyGenerator (TaskLoggingHelper log, NativeTypeMappingData mappingData)
-			: base (log)
-		{
-			this.mappingData = mappingData ?? throw new ArgumentNullException (nameof (mappingData));
-			javaNameHashComparer = new JavaNameHashComparer ();
-
-			// Unfortunate, but we have to fix this up before proceeding
-			foreach (TypeMapGenerator.ModuleReleaseData module in mappingData.Modules) {
-				foreach (TypeMapGenerator.TypeMapReleaseEntry entry in module.Types) {
-					if (entry.ManagedTypeName.IndexOf ('/') < 0) {
-						continue;
-					}
-
-					// CoreCLR will request for subtypes with the `+` level separator instead of
-					// the `/` one.
-					entry.ManagedTypeName = entry.ManagedTypeName.Replace ('/', '+');
-				}
-			}
-		}
-
-		protected override void Construct (LlvmIrModule module)
-		{
-			module.DefaultStringGroup = "tmr";
-
-			MapStructures (module);
-
-			var cs = new ConstructionState ();
-			cs.JavaTypesByName = new Dictionary<string, TypeMapJava> (StringComparer.Ordinal);
-			InitJavaMap (cs);
-			InitMapModules (cs);
-			PrepareModules (cs);
-
-			module.AddGlobalVariable ("managed_to_java_map_module_count", mappingData.MapModuleCount);
-			module.AddGlobalVariable ("java_type_count", cs.JavaMap.Count);
-
-			var managed_to_java_map = new LlvmIrGlobalVariable (cs.MapModules, "managed_to_java_map", LlvmIrVariableOptions.GlobalWritable) {
-				Comment = " Managed modules map",
-			};
-			module.Add (managed_to_java_map);
-
-			// Java hashes are output before Java type map **and** managed modules, because they will also sort the Java map for us.
-			// This is not strictly necessary, as we could do the sorting in the java map BeforeWriteCallback, but this way we save
-			// time sorting only once.
-			var java_to_managed_hashes = new LlvmIrGlobalVariable (typeof(List<uint>), "java_to_managed_hashes") {
-				Comment = " Java types name hashes",
-				BeforeWriteCallback = GenerateAndSortJavaHashes,
-				BeforeWriteCallbackCallerState = cs,
-				GetArrayItemCommentCallback = GetJavaHashesItemComment,
-				GetArrayItemCommentCallbackCallerState = cs,
-				NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal,
-			};
-			java_to_managed_hashes.WriteOptions &= ~LlvmIrVariableWriteOptions.ArrayWriteIndexComments;
-			module.Add (java_to_managed_hashes);
-
-			var modulesMapData = new LlvmIrGlobalVariable (cs.AllModulesMaps, "modules_map_data", LlvmIrVariableOptions.GlobalConstant) {
-				BeforeWriteCallback = SortEntriesAndUpdateJavaIndexes,
-				BeforeWriteCallbackCallerState = cs,
-			};
-			module.Add (modulesMapData);
-
-			var modulesDuplicatesData = new LlvmIrGlobalVariable (cs.AllModulesDuplicates, "modules_duplicates_data", LlvmIrVariableOptions.GlobalConstant) {
-				BeforeWriteCallback = SortEntriesAndUpdateJavaIndexes,
-				BeforeWriteCallbackCallerState = cs,
-			};
-			module.Add (modulesDuplicatesData);
-
-			module.AddGlobalVariable ("java_to_managed_map", cs.JavaMap, LlvmIrVariableOptions.GlobalConstant, " Java to managed map");
-			module.AddGlobalVariable ("java_type_names", cs.JavaTypeNamesBlob, LlvmIrVariableOptions.GlobalConstant, " Java type names");
-			module.AddGlobalVariable ("java_type_names_size", (ulong)cs.JavaTypeNamesBlob.Size, LlvmIrVariableOptions.GlobalConstant, " Java type names blob size");
-			module.AddGlobalVariable ("managed_type_names", cs.ManagedTypeNamesBlob, LlvmIrVariableOptions.GlobalConstant, " Managed type names");
-			module.AddGlobalVariable ("managed_assembly_names", cs.AssemblyNamesBlob, LlvmIrVariableOptions.GlobalConstant, " Managed assembly names");
-		}
-
-		void SortEntriesAndUpdateJavaIndexes (LlvmIrVariable variable, LlvmIrModuleTarget target, object? callerState)
-		{
-			ConstructionState cs = EnsureConstructionState (callerState);
-			LlvmIrGlobalVariable gv = EnsureGlobalVariable (variable);
-
-			var array = (LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>>)variable.Value;
-			foreach (LlvmIrArraySection<StructureInstance<TypeMapModuleEntry>> section in array.Sections) {
-				section.Data.Sort (
-					(object a, object b) => {
-						var entryA = ((StructureInstance<TypeMapModuleEntry>)a).Instance;
-						var entryB = ((StructureInstance<TypeMapModuleEntry>)b).Instance;
-						int hashCompare = entryA.managed_type_name_hash.CompareTo (entryB.managed_type_name_hash);
-						if (hashCompare != 0) {
-							return hashCompare;
-						}
-
-						return StringComparer.Ordinal.Compare (entryA.ManagedTypeName, entryB.ManagedTypeName);
-					}
-				);
-
-				foreach (StructureInstance<TypeMapModuleEntry> entry in section.Data) {
-					entry.Instance.java_map_index = GetJavaEntryIndex (entry.Instance.JavaTypeMapEntry);
-				}
-			}
-
-			uint GetJavaEntryIndex (TypeMapJava javaEntry)
-			{
-				var key = new StructureInstance<TypeMapJava> (typeMapJavaStructureInfo, javaEntry);
-				int idx = cs.JavaMap.BinarySearch (key, javaNameHashComparer);
-				if (idx < 0) {
-					throw new InvalidOperationException ($"Could not map entry '{javaEntry.JavaName}' to array index");
-				}
-
-				return (uint)idx;
-			}
-		}
-
-		string? GetJavaHashesItemComment (LlvmIrVariable v, LlvmIrModuleTarget target, ulong index, object? value, object? callerState)
-		{
-			var cs = callerState as ConstructionState;
-			if (cs == null) {
-				throw new InvalidOperationException ("Internal error: construction state expected but not found");
-			}
-
-			return $" {index} => {cs.JavaMap[(int)index].Instance.JavaName}";
-		}
-
-		void GenerateAndSortJavaHashes (LlvmIrVariable variable, LlvmIrModuleTarget target, object? callerState)
-		{
-			ConstructionState cs = EnsureConstructionState (callerState);
-			LlvmIrGlobalVariable gv = EnsureGlobalVariable (variable);
-
-			for (int i = 0; i < cs.JavaMap.Count; i++) {
-				TypeMapJava entry = cs.JavaMap[i].Instance;
-				entry.JavaNameHash = TypeMapHelper.HashNameForCLR (entry.JavaName);
-			}
-
-			cs.JavaMap.Sort (javaNameHashComparer);
-
-			var hashes = new List<uint> ();
-			foreach (StructureInstance<TypeMapJava> si in cs.JavaMap) {
-				hashes.Add (si.Instance.JavaNameHash);
-			}
-
-			gv.OverrideTypeAndValue (typeof(List<uint>), hashes);
-		}
-
-		ConstructionState EnsureConstructionState (object? callerState)
-		{
-			var cs = callerState as ConstructionState;
-			if (cs == null) {
-				throw new InvalidOperationException ("Internal error: construction state expected but not found");
-			}
-
-			return cs;
-		}
-
-		uint GetEntryIndex (string entryValue, Dictionary<string, uint> seenCache, List<string> entryList)
-		{
-			if (!seenCache.TryGetValue (entryValue, out uint assemblyNameIndex)) {
-				entryList.Add (entryValue);
-				assemblyNameIndex = (uint)(entryList.Count - 1);
-				seenCache.Add (entryValue, assemblyNameIndex);
-			}
-
-			return assemblyNameIndex;
-		}
-
-		void InitJavaMap (ConstructionState cs)
-		{
-			var seenManagedTypeNames = new Dictionary<string, uint> (StringComparer.Ordinal);
-			cs.JavaMap = new List<StructureInstance<TypeMapJava>> ();
-			cs.ManagedTypeNamesBlob = new ();
-			cs.JavaTypeNamesBlob = new ();
-
-			TypeMapJava map_entry;
-			foreach (TypeMapGenerator.TypeMapReleaseEntry entry in mappingData.JavaTypes) {
-				string assemblyName = mappingData.Modules[entry.ModuleIndex].AssemblyName;
-				(int managedTypeNameIndex, int managedTypeNameLength) = cs.ManagedTypeNamesBlob.Add (entry.ManagedTypeName);
-				(int javaTypeNameIndex, int javaTypeNameLength) = cs.JavaTypeNamesBlob.Add (entry.JavaName);
-
-				map_entry = new TypeMapJava {
-					ManagedTypeName = entry.ManagedTypeName,
-
-					module_index = (uint)entry.ModuleIndex, // UInt32.MaxValue,
-					managed_type_name_index = (uint)managedTypeNameIndex,
-					managed_type_name_length = (uint)managedTypeNameLength,
-					managed_type_token_id = entry.Token,
-					java_name_index = (uint)javaTypeNameIndex,
-					java_name_length = (uint)javaTypeNameLength,
-					JavaName = entry.JavaName,
-				};
-
-				cs.JavaMap.Add (new StructureInstance<TypeMapJava> (typeMapJavaStructureInfo, map_entry));
-				cs.JavaTypesByName.Add (map_entry.JavaName, map_entry);
-			}
-		}
-
-		void InitMapModules (ConstructionState cs)
-		{
-			var seenAssemblyNames = new Dictionary<string, uint> (StringComparer.OrdinalIgnoreCase);
-
-			cs.MapModules = new List<StructureInstance<TypeMapModule>> ();
-			cs.AssemblyNamesBlob = new ();
-			cs.AllModulesMaps = new ();
-			cs.AllModulesDuplicates = new ();
-
-			uint map_start_index = 0;
-			uint duplicates_start_index = 0;
-			foreach (TypeMapGenerator.ModuleReleaseData data in mappingData.Modules) {
-				bool haveDuplicates = data.DuplicateTypes.Count > 0;
-				(int assemblyNameIndex, int assemblyNameLength) = cs.AssemblyNamesBlob.Add (data.AssemblyName);
-
-				var map_module = new TypeMapModule {
-					MVID = data.Mvid,
-					Data = data,
-					AssemblyName = data.AssemblyName,
-
-					module_uuid = data.MvidBytes,
-					entry_count = (uint)data.Types.Length,
-					duplicate_count = (uint)data.DuplicateTypes.Count,
-					assembly_name_index = (uint)assemblyNameIndex,
-					assembly_name_length = (uint)assemblyNameLength,
-					map_index = map_start_index,
-					duplicate_map_index = haveDuplicates ? duplicates_start_index : UInt32.MaxValue,
-				};
-
-				map_start_index += map_module.entry_count;
-				duplicates_start_index += map_module.duplicate_count;
-
-				cs.MapModules.Add (new StructureInstance<TypeMapModule> (typeMapModuleStructureInfo, map_module));
-			}
-		}
-
-		void MapStructures (LlvmIrModule module)
-		{
-			typeMapJavaStructureInfo = module.MapStructure<TypeMapJava> ();
-			typeMapModuleStructureInfo = module.MapStructure<TypeMapModule> ();
-			typeMapModuleEntryStructureInfo = module.MapStructure<TypeMapModuleEntry> ();
-		}
-
-		void PrepareMapModuleData (IEnumerable<TypeMapGenerator.TypeMapReleaseEntry> moduleEntries, LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>> destCollection, string sectionHeader, ConstructionState cs)
-		{
-			var moduleSection = new LlvmIrArraySection<StructureInstance<TypeMapModuleEntry>> (sectionHeader);
-			foreach (TypeMapGenerator.TypeMapReleaseEntry entry in moduleEntries) {
-				if (!cs.JavaTypesByName.TryGetValue (entry.JavaName, out TypeMapJava javaType)) {
-					throw new InvalidOperationException ($"Internal error: Java type '{entry.JavaName}' not found in cache");
-				}
-
-				(int managedTypeNameIndex, int managedTypeNameLength) = cs.ManagedTypeNamesBlob.Add (entry.ManagedTypeName);
-				var map_entry = new TypeMapModuleEntry {
-					JavaTypeMapEntry = javaType,
-					ManagedTypeName = entry.ManagedTypeName,
-
-					managed_type_name_hash = TypeMapHelper.HashNameForCLR (entry.ManagedTypeName),
-					managed_type_name_index = (uint)managedTypeNameIndex,
-					managed_type_name_length = (uint)managedTypeNameLength,
-					java_map_index = UInt32.MaxValue, // will be set later, when the target is known
-				};
-				moduleSection.Add (new StructureInstance<TypeMapModuleEntry> (typeMapModuleEntryStructureInfo, map_entry));
-			}
-			destCollection.Add (moduleSection);
-		}
-
-		void PrepareModules (ConstructionState cs)
-		{
-			cs.AllModulesData = new List<ModuleMapData> ();
-			foreach (StructureInstance<TypeMapModule> moduleInstance in cs.MapModules) {
-				TypeMapModule module = moduleInstance.Instance;
-				PrepareMapModuleData (
-					module.Data.Types,
-					cs.AllModulesMaps,
-					$" Module: {module.AssemblyName}; MVID: {module.MVID}; number of entries: {module.Data.Types.Length}",
-					cs
-				);
-				if (module.Data.DuplicateTypes.Count > 0) {
-					PrepareMapModuleData (
-						module.Data.DuplicateTypes,
-						cs.AllModulesDuplicates,
-						$" Module: {module.AssemblyName}; MVID: {module.MVID}; number of entries: {module.Data.DuplicateTypes.Count}",
-						cs
-					);
-				}
-			}
-		}
-
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index 7f7b5252014..630cd4c9270 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -47,7 +47,6 @@
     <!-- Include only the linker sources required for the build tasks (LinkAssembliesNoShrink and PostTrimmingPipeline) -->
     <!-- These include: AddKeepAlivesStep, AddKeepAlivesHelper, CheckForObsoletePreserveAttributeStep, StripEmbeddedLibrariesStep, PostTrimmingAddKeepAlivesStep, FixAbstractMethodsStep, FixLegacyResourceDesignerStep, LinkDesignerBase -->
     <Compile Remove="Linker\**" />
-    <Compile Include="Linker\MonoDroid.Tuner\FindTypeMapObjectsStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\FindJavaObjectsStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\AddKeepAlivesStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\AddKeepAlivesHelper.cs" />
@@ -204,9 +203,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\Mono.Android\java\mono\android\TypeManager.java">
-      <LogicalName>JavaInteropTypeManager.java</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="Resources\*" Exclude="Resources\LayoutBinding.cs">
       <LogicalName>%(Filename)%(Extension)</LogicalName>
     </EmbeddedResource>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index eb9c6d8d963..abeecad2ff6 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -55,8 +55,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.CreateTemporaryDirectory" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.FilterAssemblies" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.FindLayoutsToBind" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateACWMap" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateAdditionalProviderSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateLayoutBindings" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateLibraryResources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateManagedAidlProxies" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -64,9 +62,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeMarshalMethodSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesigner" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesignerAssembly" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateJavaCallableWrappers" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateJavaStubs" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateMainAndroidManifest" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GeneratePackageManagerJava" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GetAndroidDefineConstants" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GetAppSettingsDirectory" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -82,7 +77,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.ProcessAssemblyCompressionFailures" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.RemoveDirFixed" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.ReadAndroidManifest" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.RewriteMarshalMethods" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GetExtraPackages" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.CopyGeneratedJavaResourceClasses" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.SplitProperty" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -272,7 +266,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	<_AndroidEnablePreloadAssembliesDefault>False</_AndroidEnablePreloadAssembliesDefault>
 	<AndroidEnablePreloadAssemblies Condition=" '$(AndroidEnablePreloadAssemblies)' == '' ">$(_AndroidEnablePreloadAssembliesDefault)</AndroidEnablePreloadAssemblies>
 	<_NativeAssemblySourceDir>$(IntermediateOutputPath)android\</_NativeAssemblySourceDir>
-	<_SkipJniAddNativeMethodRegistrationAttributeScan Condition=" '$(_SkipJniAddNativeMethodRegistrationAttributeScan)' == '' ">False</_SkipJniAddNativeMethodRegistrationAttributeScan>
 
 	<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' And '$(EmbedAssembliesIntoApk)' == 'False' ">True</_AndroidFastDeployEnvironmentFiles>
 	<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' ">False</_AndroidFastDeployEnvironmentFiles>
@@ -336,16 +329,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
   <_AndroidDlopenAssemblyStore>true</_AndroidDlopenAssemblyStore>
 </PropertyGroup>
 
-<PropertyGroup>
-  <AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' and ('$(UsingMicrosoftNETSdkRazor)' == 'true') ">False</AndroidEnableMarshalMethods>
-  <!-- NOTE: temporarily disable for NativeAOT and CoreCLR for now -->
-  <AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' ">False</AndroidEnableMarshalMethods>
-
-  <_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">False</_AndroidUseMarshalMethods>
-  <_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">$(AndroidEnableMarshalMethods)</_AndroidUseMarshalMethods>
-
-</PropertyGroup>
-
 <!-- Do not resolve from the GAC under any circumstances in Mobile -->
 <PropertyGroup>
 	<AssemblySearchPaths>
@@ -510,7 +493,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
   />
   <AndroidError Code="XA1049"
       ResourceName="XA1049"
-      Condition=" '$(AndroidEnableMarshalMethods)' == 'True' And '$(PublishReadyToRun)' == 'True' "
+      Condition=" '$(AndroidApplication)' == 'true' And '$(AndroidEnableMarshalMethods)' == 'True' "
   />
   <AndroidWarning Code="XA1027"
       ResourceName="XA1027"
@@ -902,8 +885,6 @@ because xbuild doesn't support framework reference assemblies.
 	<_AndroidLinkFlag>$(IntermediateOutputPath)link.flag</_AndroidLinkFlag>
 	<_AndroidApkPerAbiFlagFile>$(IntermediateOutputPath)android\bin\apk_per_abi.flag</_AndroidApkPerAbiFlagFile>
 	<_AndroidDebugKeyStoreFlag>$(IntermediateOutputPath)android_debug_keystore.flag</_AndroidDebugKeyStoreFlag>
-	<_AdditionalPostLinkerStepsFlag>$(_AndroidStampDirectory)_AdditionalPostLinkerSteps.stamp</_AdditionalPostLinkerStepsFlag>
-	<_AfterILLinkOutputDir>$(IntermediateOutputPath)afterlink\</_AfterILLinkOutputDir>
 	<_AcwMapFile>$(IntermediateOutputPath)acw-map.txt</_AcwMapFile>
 	<_CustomViewMapFile>$(IntermediateOutputPath)customview-map.txt</_CustomViewMapFile>
 	<AndroidResgenNamespace Condition="'$(AndroidResgenNamespace)'==''" >$(RootNamespace)</AndroidResgenNamespace>
@@ -963,7 +944,6 @@ because xbuild doesn't support framework reference assemblies.
 		<_PropertyCacheItems Include="ProjectFullPath=$(MSBuildProjectFullPath)" />
 		<_PropertyCacheItems Include="AndroidUseDesignerAssembly=$(AndroidUseDesignerAssembly)" />
 		<_PropertyCacheItems Include="AndroidTypeMapImplementation=$(AndroidTypeMapImplementation)" />
-		<_PropertyCacheItems Include="_AndroidUseMarshalMethods=$(_AndroidUseMarshalMethods)" />
 		<_PropertyCacheItems Include="_AndroidJcwCodegenTarget=$(_AndroidJcwCodegenTarget)" />
 		<_PropertyCacheItems Include="_AndroidAssemblyStoreCompressionLevel=$(_AndroidAssemblyStoreCompressionLevel)" />
 	</ItemGroup>
@@ -1366,17 +1346,9 @@ because xbuild doesn't support framework reference assemblies.
 <!-- Runtime jar selection.
      Trimmable jars replace JavaProxyObject/JavaProxyThrowable with non-native implementations. -->
 <Target Name="_CollectRuntimeJarFilenames">
-  <PropertyGroup Condition=" '$(_AndroidRuntime)' != 'CoreCLR' and '$(AndroidTypeMapImplementation)' != 'trimmable' ">
-    <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime.jar</_RuntimeJar>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">
+  <PropertyGroup>
     <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime_trimmable.jar</_RuntimeJar>
   </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(_AndroidRuntime)' == 'CoreCLR' and '$(AndroidTypeMapImplementation)' != 'trimmable' ">
-    <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime_clr.jar</_RuntimeJar>
-  </PropertyGroup>
 </Target>
 
 <Target Name="_AddStaticResources"
@@ -1406,14 +1378,6 @@ because xbuild doesn't support framework reference assemblies.
   <ItemGroup>
     <!-- We need this in its own item group so it isn't lost during a partial build -->
     <_AllResolvedAssemblies Include="@(ResolvedAssemblies)" />
-    <ResolvedAssemblies>
-      <JavaObjectsXmlFile
-          Condition=" '$(PublishTrimmed)' == 'true' And '$(AndroidTypeMapImplementation)' != 'trimmable' And $([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) "
-      >$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubDirectory)%(Filename).scan.empty</JavaObjectsXmlFile>
-      <TypeMapObjectsXmlFile
-          Condition=" '$(PublishTrimmed)' == 'true' And '$(AndroidTypeMapImplementation)' != 'trimmable' And $([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) "
-      >$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubDirectory)%(Filename).scan.empty</TypeMapObjectsXmlFile>
-    </ResolvedAssemblies>
   </ItemGroup>
 </Target>
 
@@ -1426,7 +1390,6 @@ because xbuild doesn't support framework reference assemblies.
       ApplicationJavaClass="$(AndroidApplicationJavaClass)"
       CodeGenerationTarget="$(AndroidCodegenTarget)"
       Debug="$(AndroidIncludeDebugSymbols)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
       PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
       ResolvedAssemblies="@(_AllResolvedAssemblies)"
@@ -1446,77 +1409,6 @@ because xbuild doesn't support framework reference assemblies.
   </ItemGroup>
 </Target>
 
-<!-- Runs additional steps after ILLink runs (_LinkAssemblies).
-     Preserve the existing in-place rewrite behavior when marshal methods are explicitly enabled.
-     Otherwise, write to afterlink/ so linked/ stays unchanged and downstream incrementalism is
-     preserved. -->
-<Target Name="_RunAfterILLinkAdditionalSteps"
-    DependsOnTargets="_LinkAssembliesNoShrinkInputs"
-    Condition="'$(PublishTrimmed)' == 'true' and '$(AndroidTypeMapImplementation)' != 'trimmable'"
-    Inputs="$(_AndroidLinkFlag)"
-    Outputs="$(_AdditionalPostLinkerStepsFlag)">
-  <MakeDir Directories="$(_AfterILLinkOutputDir)" Condition=" '$(_AndroidUseMarshalMethods)' != 'True' " />
-  <ItemGroup>
-    <_AfterILLinkSourceFiles Include="@(ResolvedAssemblies)"
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' or !$([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) " />
-    <_AfterILLinkDestFiles Condition=" '$(_AndroidUseMarshalMethods)' != 'True' " Include="@(_AfterILLinkSourceFiles->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-    <_AfterILLinkDestFiles Condition=" '$(_AndroidUseMarshalMethods)' == 'True' " Include="@(_AfterILLinkSourceFiles)" />
-    <_AndroidScanMarkerFiles Include="@(ResolvedAssemblies->'%(JavaObjectsXmlFile)')" Condition=" '%(ResolvedAssemblies.JavaObjectsXmlFile)' != '' " />
-  </ItemGroup>
-  <AssemblyModifierPipeline
-      ApplicationJavaClass="$(AndroidApplicationJavaClass)"
-      CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-      Debug="$(AndroidIncludeDebugSymbols)"
-      DestinationFiles="@(_AfterILLinkDestFiles)"
-      Deterministic="$(Deterministic)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
-      ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
-      PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
-      ReadSymbols="$(_AndroidLinkAssembliesReadSymbols)"
-      ResolvedAssemblies="@(_AllResolvedAssemblies)"
-      ResolvedUserAssemblies="@(ResolvedUserAssemblies)"
-      SourceFiles="@(_AfterILLinkSourceFiles)"
-      TargetName="$(TargetName)">
-  </AssemblyModifierPipeline>
-  <MakeDir Directories="@(_AndroidScanMarkerFiles->'%(RootDir)%(Directory)')" />
-  <Touch Files="@(_AndroidScanMarkerFiles)" AlwaysCreate="true" />
-  <Touch Files="$(_AdditionalPostLinkerStepsFlag)" AlwaysCreate="true" />
-  <ItemGroup>
-    <FileWrites Include="@(_AndroidScanMarkerFiles)" />
-    <_AfterILLinkSourceFiles Remove="@(_AfterILLinkSourceFiles)" />
-    <_AfterILLinkDestFiles Remove="@(_AfterILLinkDestFiles)" />
-    <_AndroidScanMarkerFiles Remove="@(_AndroidScanMarkerFiles)" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">
-    <FileWrites Include="$(_AfterILLinkOutputDir)**" />
-  </ItemGroup>
-</Target>
-
-<!-- Updates assembly itemgroups to point to afterlink/ outputs.
-     When marshal methods are enabled, assemblies were modified in-place in linked/
-     so no redirection is needed, but the target still runs to trigger _RunAfterILLinkAdditionalSteps. -->
-<Target Name="_AfterILLinkAdditionalSteps"
-    DependsOnTargets="_RunAfterILLinkAdditionalSteps"
-    Condition="'$(PublishTrimmed)' == 'true' and '$(AndroidTypeMapImplementation)' != 'trimmable'">
-  <ItemGroup Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">
-    <_OrigResolvedAssemblies Include="@(ResolvedAssemblies)" />
-    <ResolvedAssemblies Remove="@(ResolvedAssemblies)" />
-    <ResolvedAssemblies Include="@(_OrigResolvedAssemblies->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-
-    <_OrigResolvedUserAssemblies Include="@(ResolvedUserAssemblies)" />
-    <ResolvedUserAssemblies Remove="@(ResolvedUserAssemblies)" />
-    <ResolvedUserAssemblies Include="@(_OrigResolvedUserAssemblies->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-
-    <_OrigResolvedFrameworkAssemblies Include="@(ResolvedFrameworkAssemblies)" />
-    <ResolvedFrameworkAssemblies Remove="@(ResolvedFrameworkAssemblies)" />
-    <ResolvedFrameworkAssemblies Include="@(_OrigResolvedFrameworkAssemblies->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-
-    <_OrigResolvedAssemblies Remove="@(_OrigResolvedAssemblies)" />
-    <_OrigResolvedUserAssemblies Remove="@(_OrigResolvedUserAssemblies)" />
-    <_OrigResolvedFrameworkAssemblies Remove="@(_OrigResolvedFrameworkAssemblies)" />
-  </ItemGroup>
-</Target>
-
 <!-- _PrepareAssemblies lives in Microsoft.Android.Sdk.AssemblyResolution.targets -->
 
 <Target Name="_GetGenerateJavaStubsInputs" DependsOnTargets="_GenerateEnvironmentFiles">
@@ -1779,7 +1671,6 @@ because xbuild doesn't support framework reference assemblies.
       EnablePreloadAssembliesDefault="$(_AndroidEnablePreloadAssembliesDefault)"
       PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
       UseAssemblyStore="$(_AndroidUseAssemblyStore)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       CustomBundleConfigFile="$(AndroidBundleConfigurationFile)"
       AndroidRuntime="$(_AndroidRuntime)"
       ProjectRuntimeConfigFilePath="$(ProjectRuntimeConfigFilePath)"
@@ -1789,13 +1680,10 @@ because xbuild doesn't support framework reference assemblies.
 
   <GenerateNativeMarshalMethodSources
       AndroidRuntime="$(_AndroidRuntime)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
       MonoComponents="@(_MonoComponent)"
       EnvironmentOutputDirectory="$(IntermediateOutputPath)android"
-      IntermediateOutputDirectory="$(IntermediateOutputPath)"
       ResolvedAssemblies="@(_ResolvedAssemblies)"
-      SatelliteAssemblies="@(_AndroidResolvedSatellitePaths)"
       SupportedAbis="@(_BuildTargetAbis)">
   </GenerateNativeMarshalMethodSources>
 
@@ -3022,7 +2910,5 @@ because xbuild doesn't support framework reference assemblies.
 <!-- TypeMap imports must be last so their target overrides (e.g. _RemoveRegisterAttribute) take precedence -->
 <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.Android.Sdk.TypeMap.Trimmable.targets"
     Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' and '$(AndroidApplication)' == 'true' " />
-<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.Android.Sdk.TypeMap.LlvmIr.targets"
-    Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' " />
 
 </Project>
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index dd3c6b35f3d..803a2f87f2b 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -901,7 +901,7 @@ public void ActivityAliasRuns ([Values] bool isRelease, [Values (AndroidRuntime.
 		}
 
 		[Test]
-		public void NativeAssemblyCacheWithSatelliteAssemblies ([Values] bool enableMarshalMethods, [Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
+		public void NativeAssemblyCacheWithSatelliteAssemblies ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
 		{
 			const bool isRelease = true;
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
@@ -912,20 +912,6 @@ public void NativeAssemblyCacheWithSatelliteAssemblies ([Values] bool enableMars
 				Assert.Ignore ("NativeAOT doesn't support individual assemblies");
 			}
 
-			if (enableMarshalMethods && runtime == AndroidRuntime.CoreCLR) {
-				// This currently fails with the following exception:
-				//
-				// error XARMM7015: System.NotSupportedException: Writing mixed-mode assemblies is not supported
-				//  at Mono.Cecil.ModuleWriter.Write(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleWriter.WriteModule(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Mono.Cecil.AssemblyDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Xamarin.Android.Tasks.MarshalMethodsAssemblyRewriter.Rewrite(Boolean brokenExceptionTransitions) in src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs:line 165
-				//  at Xamarin.Android.Tasks.RewriteMarshalMethods.RewriteMethods(NativeCodeGenState state, Boolean brokenExceptionTransitionsEnabled) in src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs:line 160
-				Assert.Ignore ("CoreCLR: fails because of a Mono.Cecil lack of support");
-				return;
-			}
-
 			var path = Path.Combine ("temp", TestName);
 			var lib = new XamarinAndroidLibraryProject {
 				IsRelease = isRelease,
@@ -949,7 +935,6 @@ public void NativeAssemblyCacheWithSatelliteAssemblies ([Values] bool enableMars
 
 			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
-				EnableMarshalMethods = enableMarshalMethods,
 			};
 			proj.SetRuntime (runtime);
 			proj.References.Add (new BuildItem.ProjectReference ($"..\\{lib.ProjectName}\\{lib.ProjectName}.csproj", lib.ProjectName, lib.ProjectGuid));
diff --git a/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs b/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs
deleted file mode 100644
index ca817105d4d..00000000000
--- a/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using NUnit.Framework;
-using Xamarin.ProjectTools;
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Framework;
-using System.Text;
-using System.Xml.Linq;
-using System.Collections.Generic;
-using Xamarin.Android.Tasks;
-
-namespace Xamarin.Android.Build.Tests;
-
-[TestFixture]
-[Category ("UsesDevice")]
-[Category ("MayHang")]
-public class MarshalMethodsGCHangTests : DeviceTest
-{
-	static readonly string MarshalMethodsAppRuns_PermissionManifest = @"<?xml version=""1.0"" encoding=""utf-8""?>
-<manifest xmlns:android=""http://schemas.android.com/apk/res/android"" android:versionCode=""1"" android:versionName=""1.0"" package=""{0}"">
-        <uses-sdk />
-        <application android:label=""{0}"">
-        </application>
-        <uses-permission android:name=""android.permission.INTERNET"" />
-</manifest>";
-
-	static readonly string MarshalMethodsAppRuns_MainActivity = @"using Android.Media;
-
-namespace marshal2;
-
-[Activity (Label = ""@string/app_name"", MainLauncher = true)]
-public class MainActivity : Activity
-{
-	protected override void OnCreate (Bundle? savedInstanceState)
-	{
-		base.OnCreate (savedInstanceState);
-		SetContentView (Resource.Layout.Main);
-	}
-
-	protected override void OnStart ()
-	{
-		base.OnStart ();
-
-		try {
-			var mp = new MediaPlayer ();
-			mp.SetDataSource (new StreamMediaDataSource (new MemoryStream (new byte[65536])));
-			mp.Prepare ();
-		} catch (Java.IO.IOException) {
-			GC.Collect ();
-		}
-		Console.WriteLine (""XXX:OnStart done"");
-	}
-
-	class StreamMediaDataSource (System.IO.Stream data) : MediaDataSource
-	{
-		public override long Size => data.Length;
-
-		public override int ReadAt (long position, byte[]? buffer, int offset, int size)
-		{
-			try {
-				Console.WriteLine ($""XXX:START StreamMediaDataSource.ReadAt {position} {buffer} {buffer?.Length ?? 0} {offset} {size}"");
-
-				// Allocate enough to trigger GC
-				for (int i = 0; i < 1000; i++) {
-					_ = new byte[8192];
-				}
-
-				if (data.CanSeek) {
-					data.Seek (position, SeekOrigin.Begin);
-				}
-				return data.Read (buffer ?? [], offset, size);
-			} finally {
-				Console.WriteLine ($""XXX:END //StreamMediaDataSource.ReadAt {position} {buffer} {buffer?.Length ?? 0} {offset} {size}"");
-			}
-		}
-
-		public override void Close ()
-		{
-			data.Dispose ();
-			data = System.IO.Stream.Null;
-		}
-	}
-}
-";
-
-	[Test]
-	[Ignore ("Marshal methods are not yet working on CoreCLR: https://github.com/dotnet/android/issues/12206")]
-	public void MarshalMethodsAppRuns ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
-	{
-		const bool isRelease = true;
-		if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
-			return;
-		}
-
-		if (runtime == AndroidRuntime.NativeAOT) {
-			Assert.Ignore ("Not supported with NativeAOT");
-		}
-
-		var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime, "marshal2")) {
-			IsRelease = isRelease,
-			EnableMarshalMethods = true,
-			SupportedOSPlatformVersion = "24", // Minimum 24 to be able to test on Android 16
-			TrimModeRelease = TrimMode.Full,
-			ProjectName = "marshal2",
-		};
-		proj.SetRuntime (runtime);
-		proj.SetRuntimeIdentifiers (new[] { DeviceAbi });
-		proj.AndroidManifest = String.Format (MarshalMethodsAppRuns_PermissionManifest, proj.PackageName);
-		proj.MainActivity = MarshalMethodsAppRuns_MainActivity;
-		proj.SetDefaultTargetDevice ();
-		// TODO: AndroidEnableMarshalMethods and ReadyToRun do not work together
-		if (runtime == AndroidRuntime.CoreCLR) {
-			proj.SetProperty ("PublishReadyToRun", "false");
-		}
-
-		using var apkBuilder = CreateApkBuilder ();
-		Assert.True (apkBuilder.Install (proj), "Project should have installed.");
-		ClearAdbLogcat ();
-
-		const string expectedLogcatOutput = "XXX:OnStart done";
-		Assert.IsTrue (
-			MonitorAdbLogcat (
-				InstallAndRunTests.CreateLineChecker (expectedLogcatOutput),
-				logcatFilePath: Path.Combine (Root, apkBuilder.ProjectDirectory, "startup-logcat.log"),
-				timeout: 60,
-				onMonitoringStarted: () => StartActivityAndAssert (proj)
-			),
-			$"Output did not contain {expectedLogcatOutput}!"
-		);
-	}
-}
diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerRunner.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerRunner.cs
index 87e2f747157..dc89f267884 100644
--- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerRunner.cs
+++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerRunner.cs
@@ -45,15 +45,7 @@ public static (List<TypeMapEntry> entries, Dictionary<string, List<TypeMethodGro
 		);
 
 		var javaTypes = scanner.GetJavaTypes (assembly);
-		var (dataSets, _) = TypeMapCecilAdapter.GetDebugNativeEntries (
-			javaTypes, cache, needUniqueAssemblies: false
-		);
-
-		var entries = dataSets.JavaToManaged
-			.Select (e => new TypeMapEntry (e.JavaName, e.ManagedName, e.SkipInJavaToManaged))
-			.OrderBy (e => e.JavaName, StringComparer.Ordinal)
-			.ThenBy (e => e.ManagedName, StringComparer.Ordinal)
-			.ToList ();
+		var entries = GetLegacyEntries (javaTypes, cache);
 
 		var methodsByJavaName = new Dictionary<string, List<TypeMethodGroup>> ();
 		foreach (var typeDef in javaTypes) {
@@ -81,6 +73,17 @@ public static (List<TypeMapEntry> entries, Dictionary<string, List<TypeMethodGro
 		return (entries, methodsByJavaName);
 	}
 
+	public static List<TypeMapEntry> GetLegacyEntries (List<CecilTypeDefinition> javaTypes, TypeDefinitionCache cache) =>
+		javaTypes
+			.Select (type => new TypeMapEntry (
+				Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (type, cache),
+				GetManagedName (type),
+				type.IsInterface || type.HasGenericParameters
+			))
+			.OrderBy (entry => entry.JavaName, StringComparer.Ordinal)
+			.ThenBy (entry => entry.ManagedName, StringComparer.Ordinal)
+			.ToList ();
+
 	public static List<ConstructorEntry> RunLegacyConstructors (string assemblyPath, string managedTypeName)
 	{
 		var cache = new TypeDefinitionCache ();
diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/TypeDataBuilder.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/TypeDataBuilder.cs
index df1d24e1ea6..40cc56952f5 100644
--- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/TypeDataBuilder.cs
+++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/TypeDataBuilder.cs
@@ -53,15 +53,7 @@ public static (Dictionary<string, TypeComparisonData> perType, List<TypeMapEntry
 		);
 
 		var javaTypes = scanner.GetJavaTypes (assembly);
-		var (dataSets, _) = TypeMapCecilAdapter.GetDebugNativeEntries (
-			javaTypes, cache, needUniqueAssemblies: false
-		);
-
-		var entries = dataSets.JavaToManaged
-			.Select (e => new TypeMapEntry (e.JavaName, e.ManagedName, e.SkipInJavaToManaged))
-			.OrderBy (e => e.JavaName, StringComparer.Ordinal)
-			.ThenBy (e => e.ManagedName, StringComparer.Ordinal)
-			.ToList ();
+		var entries = ScannerRunner.GetLegacyEntries (javaTypes, cache);
 
 		var perType = new Dictionary<string, TypeComparisonData> (StringComparer.Ordinal);
 

From 68ed8d4111f2c523cd6a662890c9797726bd608d Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 08:44:15 +0200
Subject: [PATCH 04/58] Preserve library Java runtime jar selection

Use trimmable Java APIs for explicit library opt-ins without importing application type map targets, and retain the packaged CoreCLR/default jars for libraries without an implementation selection.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Xamarin.Android.Common.targets                            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index abeecad2ff6..18705bbb9c2 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1347,7 +1347,9 @@ because xbuild doesn't support framework reference assemblies.
      Trimmable jars replace JavaProxyObject/JavaProxyThrowable with non-native implementations. -->
 <Target Name="_CollectRuntimeJarFilenames">
   <PropertyGroup>
-    <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime_trimmable.jar</_RuntimeJar>
+    <_RuntimeJar Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">$(MSBuildThisFileDirectory)\java_runtime_trimmable.jar</_RuntimeJar>
+    <_RuntimeJar Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' and '$(_AndroidRuntime)' == 'CoreCLR' ">$(MSBuildThisFileDirectory)\java_runtime_clr.jar</_RuntimeJar>
+    <_RuntimeJar Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' and '$(_AndroidRuntime)' != 'CoreCLR' ">$(MSBuildThisFileDirectory)\java_runtime.jar</_RuntimeJar>
   </PropertyGroup>
 </Target>
 

From 3b17bb5701757eb89a41f65233671d9e08367ea2 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 11:05:24 +0200
Subject: [PATCH 05/58] Preserve shared CoreCLR post-trimming behavior

Restore the post-ILLink assembly pipeline, linker descriptors, and dependency dumps after removing the legacy typemap targets. Keep Debug legacy fixups disabled by default while retaining Release post-trim processing.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../building-apps/build-properties.md         |  6 ++--
 ...roid.Sdk.TypeMap.Trimmable.CoreCLR.targets | 33 +++++++++++++++++++
 .../Tasks/LinkerTests.cs                      |  6 ++--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/Documentation/docs-mobile/building-apps/build-properties.md b/Documentation/docs-mobile/building-apps/build-properties.md
index 5094917572c..ba231f57d5e 100644
--- a/Documentation/docs-mobile/building-apps/build-properties.md
+++ b/Documentation/docs-mobile/building-apps/build-properties.md
@@ -415,9 +415,9 @@ A boolean property that controls whether untrimmed builds modify referenced
 assemblies to support legacy binding and resource designer behavior. These
 modifications include adding missing abstract interface methods, updating
 legacy resource designer references, and inserting `GC.KeepAlive()` calls into
-older Xamarin.Android binding assemblies. Trimmed builds using the `trimmable`
-type map do not run these compatibility fixups, and setting this property to
-`True` does not enable them for trimmed builds.
+older Xamarin.Android binding assemblies. Trimmed builds run their post-trimming
+assembly fixups separately after ILLink; this property does not control those
+steps.
 
 The default value is `False` when
 [`$(AndroidTypeMapImplementation)`](#androidtypemapimplementation) is
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
index 5dd6a30bb97..dafb5b42938 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
@@ -3,6 +3,7 @@
 
   <UsingTask TaskName="Microsoft.Android.Tasks.GenerateMissingTypeMapStubs" AssemblyFile="$(_MicrosoftAndroidBuildTasksAssembly)" Runtime="NET" TaskFactory="TaskHostFactory" Condition=" '$(MSBuildRuntimeType)' == 'Full' " />
   <UsingTask TaskName="Microsoft.Android.Tasks.GenerateMissingTypeMapStubs" AssemblyFile="$(_MicrosoftAndroidBuildTasksAssembly)" Runtime="NET" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
+  <UsingTask TaskName="Xamarin.Android.Tasks.PostTrimmingPipeline" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
 
   <PropertyGroup>
     <_TrimmableRuntimeProviderJavaName Condition=" '$(_TrimmableRuntimeProviderJavaName)' == '' ">mono.MonoRuntimeProvider</_TrimmableRuntimeProviderJavaName>
@@ -30,7 +31,39 @@
       DependsOnTargets="_GenerateTrimmableTypeMap">
     <PropertyGroup>
       <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --typemap-entry-assembly "$(_TypeMapAssemblyName)"</_ExtraTrimmerArgs>
+      <_TrimmerDumpDependencies Condition=" '$(LinkerDumpDependencies)' == 'true' ">true</_TrimmerDumpDependencies>
     </PropertyGroup>
+    <ItemGroup>
+      <TrimmerRootDescriptor Include="@(LinkDescription)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_CollectPostTrimmingAssemblies"
+      Condition=" '$(PublishTrimmed)' == 'true' ">
+    <ItemGroup>
+      <_PostTrimmingAssembly Remove="@(_PostTrimmingAssembly)" />
+      <_PostTrimmingAssembly Include="@(ResolvedFileToPublish)"
+          Condition=" '%(Extension)' == '.dll' and '%(ResolvedFileToPublish.PostprocessAssembly)' == 'true' " />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_PostTrimmingPipeline"
+      AfterTargets="ILLink"
+      BeforeTargets="CreateReadyToRunImages"
+      DependsOnTargets="_CollectPostTrimmingAssemblies"
+      Condition=" '$(PublishTrimmed)' == 'true' and '$(RunILLink)' != 'false' "
+      Inputs="@(_PostTrimmingAssembly);$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects)"
+      Outputs="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp">
+    <PostTrimmingPipeline
+        Assemblies="@(_PostTrimmingAssembly)"
+        AddKeepAlives="$(AndroidAddKeepAlives)"
+        AndroidLinkResources="$(AndroidLinkResources)"
+        Deterministic="$(Deterministic)" />
+    <MakeDir Directories="$(_AndroidStampDirectory)" />
+    <Touch Files="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp" AlwaysCreate="true" />
+    <ItemGroup>
+      <FileWrites Include="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp" />
+    </ItemGroup>
   </Target>
 
   <Target Name="_PrepareLinkedAssembliesForProguard"
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
index 9c7c6647b7c..05d77b71239 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -507,14 +507,14 @@ static IEnumerable<object[]> Get_AndroidAddKeepAlivesData ()
 				// Debug configuration
 				AddTestData (isRelease: false, setAndroidAddKeepAlivesTrue: false, setLinkModeNone: false, shouldAddKeepAlives: false, runtime);
 
-				// Debug configuration, AndroidAddKeepAlives=true
-				AddTestData (isRelease: false, setAndroidAddKeepAlivesTrue: true,  setLinkModeNone: false, shouldAddKeepAlives: true,  runtime);
+				// The default trimmable path does not run legacy assembly fixups.
+				AddTestData (isRelease: false, setAndroidAddKeepAlivesTrue: true,  setLinkModeNone: false, shouldAddKeepAlives: false, runtime);
 
 				// Release configuration
 				AddTestData (isRelease: true,  setAndroidAddKeepAlivesTrue: false, setLinkModeNone: false, shouldAddKeepAlives: true,  runtime);
 
 				// Release configuration, AndroidLinkMode=None
-				AddTestData (isRelease: true,  setAndroidAddKeepAlivesTrue: false, setLinkModeNone: true,  shouldAddKeepAlives: true,  runtime);
+				AddTestData (isRelease: true,  setAndroidAddKeepAlivesTrue: false, setLinkModeNone: true,  shouldAddKeepAlives: false, runtime);
 			}
 
 			AddTestData (isRelease: false, setAndroidAddKeepAlivesTrue: true, setLinkModeNone: false,

From f320eadf5c9434bed3cad7ade08399ed7879c56b Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 11:17:41 +0200
Subject: [PATCH 06/58] Simplify default trimmable KeepAlives test matrix

Exercise the default implementation without redundant explicit typemap settings and retain explicit legacy-fixup opt-in coverage.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Tasks/LinkerTests.cs                      | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
index 05d77b71239..392e5f7fa42 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -518,16 +518,13 @@ static IEnumerable<object[]> Get_AndroidAddKeepAlivesData ()
 			}
 
 			AddTestData (isRelease: false, setAndroidAddKeepAlivesTrue: true, setLinkModeNone: false,
-				shouldAddKeepAlives: false, AndroidRuntime.CoreCLR, typeMapImplementation: "trimmable");
-			AddTestData (isRelease: false, setAndroidAddKeepAlivesTrue: true, setLinkModeNone: false,
-				shouldAddKeepAlives: true, AndroidRuntime.CoreCLR, typeMapImplementation: "trimmable",
+				shouldAddKeepAlives: true, AndroidRuntime.CoreCLR,
 				enableLegacyCompatibilityAssemblyFixups: true);
 
 			return ret;
 
 			void AddTestData (bool isRelease, bool setAndroidAddKeepAlivesTrue, bool setLinkModeNone,
-				bool shouldAddKeepAlives, AndroidRuntime runtime, string? typeMapImplementation = null,
-				bool enableLegacyCompatibilityAssemblyFixups = false)
+				bool shouldAddKeepAlives, AndroidRuntime runtime, bool enableLegacyCompatibilityAssemblyFixups = false)
 			{
 				ret.Add (new object[] {
 					isRelease,
@@ -535,7 +532,6 @@ void AddTestData (bool isRelease, bool setAndroidAddKeepAlivesTrue, bool setLink
 					setLinkModeNone,
 					shouldAddKeepAlives,
 					runtime,
-					typeMapImplementation,
 					enableLegacyCompatibilityAssemblyFixups,
 				});
 			}
@@ -544,8 +540,7 @@ void AddTestData (bool isRelease, bool setAndroidAddKeepAlivesTrue, bool setLink
 		[Test]
 		[TestCaseSource (nameof (Get_AndroidAddKeepAlivesData))]
 		public void AndroidAddKeepAlives (bool isRelease, bool setAndroidAddKeepAlivesTrue, bool setLinkModeNone,
-			bool shouldAddKeepAlives, AndroidRuntime runtime, string? typeMapImplementation,
-			bool enableLegacyCompatibilityAssemblyFixups)
+			bool shouldAddKeepAlives, AndroidRuntime runtime, bool enableLegacyCompatibilityAssemblyFixups)
 		{
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
 				return;
@@ -555,22 +550,6 @@ public void AndroidAddKeepAlives (bool isRelease, bool setAndroidAddKeepAlivesTr
 				return;
 			}
 
-			if (runtime == AndroidRuntime.CoreCLR && isRelease && !setAndroidAddKeepAlivesTrue && setLinkModeNone && shouldAddKeepAlives) {
-				// This currently fails with the following exception:
-				//
-				// error XALNS7015: System.NotSupportedException: Writing mixed-mode assemblies is not supported
-				//  at Mono.Cecil.ModuleWriter.Write(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleWriter.WriteModule(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Mono.Cecil.AssemblyDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Xamarin.Android.Tasks.SaveChangedAssemblyStep.ProcessAssembly(AssemblyDefinition assembly, StepContext context) in src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs:line 197
-				//  at Xamarin.Android.Tasks.AssemblyPipeline.Run(AssemblyDefinition assembly, StepContext context) in src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs:line 26
-				//  at Xamarin.Android.Tasks.AssemblyModifierPipeline.RunPipeline(AssemblyPipeline pipeline, ITaskItem source, ITaskItem destination) in src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs:line 175
-				//  at Xamarin.Android.Tasks.AssemblyModifierPipeline.RunTask() in src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs:line 123
-				Assert.Ignore ("CoreCLR: fails because of a Mono.Cecil lack of support");
-				return;
-			};
-
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
 				OtherBuildItems = {
@@ -602,8 +581,6 @@ public unsafe bool MyMethod (Android.OS.IBinder windowToken, [global::Android.Ru
 
 			proj.SetRuntime (runtime);
 			proj.SetProperty ("AllowUnsafeBlocks", "True");
-			if (!typeMapImplementation.IsNullOrEmpty ())
-				proj.SetProperty ("AndroidTypeMapImplementation", typeMapImplementation);
 
 			// We don't want `[TargetPlatform ("android35")]` to get set because we don't do AddKeepAlives on .NET for Android assemblies
 			proj.SetProperty ("GenerateAssemblyInfo", "False");

From c817170f57594f7372dfddf42136caec945e19a8 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 14:06:50 +0200
Subject: [PATCH 07/58] Test managed typemap updates during fast deployment

Check generated managed mappings and Java sources instead of native typemap compilation while preserving APK reinstall and device behavior checks.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Tests/FastDevTest.cs                      | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/FastDevTest.cs b/tests/MSBuildDeviceIntegration/Tests/FastDevTest.cs
index e3f31352934..4f3b85dacc2 100644
--- a/tests/MSBuildDeviceIntegration/Tests/FastDevTest.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/FastDevTest.cs
@@ -48,15 +48,13 @@ public void FastDeployUpdatesTypeMapAfterAssemblyEdit ()
 			};
 			proj.SetDefaultTargetDevice ();
 
-			// Fast deployment only syncs managed assemblies, so anything that changes the set of
-			// Java-callable types has to go through a new .apk: new Java stubs, a new .dex, a new
-			// type map inside libxamarin-app.so, and therefore a new signed package.
+			// A new Java-callable type changes the managed type map and Java sources. Its new
+			// class must be compiled into the DEX and installed with a new signed package.
 			var typeMapTargets = new [] {
+				"_GenerateTrimmableTypeMap",
 				"_GenerateJavaStubs",
 				"_CompileJava",
 				"_CompileToDalvik",
-				"_CompileNativeAssemblySources",
-				"_CreateApplicationSharedLibraries",
 				"_BuildApkFastDev",
 				"_Sign",
 			};
@@ -69,6 +67,9 @@ public void FastDeployUpdatesTypeMapAfterAssemblyEdit ()
 			Assert.IsTrue (builder.Install (proj), "Initial install should have succeeded.");
 			Assert.IsTrue (builder.Output.IsApkInstalled, "The .apk should have been installed by the initial build.");
 			AssertActivityStarts ("MainActivity", "initial-launch.log");
+			var typeMapAssembly = builder.Output.GetIntermediaryPath (Path.Combine ("typemap", "_UnnamedProject.TypeMap.dll"));
+			FileAssert.Exists (typeMapAssembly, "Initial build should generate the managed application type map.");
+			byte [] originalTypeMap = File.ReadAllBytes (typeMapAssembly);
 
 			// 2. A C#-only change that adds a new Java-callable type, so the type map *must* be updated.
 			proj.MainActivity = proj.DefaultMainActivity
@@ -91,17 +92,26 @@ protected override void OnCreate (Bundle bundle)
 			foreach (var target in typeMapTargets) {
 				builder.Output.AssertTargetIsNotSkipped (target, occurrence: 2);
 			}
+			FileAssert.Exists (typeMapAssembly, "New activity should regenerate the managed application type map.");
+			byte [] updatedTypeMap = File.ReadAllBytes (typeMapAssembly);
+			Assert.IsFalse (originalTypeMap.SequenceEqual (updatedTypeMap), "Adding a Java-callable activity should change the managed type map.");
+			string javaSourceDirectory = builder.Output.GetIntermediaryPath (Path.Combine ("typemap", "java"));
+			Assert.AreEqual (1, Directory.GetFiles (javaSourceDirectory, "SecondActivity.java", SearchOption.AllDirectories).Length,
+				"Adding a Java-callable activity should generate its Java source.");
 			Assert.IsTrue (builder.Output.IsApkInstalled, "The .apk should have been reinstalled after adding a new activity.");
 			AssertActivityStarts ("SecondActivity", "new-activity-launch.log");
 
-			// 3. A C#-only change that leaves the Java-callable types alone. The type map is unchanged,
-			// so the .apk is neither rebuilt nor reinstalled and only the assembly is fast deployed.
+			// 3. A C#-only change that leaves the Java-callable types alone keeps the managed
+			// type map and DEX unchanged; only the updated assembly is fast deployed.
 			proj.MainActivity = proj.MainActivity.Replace ("//${SECOND_ACTIVITY_ONCREATE}", $"Console.WriteLine (\"{logcatMessage}\");");
 			proj.Touch ("MainActivity.cs");
 			Assert.IsTrue (builder.Install (proj, doNotCleanupOnUpdate: true, saveProject: false), "Incremental install should have succeeded.");
 
 			builder.Output.AssertTargetIsNotSkipped ("CoreCompile", occurrence: 3);
-			foreach (var target in new [] { "_CompileNativeAssemblySources", "_CreateApplicationSharedLibraries", "_BuildApkFastDev", "_Sign" }) {
+			builder.Output.AssertTargetIsNotSkipped ("_GenerateTrimmableTypeMap", occurrence: 3);
+			CollectionAssert.AreEqual (updatedTypeMap, File.ReadAllBytes (typeMapAssembly),
+				"A method-body edit should not change the managed type map.");
+			foreach (var target in new [] { "_CompileJava", "_CompileToDalvik", "_BuildApkFastDev", "_Sign" }) {
 				builder.Output.AssertTargetIsSkipped (target, occurrence: 3);
 			}
 			Assert.IsFalse (builder.Output.IsApkInstalled, "The .apk should not be reinstalled for a C#-only change.");

From 576764b7d90dd3890a5738b11814f3196aedaf01 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 14:17:18 +0200
Subject: [PATCH 08/58] Initialize CoreCLR post-trim property defaults in inner
 builds

Run the existing properties-cache target before post-trimming so per-RID builds see the Release AndroidAddKeepAlives default when rewriting linked assemblies.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
index dafb5b42938..0ae0ec132e8 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
@@ -50,7 +50,7 @@
   <Target Name="_PostTrimmingPipeline"
       AfterTargets="ILLink"
       BeforeTargets="CreateReadyToRunImages"
-      DependsOnTargets="_CollectPostTrimmingAssemblies"
+      DependsOnTargets="_CreatePropertiesCache;_CollectPostTrimmingAssemblies"
       Condition=" '$(PublishTrimmed)' == 'true' and '$(RunILLink)' != 'false' "
       Inputs="@(_PostTrimmingAssembly);$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects)"
       Outputs="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp">

From bc8e581a7152bf857422db51b6e136c81ddc0bdc Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 16:25:47 +0200
Subject: [PATCH 09/58] Gate legacy abstract-method fixups after trimming

Use the existing compatibility switch to avoid resolving a trimmed AbstractMethodError constructor while retaining AppDomain diagnostics and independent post-trim steps. Cover the disabled path with a Cecil assembly test.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../PostTrimmingFixAbstractMethodsStep.cs     | 12 +++--
 ...roid.Sdk.TypeMap.Trimmable.CoreCLR.targets |  3 +-
 .../Tasks/PostTrimmingPipeline.cs             | 10 ++--
 .../Tasks/LinkerTests.cs                      | 46 +++++++++++++++++++
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/PostTrimmingFixAbstractMethodsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/PostTrimmingFixAbstractMethodsStep.cs
index dbf3f3853e4..565a6cb4442 100644
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/PostTrimmingFixAbstractMethodsStep.cs
+++ b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/PostTrimmingFixAbstractMethodsStep.cs
@@ -10,23 +10,25 @@ namespace MonoDroid.Tuner;
 
 /// <summary>
 /// Post-trimming version of FixAbstractMethodsStep that delegates to the core logic
-/// in <see cref="FixAbstractMethodsStep"/>. Skips framework assemblies, checks for
-/// AppDomain.CreateDomain usage, and fixes missing abstract method implementations
-/// on Java.Lang.Object subclasses.
+/// in <see cref="FixAbstractMethodsStep"/>. Skips framework assemblies and checks for
+/// AppDomain.CreateDomain usage; legacy builds also fix missing abstract methods.
 /// </summary>
 class PostTrimmingFixAbstractMethodsStep : IAssemblyModifierPipelineStep
 {
 	readonly FixAbstractMethodsStep _step;
 	readonly Action<string> _warn;
+	readonly bool _enableLegacyCompatibilityAssemblyFixups;
 
 	public PostTrimmingFixAbstractMethodsStep (
 		IMetadataResolver cache,
 		Func<AssemblyDefinition?> getMonoAndroidAssembly,
 		Action<string> logMessage,
-		Action<string> warn)
+		Action<string> warn,
+		bool enableLegacyCompatibilityAssemblyFixups)
 	{
 		_step = new FixAbstractMethodsStep (cache, getMonoAndroidAssembly, logMessage);
 		_warn = warn;
+		_enableLegacyCompatibilityAssemblyFixups = enableLegacyCompatibilityAssemblyFixups;
 	}
 
 	public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
@@ -36,7 +38,7 @@ public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
 
 		_step.CheckAppDomainUsage (assembly, _warn);
 
-		if (!assembly.MainModule.HasTypeReference ("Java.Lang.Object"))
+		if (!_enableLegacyCompatibilityAssemblyFixups || !assembly.MainModule.HasTypeReference ("Java.Lang.Object"))
 			return;
 
 		context.IsAssemblyModified |= _step.FixAbstractMethods (assembly);
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
index 0ae0ec132e8..9b966f4b7e8 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
@@ -58,7 +58,8 @@
         Assemblies="@(_PostTrimmingAssembly)"
         AddKeepAlives="$(AndroidAddKeepAlives)"
         AndroidLinkResources="$(AndroidLinkResources)"
-        Deterministic="$(Deterministic)" />
+        Deterministic="$(Deterministic)"
+        EnableLegacyCompatibilityAssemblyFixups="$(AndroidEnableLegacyCompatibilityAssemblyFixups)" />
     <MakeDir Directories="$(_AndroidStampDirectory)" />
     <Touch Files="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp" AlwaysCreate="true" />
     <ItemGroup>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PostTrimmingPipeline.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PostTrimmingPipeline.cs
index fa3c3385737..30f6ac65759 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/PostTrimmingPipeline.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/PostTrimmingPipeline.cs
@@ -16,7 +16,7 @@ namespace Xamarin.Android.Tasks;
 /// This opens each assembly once (via DirectoryAssemblyResolver with ReadWrite) and
 /// runs all registered steps on it, then writes modified assemblies in-place. Currently
 /// runs CheckForObsoletePreserveAttributeStep, StripEmbeddedLibrariesStep and
-/// (optionally) AddKeepAlivesStep.
+/// (optionally) AddKeepAlivesStep and legacy abstract-method fixups.
 ///
 /// Runs in the inner build after ILLink but before ReadyToRun/crossgen2 compilation,
 /// so that R2R images are generated from the already-modified assemblies.
@@ -34,6 +34,8 @@ public class PostTrimmingPipeline : AndroidTask
 
 	public bool Deterministic { get; set; }
 
+	public bool EnableLegacyCompatibilityAssemblyFixups { get; set; } = true;
+
 	public override bool RunTask ()
 	{
 		using var resolver = new DirectoryAssemblyResolver (
@@ -66,8 +68,7 @@ public override bool RunTask ()
 			steps.Add (new RemoveResourceDesignerStep (allAssemblies, (msg) => Log.LogDebugMessage (msg)));
 		}
 
-		// FixAbstractMethods — resolve Mono.Android once up front. If resolution fails, log
-		// the error and skip running the fix step entirely to avoid later unhandled exceptions.
+		// Resolve Mono.Android once for AppDomain warnings and optional legacy abstract-method fixups.
 		AssemblyDefinition? monoAndroidAssembly = null;
 		try {
 			monoAndroidAssembly = resolver.Resolve (AssemblyNameReference.Parse ("Mono.Android"));
@@ -78,7 +79,8 @@ public override bool RunTask ()
 			steps.Add (new PostTrimmingFixAbstractMethodsStep (cache,
 				() => monoAndroidAssembly,
 				(msg) => Log.LogDebugMessage (msg),
-				(msg) => Log.LogCodedWarning ("XA2000", msg)));
+				(msg) => Log.LogCodedWarning ("XA2000", msg),
+				EnableLegacyCompatibilityAssemblyFixups));
 		}
 
 		if (AddKeepAlives) {
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
index 392e5f7fa42..2301fe2f39e 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Text.Json;
 using Java.Interop.Tools.Cecil;
+using Microsoft.Build.Utilities;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Linker;
@@ -55,6 +56,51 @@ public void BuildPipelineForTest (AssemblyPipeline pipeline, MSBuildLinkContext
 				BuildPipeline (pipeline, context);
 		}
 
+		[Test]
+		public void PostTrimmingSkipsLegacyAbstractFixupsButWarnsAboutAppDomain ()
+		{
+			var path = Path.Combine (Root, "temp", TestName);
+			Directory.CreateDirectory (path);
+			var assemblyPath = Path.Combine (path, "LegacyApp.dll");
+			using (var monoAndroid = CreateFauxMonoAndroidAssembly ()) {
+				CreateAbstractIfaceImplementation (assemblyPath, monoAndroid);
+			}
+
+			using (var assembly = AssemblyDefinition.ReadAssembly (assemblyPath, new ReaderParameters { InMemory = true })) {
+				var createDomain = typeof (AppDomain).GetMethod ("CreateDomain", new [] { typeof (string) });
+				if (createDomain is null)
+					throw new InvalidOperationException ("System.AppDomain.CreateDomain(string) not found.");
+
+				var module = assembly.MainModule;
+				var method = new MethodDefinition ("CreateAppDomain", MethodAttributes.Public | MethodAttributes.Static, module.TypeSystem.Void);
+				method.Body.Instructions.Add (Instruction.Create (OpCodes.Ldstr, "example"));
+				method.Body.Instructions.Add (Instruction.Create (OpCodes.Call, module.ImportReference (createDomain)));
+				method.Body.Instructions.Add (Instruction.Create (OpCodes.Pop));
+				method.Body.Instructions.Add (Instruction.Create (OpCodes.Ret));
+				module.GetType ("MyNamespace.MyClass").Methods.Add (method);
+				assembly.Write (assemblyPath);
+			}
+
+			using (var assembly = AssemblyDefinition.ReadAssembly (assemblyPath)) {
+				var warnings = new List<string> ();
+				var step = new PostTrimmingFixAbstractMethodsStep (
+					new TypeDefinitionCache (),
+					() => throw new InvalidOperationException ("Legacy abstract-method fixup should not run."),
+					_ => {},
+					warnings.Add,
+					enableLegacyCompatibilityAssemblyFixups: false);
+				var item = new TaskItem (assemblyPath);
+				var context = new StepContext (item, item);
+				step.ProcessAssembly (assembly, context);
+
+				Assert.IsFalse (context.IsAssemblyModified);
+				Assert.IsFalse (assembly.MainModule.GetType ("MyNamespace.MyClass").Methods.Any (m => m.Name == "MyMissingMethod"));
+				Assert.That (warnings, Has.Count.EqualTo (1));
+				StringAssert.Contains ("AppDomain.CreateDomain()", warnings [0]);
+			}
+			Directory.Delete (path, true);
+		}
+
 		[TestCase (false)]
 		[TestCase (true)]
 		public void RuntimeEventSourceFeatureSwitch (bool enabled)

From 28008f481adf4f0f8a4a50bd39546b6cc648e5ff Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 11:14:17 +0200
Subject: [PATCH 10/58] Rebaseline trimmable release APKs and manifest error
 assertion

Match three measured CI 1610334 CoreCLR APK descriptions after managed type maps replace legacy native/Java output. Preserve per-entry and package-size regression thresholds; the generated simple APK still contains its launcher and runtime provider. Assert the coded AMM0000 error and explanation without depending on manifest component order.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../ManifestTest.cs                            | 12 ++----------
 ...ReleaseArm64SimpleDotNet.CoreCLR.R8.apkdesc | 16 ++++++++--------
 ...ildReleaseArm64SimpleDotNet.CoreCLR.apkdesc | 16 ++++++++--------
 ...ReleaseArm64XFormsDotNet.CoreCLR.R8.apkdesc | 18 +++++++++---------
 4 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
index 38fcb75ff2a..8a57d79a7e6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
@@ -1226,16 +1226,8 @@ public void ExportedErrorMessage ([Values (AndroidRuntime.CoreCLR, AndroidRuntim
 			using var b = CreateDllBuilder ();
 			b.ThrowOnBuildFailure = false;
 			Assert.IsFalse (b.Build (proj), "Build should have failed");
-			var extension = IsWindows ? ".exe" : "";
-			if (runtime == AndroidRuntime.NativeAOT) {
-				// The trimmable manifest generator emits the merged components in a different
-				// (but valid) order than the legacy path, so the offending <service> lands on a
-				// different manifest line. Assert the coded AMM0000 error itself rather than the
-				// exact line/column, which is an implementation detail of the manifest layout.
-				Assert.IsTrue (b.LastBuildOutput.ContainsText ($"java{extension} error AMM0000:"), "Should receive AMM0000 error");
-			} else {
-				Assert.IsTrue (b.LastBuildOutput.ContainsText ($"AndroidManifest.xml(12,5): java{extension} error AMM0000:"), "Should receive AMM0000 error");
-			}
+			// The trimmable manifest generator can change the component order and error location.
+			Assert.IsTrue (b.LastBuildOutput.ContainsText ("error AMM0000:"), "Should receive AMM0000 error");
 			Assert.IsTrue (b.LastBuildOutput.ContainsText ("Apps targeting Android 12 and higher are required to specify an explicit value for `android:exported`"), "Should receive AMM0000 error");
 		}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.R8.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.R8.apkdesc
index 0858d068f11..2da995c8092 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.R8.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.R8.apkdesc
@@ -2,22 +2,22 @@
   "Comment": null,
   "Entries": {
     "AndroidManifest.xml": {
-      "Size": 3036
+      "Size": 2964
     },
     "classes.dex": {
-      "Size": 382236
+      "Size": 19668
     },
     "lib/arm64-v8a/libassembly-store.so": {
-      "Size": 2529368
+      "Size": 2405160
     },
     "lib/arm64-v8a/libclrjit.so": {
-      "Size": 2818032
+      "Size": 2819768
     },
     "lib/arm64-v8a/libcoreclr.so": {
-      "Size": 4844000
+      "Size": 4844368
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 188600
+      "Size": 187944
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 72432
@@ -32,7 +32,7 @@
       "Size": 171584
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 20432
+      "Size": 11664
     },
     "res/drawable-hdpi-v4/icon.png": {
       "Size": 2178
@@ -59,5 +59,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 6743483
+  "PackageSize": 6538683
 }
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc
index d2e84ee410e..bfabae9a12e 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc
@@ -2,22 +2,22 @@
   "Comment": null,
   "Entries": {
     "AndroidManifest.xml": {
-      "Size": 3036
+      "Size": 2964
     },
     "classes.dex": {
-      "Size": 405040
+      "Size": 22252
     },
     "lib/arm64-v8a/libassembly-store.so": {
-      "Size": 2529336
+      "Size": 2405168
     },
     "lib/arm64-v8a/libclrjit.so": {
-      "Size": 2818032
+      "Size": 2819768
     },
     "lib/arm64-v8a/libcoreclr.so": {
-      "Size": 4844000
+      "Size": 4844368
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 188600
+      "Size": 187944
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 72432
@@ -32,7 +32,7 @@
       "Size": 171584
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 20432
+      "Size": 11664
     },
     "res/drawable-hdpi-v4/icon.png": {
       "Size": 2178
@@ -59,5 +59,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 6751675
+  "PackageSize": 6542779
 }
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.R8.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.R8.apkdesc
index de61cb7ae8c..93e7cff7cb9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.R8.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.R8.apkdesc
@@ -2,10 +2,10 @@
   "Comment": null,
   "Entries": {
     "AndroidManifest.xml": {
-      "Size": 6652
+      "Size": 6768
     },
     "classes.dex": {
-      "Size": 2794592
+      "Size": 2490012
     },
     "kotlin/annotation/annotation.kotlin_builtins": {
       "Size": 928
@@ -29,16 +29,16 @@
       "Size": 2396
     },
     "lib/arm64-v8a/libassembly-store.so": {
-      "Size": 9457592
+      "Size": 9836600
     },
     "lib/arm64-v8a/libclrjit.so": {
-      "Size": 2818048
+      "Size": 2819768
     },
     "lib/arm64-v8a/libcoreclr.so": {
-      "Size": 4843824
+      "Size": 4844368
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 196760
+      "Size": 187944
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 72432
@@ -53,7 +53,7 @@
       "Size": 171584
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 119784
+      "Size": 13064
     },
     "META-INF/androidx.activity_activity.version": {
       "Size": 6
@@ -1901,7 +1901,7 @@
       "Size": 496
     },
     "res/layout/flyoutcontent.xml": {
-      "Size": 776
+      "Size": 780
     },
     "res/layout/image_frame.xml": {
       "Size": 1088
@@ -2210,5 +2210,5 @@
       "Size": 794696
     }
   },
-  "PackageSize": 15821708
+  "PackageSize": 16108428
 }
\ No newline at end of file

From 6f3cba092744430177ab244aa7afa340c34b6f8a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 11:23:19 +0200
Subject: [PATCH 11/58] Rebaseline single-DEX trimmable Xamarin.Forms APK

CI 1610334's CoreCLR XForms release APK places the previously separate classes2.dex content in classes.dex. Match the measured APK description so apkdiff continues checking per-file and package size instead of aborting on the removed classes2.dex key. The APK still contains MainActivity, FormsViewGroup, and MonoRuntimeProvider.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ...ldReleaseArm64XFormsDotNet.CoreCLR.apkdesc | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc
index 49dedb83b32..a534c46c7c9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc
@@ -2,13 +2,10 @@
   "Comment": null,
   "Entries": {
     "AndroidManifest.xml": {
-      "Size": 6652
+      "Size": 6768
     },
     "classes.dex": {
-      "Size": 9449044
-    },
-    "classes2.dex": {
-      "Size": 85024
+      "Size": 9090932
     },
     "kotlin/annotation/annotation.kotlin_builtins": {
       "Size": 928
@@ -32,16 +29,16 @@
       "Size": 2396
     },
     "lib/arm64-v8a/libassembly-store.so": {
-      "Size": 9457608
+      "Size": 9836592
     },
     "lib/arm64-v8a/libclrjit.so": {
-      "Size": 2818048
+      "Size": 2819768
     },
     "lib/arm64-v8a/libcoreclr.so": {
-      "Size": 4843824
+      "Size": 4844368
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 196760
+      "Size": 187944
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 72432
@@ -56,7 +53,7 @@
       "Size": 171584
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 119784
+      "Size": 13064
     },
     "META-INF/androidx.activity_activity.version": {
       "Size": 6
@@ -1904,7 +1901,7 @@
       "Size": 496
     },
     "res/layout/flyoutcontent.xml": {
-      "Size": 776
+      "Size": 780
     },
     "res/layout/image_frame.xml": {
       "Size": 1088
@@ -2213,5 +2210,5 @@
       "Size": 794696
     }
   },
-  "PackageSize": 18209734
+  "PackageSize": 18447244
 }
\ No newline at end of file

From 7fda946709ea8918f3be99aa6c89e59bf81c2edf Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:34:34 +0200
Subject: [PATCH 12/58] Restore CoreCLR remote-process provider generation

Keep generating additional Java runtime providers for trimmable CoreCLR apps after removing the legacy GenerateAdditionalProviderSources task. Register a dedicated task and track generated Java files for incremental Clean.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ...soft.Android.Sdk.TypeMap.Trimmable.targets |  9 +++++++
 .../GenerateCoreClrRuntimeProviderSources.cs  | 22 ++++++++++++++++
 ...erateCoreClrRuntimeProviderSourcesTests.cs | 25 +++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateCoreClrRuntimeProviderSources.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCoreClrRuntimeProviderSourcesTests.cs

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
index 30c4a2fc948..3618848a07f 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
@@ -5,6 +5,7 @@
   <UsingTask TaskName="Microsoft.Android.Tasks.GenerateTrimmableTypeMap" AssemblyFile="$(_MicrosoftAndroidBuildTasksAssembly)" Runtime="NET" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
   <UsingTask TaskName="Xamarin.Android.Tasks.GenerateEmptyTypemapStub" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
   <UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeAotBootstrapSources" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
+  <UsingTask TaskName="Xamarin.Android.Tasks.GenerateCoreClrRuntimeProviderSources" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
   <UsingTask TaskName="Xamarin.Android.Tasks.GenerateProguardConfiguration" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
 
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets"
@@ -295,6 +296,7 @@
       <FileWrites Include="$(IntermediateOutputPath)AndroidManifest.xml" Condition="Exists('$(IntermediateOutputPath)AndroidManifest.xml')" />
       <FileWrites Include="$(IntermediateOutputPath)acw-map.txt" Condition="Exists('$(IntermediateOutputPath)acw-map.txt')" />
       <FileWrites Include="$(IntermediateOutputPath)android/src/net/dot/android/ApplicationRegistration.java" Condition="Exists('$(IntermediateOutputPath)android/src/net/dot/android/ApplicationRegistration.java')" />
+      <FileWrites Include="$(IntermediateOutputPath)android/src/mono/MonoRuntimeProvider_*.java" />
     </ItemGroup>
   </Target>
 
@@ -460,6 +462,11 @@
         AdditionalProviderSources="@(_AdditionalProviderSources)"
         EnableSGenConcurrent="$(AndroidEnableSGenConcurrent)" />
 
+    <GenerateCoreClrRuntimeProviderSources
+        Condition=" '$(_AndroidRuntime)' == 'CoreCLR' and '@(_AdditionalProviderSources->Count())' != '0' "
+        OutputDirectory="$(IntermediateOutputPath)android"
+        AdditionalProviderSources="@(_AdditionalProviderSources)" />
+
     <!-- Copy generated manifest to expected location -->
     <Copy SourceFiles="$(_TypeMapBaseOutputDir)AndroidManifest.xml"
         DestinationFiles="$(IntermediateOutputPath)AndroidManifest.xml"
@@ -487,6 +494,8 @@
       <FileWrites Include="$(IntermediateOutputPath)android\AndroidManifest.xml"
           Condition=" '$(AndroidManifestMerger)' != 'manifestmerger.jar' " />
       <FileWrites Include="$(IntermediateOutputPath)acw-map.txt" />
+      <FileWrites Include="@(_AdditionalProviderSources->'$(IntermediateOutputPath)android/src/mono/%(Identity).java')"
+          Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " />
     </ItemGroup>
 
     <MakeDir Directories="$(_AndroidStampDirectory)" Condition=" !Exists('$(_AndroidStampDirectory)') " />
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCoreClrRuntimeProviderSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCoreClrRuntimeProviderSources.cs
new file mode 100644
index 00000000000..bd5d447f8b8
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCoreClrRuntimeProviderSources.cs
@@ -0,0 +1,22 @@
+#nullable enable
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
+
+namespace Xamarin.Android.Tasks;
+
+public sealed class GenerateCoreClrRuntimeProviderSources : AndroidTask
+{
+	public override string TaskPrefix => "GCRP";
+
+	[Required]
+	public string [] AdditionalProviderSources { get; set; } = [];
+
+	[Required]
+	public string OutputDirectory { get; set; } = "";
+
+	public override bool RunTask ()
+	{
+		GenerateAdditionalProviderSources.WriteAdditionalRuntimeProviderSources (OutputDirectory, isCoreCLR: true, AdditionalProviderSources);
+		return !Log.HasLoggedErrors;
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCoreClrRuntimeProviderSourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCoreClrRuntimeProviderSourcesTests.cs
new file mode 100644
index 00000000000..0ceb33de209
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCoreClrRuntimeProviderSourcesTests.cs
@@ -0,0 +1,25 @@
+using System.IO;
+using NUnit.Framework;
+using Xamarin.Android.Tasks;
+
+namespace Xamarin.Android.Build.Tests;
+
+[TestFixture]
+public class GenerateCoreClrRuntimeProviderSourcesTests : BaseTest
+{
+	[Test]
+	public void GeneratesAdditionalProcessProvider ()
+	{
+		var outputDirectory = Path.Combine (Root, "temp", TestName, "android");
+		var task = new GenerateCoreClrRuntimeProviderSources {
+			BuildEngine = new MockBuildEngine (TestContext.Out),
+			AdditionalProviderSources = ["MonoRuntimeProvider_1"],
+			OutputDirectory = outputDirectory,
+		};
+
+		Assert.IsTrue (task.Execute (), "The additional provider should be generated.");
+		var provider = Path.Combine (outputDirectory, "src", "mono", "MonoRuntimeProvider_1.java");
+		FileAssert.Exists (provider);
+		StringAssert.Contains ("class MonoRuntimeProvider_1", File.ReadAllText (provider));
+	}
+}

From bc41f8a6ba9b11e5cbdf3c9575958a34edc83b93 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:37:23 +0200
Subject: [PATCH 13/58] Restore pre-ILLink abstract-method compatibility copies

Run FixAbstractMethods on project-local assembly copies before ILLink so legacy binding interface implementations are valid and AbstractMethodError stays rooted. Swap modified RFP items while preserving metadata, avoid stale DLL/PDB timestamps and outputs, and cover old/new binding resolution without re-enabling posttrim injection.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ...roid.Sdk.TypeMap.Trimmable.CoreCLR.targets |  65 ++++++
 .../Tasks/PreTrimmingFixAbstractMethods.cs    | 110 ++++++++++
 .../Tasks/LinkerTests.cs                      | 193 +++++++++++++++++-
 3 files changed, 366 insertions(+), 2 deletions(-)
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixAbstractMethods.cs

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
index 9b966f4b7e8..ae9709150c0 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
@@ -3,12 +3,77 @@
 
   <UsingTask TaskName="Microsoft.Android.Tasks.GenerateMissingTypeMapStubs" AssemblyFile="$(_MicrosoftAndroidBuildTasksAssembly)" Runtime="NET" TaskFactory="TaskHostFactory" Condition=" '$(MSBuildRuntimeType)' == 'Full' " />
   <UsingTask TaskName="Microsoft.Android.Tasks.GenerateMissingTypeMapStubs" AssemblyFile="$(_MicrosoftAndroidBuildTasksAssembly)" Runtime="NET" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
+  <UsingTask TaskName="Xamarin.Android.Tasks.PreTrimmingFixAbstractMethods" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
   <UsingTask TaskName="Xamarin.Android.Tasks.PostTrimmingPipeline" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
 
   <PropertyGroup>
     <_TrimmableRuntimeProviderJavaName Condition=" '$(_TrimmableRuntimeProviderJavaName)' == '' ">mono.MonoRuntimeProvider</_TrimmableRuntimeProviderJavaName>
   </PropertyGroup>
 
+  <!-- Fix binaries compiled against older Java binding interfaces before ILLink or
+       packaging. ILLink then sees the method and its AbstractMethodError dependency. -->
+  <Target Name="_AndroidFixAbstractMethodsBeforePublishInputs"
+      DependsOnTargets="_ComputeAssembliesToPostprocessOnPublish">
+    <ItemGroup>
+      <_AndroidPreLinkAssembly Remove="@(_AndroidPreLinkAssembly)" />
+      <_AndroidPreLinkAssembly Include="@(ResolvedFileToPublish)"
+          Condition=" '%(ResolvedFileToPublish.Extension)' == '.dll' and '%(ResolvedFileToPublish.PostprocessAssembly)' == 'true' " />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_AndroidInvalidateAbstractMethodsBeforePublishStamp">
+    <PropertyGroup>
+      <_AndroidPreLinkModifiedAssembliesList>$(IntermediateOutputPath)prelink/modified-assemblies.txt</_AndroidPreLinkModifiedAssembliesList>
+    </PropertyGroup>
+    <ReadLinesFromFile File="$(_AndroidPreLinkModifiedAssembliesList)" Condition="Exists('$(_AndroidPreLinkModifiedAssembliesList)')">
+      <Output TaskParameter="Lines" ItemName="_AndroidExpectedPreLinkAssembly" />
+    </ReadLinesFromFile>
+    <ItemGroup>
+      <_AndroidMissingPreLinkAssembly Include="@(_AndroidExpectedPreLinkAssembly)"
+          Condition="!Exists('%(_AndroidExpectedPreLinkAssembly.Identity)')" />
+    </ItemGroup>
+    <Delete Files="$(_AndroidStampDirectory)_AndroidFixAbstractMethodsBeforePublish.stamp"
+        Condition="Exists('$(_AndroidStampDirectory)_AndroidFixAbstractMethodsBeforePublish.stamp') and (!Exists('$(_AndroidPreLinkModifiedAssembliesList)') or '@(_AndroidMissingPreLinkAssembly->Count())' != '0')" />
+    <ItemGroup>
+      <_AndroidExpectedPreLinkAssembly Remove="@(_AndroidExpectedPreLinkAssembly)" />
+      <_AndroidMissingPreLinkAssembly Remove="@(_AndroidMissingPreLinkAssembly)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_AndroidFixAbstractMethodsBeforePublish"
+      AfterTargets="ComputeResolvedFilesToPublishList"
+      BeforeTargets="PrepareForILLink"
+      DependsOnTargets="_AndroidFixAbstractMethodsBeforePublishInputs;_AndroidInvalidateAbstractMethodsBeforePublishStamp"
+      Condition=" '$(RuntimeIdentifier)' != '' and ('$(PublishTrimmed)' != 'true' or '$(RunILLink)' != 'false') "
+      Inputs="@(_AndroidPreLinkAssembly);@(_AndroidMSBuildAllProjects)"
+      Outputs="$(_AndroidStampDirectory)_AndroidFixAbstractMethodsBeforePublish.stamp">
+    <PreTrimmingFixAbstractMethods
+        Assemblies="@(_AndroidPreLinkAssembly)"
+        TargetName="$(TargetName)"
+        OutputDirectory="$(IntermediateOutputPath)prelink"
+        Deterministic="$(Deterministic)">
+      <Output TaskParameter="ModifiedAssemblies" ItemName="_AndroidModifiedPreLinkAssembly" />
+    </PreTrimmingFixAbstractMethods>
+    <WriteLinesToFile
+        File="$(_AndroidPreLinkModifiedAssembliesList)"
+        Lines="@(_AndroidModifiedPreLinkAssembly)"
+        Overwrite="true"
+        WriteOnlyWhenDifferent="true" />
+    <MakeDir Directories="$(_AndroidStampDirectory)" />
+    <Touch Files="$(_AndroidStampDirectory)_AndroidFixAbstractMethodsBeforePublish.stamp" AlwaysCreate="true" />
+    <ItemGroup>
+      <FileWrites Include="$(_AndroidStampDirectory)_AndroidFixAbstractMethodsBeforePublish.stamp" />
+      <FileWrites Include="$(_AndroidPreLinkModifiedAssembliesList)" />
+      <_AndroidPreLinkSwappableAssembly Include="@(ResolvedFileToPublish)"
+          Condition=" '%(ResolvedFileToPublish.Extension)' == '.dll' and '%(ResolvedFileToPublish.PostprocessAssembly)' == 'true' and Exists('$(IntermediateOutputPath)prelink/%(ResolvedFileToPublish.Filename)%(ResolvedFileToPublish.Extension)') " />
+      <ResolvedFileToPublish Remove="@(_AndroidPreLinkSwappableAssembly)" />
+      <ResolvedFileToPublish Include="@(_AndroidPreLinkSwappableAssembly->'$(IntermediateOutputPath)prelink/%(Filename)%(Extension)')" />
+      <FileWrites Include="@(_AndroidPreLinkSwappableAssembly->'$(IntermediateOutputPath)prelink/%(Filename)%(Extension)')" />
+      <FileWrites Include="$(IntermediateOutputPath)prelink/*.pdb" />
+      <_AndroidModifiedPreLinkAssembly Remove="@(_AndroidModifiedPreLinkAssembly)" />
+    </ItemGroup>
+  </Target>
+
   <PropertyGroup>
     <_GenerateProguardAfterTargets Condition=" '$(_GenerateProguardAfterTargets)' == '' ">ILLink</_GenerateProguardAfterTargets>
   </PropertyGroup>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixAbstractMethods.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixAbstractMethods.cs
new file mode 100644
index 00000000000..e31263ebfc4
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixAbstractMethods.cs
@@ -0,0 +1,110 @@
+#nullable enable
+
+using System.Collections.Generic;
+using System.IO;
+using Java.Interop.Tools.Cecil;
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Mono.Cecil;
+using MonoDroid.Tuner;
+
+namespace Xamarin.Android.Tasks;
+
+public class PreTrimmingFixAbstractMethods : AndroidTask
+{
+	public override string TaskPrefix => "PTA";
+
+	[Required]
+	public ITaskItem [] Assemblies { get; set; } = [];
+
+	[Required]
+	public string TargetName { get; set; } = "";
+
+	[Required]
+	public string OutputDirectory { get; set; } = "";
+
+	public bool Deterministic { get; set; }
+
+	[Output]
+	public ITaskItem [] ModifiedAssemblies { get; set; } = [];
+
+	public override bool RunTask ()
+	{
+		Directory.CreateDirectory (OutputDirectory);
+
+		using var resolver = new DirectoryAssemblyResolver (
+			this.CreateTaskLogger (), loadDebugSymbols: true);
+		foreach (var item in Assemblies) {
+			var directory = Path.GetDirectoryName (Path.GetFullPath (item.ItemSpec));
+			if (directory != null && !resolver.SearchDirectories.Contains (directory)) {
+				resolver.SearchDirectories.Add (directory);
+			}
+		}
+
+		var context = new MSBuildLinkContext (resolver, Log);
+		var step = new FixAbstractMethodsStep ();
+		step.Initialize (context);
+		var modified = new List<ITaskItem> ();
+
+		// Resolve the app's binding assemblies before resolving references from
+		// libraries compiled against an older version of the same binding.
+		foreach (var item in Assemblies) {
+			if (IsPostprocessAssembly (item) &&
+			    resolver.Load (item.ItemSpec, forceLoad: true) == null) {
+				throw new FileNotFoundException ("Could not load prelink assembly.", item.ItemSpec);
+			}
+		}
+
+		foreach (var item in Assemblies) {
+			if (Path.GetFileNameWithoutExtension (item.ItemSpec) == TargetName ||
+			    !IsPostprocessAssembly (item)) {
+				continue;
+			}
+
+			var assembly = resolver.GetAssembly (item.ItemSpec);
+			var outputPath = Path.Combine (OutputDirectory, Path.GetFileName (item.ItemSpec));
+			if (step.FixAbstractMethods (assembly)) {
+				Log.LogDebugMessage ($"  Writing modified assembly: {outputPath}");
+				var temporaryPath = outputPath + ".tmp.dll";
+				var temporarySymbols = Path.ChangeExtension (temporaryPath, ".pdb");
+				var outputSymbols = Path.ChangeExtension (outputPath, ".pdb");
+				try {
+					assembly.Write (temporaryPath, new WriterParameters {
+						WriteSymbols = assembly.MainModule.HasSymbols,
+						DeterministicMvid = Deterministic,
+					});
+					Files.CopyIfChanged (temporaryPath, outputPath);
+					if (File.Exists (temporarySymbols)) {
+						Files.CopyIfChanged (temporarySymbols, outputSymbols);
+					} else if (File.Exists (outputSymbols)) {
+						File.Delete (outputSymbols);
+					}
+				} finally {
+					if (File.Exists (temporaryPath)) {
+						File.Delete (temporaryPath);
+					}
+					if (File.Exists (temporarySymbols)) {
+						File.Delete (temporarySymbols);
+					}
+				}
+				modified.Add (new TaskItem (outputPath));
+			} else {
+				if (File.Exists (outputPath)) {
+					File.Delete (outputPath);
+				}
+				var outputSymbols = Path.ChangeExtension (outputPath, ".pdb");
+				if (File.Exists (outputSymbols)) {
+					File.Delete (outputSymbols);
+				}
+			}
+		}
+
+		ModifiedAssemblies = modified.ToArray ();
+		return !Log.HasLoggedErrors;
+	}
+
+	static bool IsPostprocessAssembly (ITaskItem item) =>
+		bool.TryParse (item.GetMetadata ("PostprocessAssembly"), out var postprocess) &&
+		postprocess && !MonoAndroidHelper.IsFrameworkAssembly (item);
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
index 2301fe2f39e..8c744dd0e2c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -245,7 +245,7 @@ public void FixAbstractMethodsStep_SkipDimMembers ()
 			Directory.Delete (path, true);
 		}
 
-		static void CreateAbstractIfaceImplementation (string assemblyPath, AssemblyDefinition android)
+		static void CreateAbstractIfaceImplementation (string assemblyPath, AssemblyDefinition android, bool writeSymbols = false)
 		{
 			using (var assm = AssemblyDefinition.CreateAssembly (new AssemblyNameDefinition ("DimTest", new Version ()), "DimTest", ModuleKind.Dll)) {
 				var void_type = assm.MainModule.ImportReference (typeof (void));
@@ -267,8 +267,197 @@ static void CreateAbstractIfaceImplementation (string assemblyPath, AssemblyDefi
 				impl.Interfaces.Add (new InterfaceImplementation (iface));
 
 				assm.MainModule.Types.Add (impl);
-				assm.Write (assemblyPath);
+				var parameters = new WriterParameters { WriteSymbols = writeSymbols };
+				if (writeSymbols) {
+					parameters.SymbolWriterProvider = new PortablePdbWriterProvider ();
+				}
+				assm.Write (assemblyPath, parameters);
+			}
+		}
+
+		[Test]
+		public void PreTrimmingFixAbstractMethodsWritesOnlyModifiedCopies ()
+		{
+			var path = Path.Combine (Root, "temp", TestName);
+			var outputDirectory = Path.Combine (path, "prelink");
+			Directory.CreateDirectory (path);
+			try {
+				var androidPath = Path.Combine (path, "Mono.Android.dll");
+				var libraryPath = Path.Combine (path, "MyAssembly.dll");
+				using (var android = CreateFauxMonoAndroidAssembly ()) {
+					android.Write (androidPath);
+					CreateAbstractIfaceImplementation (libraryPath, android);
+				}
+
+				var library = new Microsoft.Build.Utilities.TaskItem (libraryPath);
+				library.SetMetadata ("PostprocessAssembly", "True");
+				var task = new PreTrimmingFixAbstractMethods {
+					Assemblies = [new Microsoft.Build.Utilities.TaskItem (typeof (object).Assembly.Location),
+						new Microsoft.Build.Utilities.TaskItem (androidPath), library],
+					TargetName = "App",
+					OutputDirectory = outputDirectory,
+					Deterministic = true,
+					BuildEngine = new MockBuildEngine (TestContext.Out),
+				};
+
+				Assert.IsTrue (task.Execute ());
+				var copy = Path.Combine (outputDirectory, "MyAssembly.dll");
+				FileAssert.Exists (copy);
+				Assert.AreEqual (copy, task.ModifiedAssemblies.Single ().ItemSpec);
+				Assert.IsFalse (File.Exists (Path.Combine (outputDirectory, "Mono.Android.dll")));
+
+				using (var original = AssemblyDefinition.ReadAssembly (libraryPath))
+				using (var modified = AssemblyDefinition.ReadAssembly (copy)) {
+					Assert.IsFalse (original.MainModule.GetType ("MyNamespace.MyClass").Methods.Any (method => method.Name == "MyAbstractMethod"));
+					var newMethod = modified.MainModule.GetType ("MyNamespace.MyClass").Methods.Single (method => method.Name == "MyAbstractMethod");
+					Assert.IsTrue (newMethod.Body.Instructions.Any (instruction =>
+						instruction.Operand is MethodReference constructor &&
+						constructor.DeclaringType.FullName == "Java.Lang.AbstractMethodError"));
+				}
+
+				File.SetLastWriteTimeUtc (copy, DateTime.UtcNow.AddMinutes (-2));
+				var writeTime = File.GetLastWriteTimeUtc (copy);
+				Assert.IsTrue (task.Execute ());
+				Assert.AreEqual (writeTime, File.GetLastWriteTimeUtc (copy),
+					"an unchanged abstract-method fixup must not invalidate FastDeploy inputs");
+
+				var updatedLibraryPath = Path.Combine (path, "UpdatedMyAssembly.dll");
+				using (var assembly = AssemblyDefinition.ReadAssembly (libraryPath)) {
+					var implementation = assembly.MainModule.GetType ("MyNamespace.MyClass");
+					var method = new MethodDefinition ("MyAbstractMethod", MethodAttributes.Public | MethodAttributes.Virtual,
+						assembly.MainModule.TypeSystem.Void);
+					method.Body.Instructions.Add (Instruction.Create (OpCodes.Ret));
+					implementation.Methods.Add (method);
+					assembly.Write (updatedLibraryPath);
+				}
+				File.Copy (updatedLibraryPath, libraryPath, overwrite: true);
+				Assert.IsTrue (task.Execute ());
+				Assert.IsEmpty (task.ModifiedAssemblies);
+				Assert.IsFalse (File.Exists (copy), "a stale prelink copy must not replace the updated library");
+			} finally {
+				Directory.Delete (path, recursive: true);
+			}
+		}
+
+		[Test]
+		public void PreTrimmingFixAbstractMethodsPreservesUnchangedSymbols ()
+		{
+			var path = Path.Combine (Root, "temp", TestName);
+			var outputDirectory = Path.Combine (path, "prelink");
+			Directory.CreateDirectory (path);
+			try {
+				var androidPath = Path.Combine (path, "Mono.Android.dll");
+				var libraryPath = Path.Combine (path, "MyAssembly.dll");
+				using (var android = CreateFauxMonoAndroidAssembly ()) {
+					android.Write (androidPath);
+					CreateAbstractIfaceImplementation (libraryPath, android, writeSymbols: true);
+				}
+
+				var library = new Microsoft.Build.Utilities.TaskItem (libraryPath);
+				library.SetMetadata ("PostprocessAssembly", "true");
+				var task = new PreTrimmingFixAbstractMethods {
+					Assemblies = [new Microsoft.Build.Utilities.TaskItem (typeof (object).Assembly.Location),
+						new Microsoft.Build.Utilities.TaskItem (androidPath), library],
+					TargetName = "App",
+					OutputDirectory = outputDirectory,
+					Deterministic = true,
+					BuildEngine = new MockBuildEngine (TestContext.Out),
+				};
+
+				Assert.IsTrue (task.Execute ());
+				var outputDll = Path.Combine (outputDirectory, "MyAssembly.dll");
+				var outputPdb = Path.ChangeExtension (outputDll, ".pdb");
+				FileAssert.Exists (outputDll);
+				FileAssert.Exists (outputPdb);
+				File.SetLastWriteTimeUtc (outputDll, DateTime.UtcNow.AddMinutes (-2));
+				File.SetLastWriteTimeUtc (outputPdb, DateTime.UtcNow.AddMinutes (-2));
+				var dllWriteTime = File.GetLastWriteTimeUtc (outputDll);
+				var pdbWriteTime = File.GetLastWriteTimeUtc (outputPdb);
+
+				Assert.IsTrue (task.Execute ());
+				Assert.AreEqual (dllWriteTime, File.GetLastWriteTimeUtc (outputDll));
+				Assert.AreEqual (pdbWriteTime, File.GetLastWriteTimeUtc (outputPdb));
+				Assert.IsFalse (File.Exists (outputDll + ".tmp.dll"));
+				Assert.IsFalse (File.Exists (Path.ChangeExtension (outputDll + ".tmp.dll", ".pdb")));
+			} finally {
+				Directory.Delete (path, recursive: true);
+			}
+		}
+
+		[Test]
+		public void PreTrimmingFixAbstractMethodsUsesSelectedBindingVersion ()
+		{
+			var path = Path.Combine (Root, "temp", TestName);
+			var oldDirectory = Path.Combine (path, "old");
+			var newDirectory = Path.Combine (path, "new");
+			Directory.CreateDirectory (oldDirectory);
+			Directory.CreateDirectory (newDirectory);
+			try {
+				var androidPath = Path.Combine (path, "Mono.Android.dll");
+				var oldBindingPath = Path.Combine (oldDirectory, "TestBinding.dll");
+				var newBindingPath = Path.Combine (newDirectory, "TestBinding.dll");
+				var libraryPath = Path.Combine (oldDirectory, "LegacyLibrary.dll");
+				var nativePath = Path.Combine (oldDirectory, "NativeDependency.dll");
+				File.WriteAllBytes (nativePath, [0, 1, 2, 3]);
+				using (var android = CreateFauxMonoAndroidAssembly ()) {
+					android.Write (androidPath);
+					CreateBindingInterface (oldBindingPath, includeNewMethod: false);
+					CreateBindingInterface (newBindingPath, includeNewMethod: true);
+					using var oldBinding = AssemblyDefinition.ReadAssembly (oldBindingPath);
+					using var library = AssemblyDefinition.CreateAssembly (
+						new AssemblyNameDefinition ("LegacyLibrary", new Version (1, 0)), "LegacyLibrary", ModuleKind.Dll);
+					var implementation = new TypeDefinition ("Legacy", "Cursor", TypeAttributes.Public,
+						library.MainModule.ImportReference (android.MainModule.GetType ("Java.Lang.Object")));
+					implementation.Interfaces.Add (new InterfaceImplementation (
+						library.MainModule.ImportReference (oldBinding.MainModule.GetType ("Test.Bindings.ICursor"))));
+					var method = new MethodDefinition ("Method", MethodAttributes.Public | MethodAttributes.Virtual,
+						library.MainModule.TypeSystem.Void);
+					method.Body.Instructions.Add (Instruction.Create (OpCodes.Ret));
+					implementation.Methods.Add (method);
+					library.MainModule.Types.Add (implementation);
+					library.Write (libraryPath);
+				}
+
+				var oldLibrary = new Microsoft.Build.Utilities.TaskItem (libraryPath);
+				oldLibrary.SetMetadata ("PostprocessAssembly", "true");
+				var newBinding = new Microsoft.Build.Utilities.TaskItem (newBindingPath);
+				newBinding.SetMetadata ("PostprocessAssembly", "true");
+				var task = new PreTrimmingFixAbstractMethods {
+					Assemblies = [new Microsoft.Build.Utilities.TaskItem (nativePath), oldLibrary, newBinding,
+						new Microsoft.Build.Utilities.TaskItem (androidPath),
+						new Microsoft.Build.Utilities.TaskItem (typeof (object).Assembly.Location)],
+					TargetName = "App",
+					OutputDirectory = Path.Combine (path, "prelink"),
+					BuildEngine = new MockBuildEngine (TestContext.Out),
+				};
+
+				Assert.IsTrue (task.Execute ());
+				var copy = Path.Combine (task.OutputDirectory, "LegacyLibrary.dll");
+				FileAssert.Exists (copy);
+				using var modified = AssemblyDefinition.ReadAssembly (copy);
+				Assert.IsTrue (modified.MainModule.GetType ("Legacy.Cursor").Methods.Any (member => member.Name == "NewMethod"),
+					"the current binding interface, not the nearby older DLL, must determine missing methods");
+			} finally {
+				Directory.Delete (path, recursive: true);
+			}
+		}
+
+		static void CreateBindingInterface (string path, bool includeNewMethod)
+		{
+			using var assembly = AssemblyDefinition.CreateAssembly (
+				new AssemblyNameDefinition ("TestBinding", new Version (1, 0)), "TestBinding", ModuleKind.Dll);
+			var cursor = new TypeDefinition ("Test.Bindings", "ICursor",
+				TypeAttributes.Interface | TypeAttributes.Abstract | TypeAttributes.Public);
+			cursor.Methods.Add (new MethodDefinition ("Method",
+				MethodAttributes.Public | MethodAttributes.Abstract | MethodAttributes.Virtual,
+				assembly.MainModule.TypeSystem.Void));
+			if (includeNewMethod) {
+				cursor.Methods.Add (new MethodDefinition ("NewMethod",
+					MethodAttributes.Public | MethodAttributes.Abstract | MethodAttributes.Virtual,
+					assembly.MainModule.TypeSystem.Void));
 			}
+			assembly.MainModule.Types.Add (cursor);
+			assembly.Write (path);
 		}
 
 		[Test]

From efd19a319862f7039fd86a5aaaca1383cb5fec1e Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:38:14 +0200
Subject: [PATCH 14/58] Select the effective post-trim RID and configure
 Proguard

Device builds can change RuntimeIdentifier after evaluation; use the selected RID when collecting post-trim Java inputs so x64 FastDeploy retains launcher JCWs. Set the Proguard output before ILLink and track it for Clean.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ....Android.Sdk.TypeMap.Trimmable.CoreCLR.targets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
index ae9709150c0..c948f1e76e7 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets
@@ -78,6 +78,14 @@
     <_GenerateProguardAfterTargets Condition=" '$(_GenerateProguardAfterTargets)' == '' ">ILLink</_GenerateProguardAfterTargets>
   </PropertyGroup>
 
+  <Target Name="_AndroidSetTrimmableProguardConfiguration"
+      BeforeTargets="ILLink"
+      Condition=" '$(PublishTrimmed)' == 'true' and '$(AndroidLinkTool)' != '' ">
+    <PropertyGroup>
+      <_ProguardProjectConfiguration Condition=" '$(_ProguardProjectConfiguration)' == '' ">$(IntermediateOutputPath)proguard\proguard_project_references.cfg</_ProguardProjectConfiguration>
+    </PropertyGroup>
+  </Target>
+
   <!-- Add TypeMap DLLs to ILLink input. ILLink natively understands TypeMapAttribute<T>. -->
   <Target Name="_AddTrimmableTypeMapToLinker"
       BeforeTargets="PrepareForILLink;_RunILLink"
@@ -148,11 +156,18 @@
     <GenerateProguardConfiguration
         LinkedAssemblies="@(_LinkedAssemblyForProguard)"
         OutputFile="$(_ProguardProjectConfiguration)" />
+    <ItemGroup>
+      <FileWrites Include="$(_ProguardProjectConfiguration)" />
+    </ItemGroup>
   </Target>
 
   <Target Name="_ComputePostTrimTrimmableTypeMapInputs"
       Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' and '$(PublishTrimmed)' == 'true' and '$(_ComputeFilesToPublishForRuntimeIdentifiers)' != 'true' "
       AfterTargets="_ResolveAssemblies">
+    <PropertyGroup>
+      <!-- _GetPrimaryCpuAbi may select a single device RID after the initial RuntimeIdentifiers default was evaluated. -->
+      <_PostTrimTypeMapFirstRuntimeIdentifier Condition=" '$(RuntimeIdentifier)' != '' ">$(RuntimeIdentifier)</_PostTrimTypeMapFirstRuntimeIdentifier>
+    </PropertyGroup>
     <ItemGroup>
       <_PostTrimTrimmableTypeMapInputAssemblies Remove="@(_PostTrimTrimmableTypeMapInputAssemblies)" />
       <!-- Only the linked .dll assemblies that already exist on disk are valid inputs.

From d3fa4d84661be02a8082469d8f2445e61427c07a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:39:47 +0200
Subject: [PATCH 15/58] Keep packaged type map counts and FastDeploy DLLs
 consistent

Mark pre-trim typemap assemblies with RelativePath so native config counts them once. For trimmed CoreCLR, prefer an existing linked/R2R type map for the same FastDeploy destination while preserving the pre-trim Debug fallback, with focused task tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Tasks/FastDeploy.cs                       | 28 ++++++++-
 ...soft.Android.Sdk.TypeMap.Trimmable.targets |  5 ++
 .../Tasks/FastDeployTypeMapTests.cs           | 57 +++++++++++++++++++
 ...rateNativeApplicationConfigSourcesTests.cs | 31 ++++++++++
 4 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FastDeployTypeMapTests.cs

diff --git a/src/Xamarin.Android.Build.Debugging.Tasks/Tasks/FastDeploy.cs b/src/Xamarin.Android.Build.Debugging.Tasks/Tasks/FastDeploy.cs
index 0cdc30fe922..36657ba791b 100644
--- a/src/Xamarin.Android.Build.Debugging.Tasks/Tasks/FastDeploy.cs
+++ b/src/Xamarin.Android.Build.Debugging.Tasks/Tasks/FastDeploy.cs
@@ -395,7 +395,7 @@ async Task<string> CreateRemoteStagingDirectories (string remoteStagingPath, Has
 		List<DirectPushFile> PrepareDirectPushFiles ()
 		{
 			var files = new List<DirectPushFile> ();
-			foreach (var file in FastDevFiles ?? []) {
+			foreach (var file in FilterPreTrimTypeMapFiles (FastDevFiles ?? [])) {
 				string localPath = GetFullPath (file.ItemSpec);
 				if (!File.Exists (localPath)) {
 					LogDiagnostic ($"File '{file.ItemSpec}' does not exist. Skipping.");
@@ -431,6 +431,32 @@ List<DirectPushFile> PrepareDirectPushFiles ()
 			return files;
 		}
 
+		internal ITaskItem [] FilterPreTrimTypeMapFiles (ITaskItem [] fastDevFiles)
+		{
+			var preTrimTargets = new HashSet<string> (StringComparer.Ordinal);
+			foreach (var file in fastDevFiles) {
+				if (file.GetMetadata ("_AndroidPreTrimTypeMapCandidate") == "true") {
+					if (!string.IsNullOrEmpty (file.GetMetadata ("TargetPath"))) {
+						preTrimTargets.Add (GetAdbPushTargetPath (file));
+					}
+				}
+			}
+			if (preTrimTargets.Count == 0) {
+				return fastDevFiles;
+			}
+
+			var finalTargets = new HashSet<string> (StringComparer.Ordinal);
+			foreach (var file in fastDevFiles) {
+				if (file.GetMetadata ("_AndroidPreTrimTypeMapCandidate") != "true" &&
+				    !string.IsNullOrEmpty (file.GetMetadata ("TargetPath")) &&
+				    preTrimTargets.Contains (GetAdbPushTargetPath (file)) && File.Exists (file.ItemSpec)) {
+					finalTargets.Add (GetAdbPushTargetPath (file));
+				}
+			}
+			return fastDevFiles.Where (file => file.GetMetadata ("_AndroidPreTrimTypeMapCandidate") != "true" ||
+				!finalTargets.Contains (GetAdbPushTargetPath (file))).ToArray ();
+		}
+
 		bool WriteFileIfChanged (string path, byte [] contents, DateTime modifiedDateTime)
 		{
 			if (!Files.HasBytesChanged (contents, path)) {
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
index 3618848a07f..35d4ba1d933 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
@@ -344,8 +344,13 @@
       <_TrimmableTypeMapResolvedAssemblies Include="@(_GeneratedTypeMapAssembliesFromList)">
         <Abi>$(_TypeMapFirstAbi)</Abi>
         <RuntimeIdentifier>$(_TypeMapFirstRid)</RuntimeIdentifier>
+        <RelativePath>%(Filename)%(Extension)</RelativePath>
         <DestinationSubPath>$(_TypeMapFirstAbi)/%(Filename)%(Extension)</DestinationSubPath>
         <DestinationSubDirectory>$(_TypeMapFirstAbi)/</DestinationSubDirectory>
+        <!-- Keep the pre-trim copy for native config/store; FastDeploy selects the final
+             linked/R2R copy for the same destination only when that file exists. -->
+        <_AndroidPreTrimTypeMapCandidate
+            Condition=" '$(_AndroidRuntime)' == 'CoreCLR' and '$(PublishTrimmed)' == 'true' ">true</_AndroidPreTrimTypeMapCandidate>
       </_TrimmableTypeMapResolvedAssemblies>
       <_ResolvedAssemblies Include="@(_TrimmableTypeMapResolvedAssemblies)" />
       <_ShrunkAssemblies Include="@(_TrimmableTypeMapResolvedAssemblies)" />
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FastDeployTypeMapTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FastDeployTypeMapTests.cs
new file mode 100644
index 00000000000..f9de1b13da3
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FastDeployTypeMapTests.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using NUnit.Framework;
+using Xamarin.Android.Tasks;
+
+namespace Xamarin.Android.Build.Tests
+{
+	public class FastDeployTypeMapTests : BaseTest
+	{
+		[TestCase (true, true, true, true, 2)]
+		[TestCase (true, true, true, false, 3)]
+		[TestCase (true, true, false, true, 3)]
+		[TestCase (true, false, true, true, 3)]
+		[TestCase (false, true, true, true, 1)]
+		public void PreTrimTypeMapYieldsOnlyToMatchingFinalCopy (
+			bool includeFinal, bool finalExists, bool trimmed, bool sameAbi, int expectedCount)
+		{
+			var path = Path.Combine (Root, "temp", TestName);
+			Directory.CreateDirectory (path);
+			try {
+				var preTrimPath = Path.Combine (path, "pretrim", "_Microsoft.Android.TypeMaps.dll");
+				var finalPath = Path.Combine (path, "R2R", "_Microsoft.Android.TypeMaps.dll");
+				Directory.CreateDirectory (Path.GetDirectoryName (preTrimPath));
+				Directory.CreateDirectory (Path.GetDirectoryName (finalPath));
+				File.WriteAllBytes (preTrimPath, [1]);
+				if (finalExists) {
+					File.WriteAllBytes (finalPath, [2]);
+				}
+
+				var preTrim = new TaskItem (preTrimPath);
+				preTrim.SetMetadata ("TargetPath", "x86_64/_Microsoft.Android.TypeMaps.dll");
+				if (trimmed) {
+					preTrim.SetMetadata ("_AndroidPreTrimTypeMapCandidate", "true");
+				}
+				var final = new TaskItem (finalPath);
+				final.SetMetadata ("TargetPath", sameAbi
+					? "x86_64\\_Microsoft.Android.TypeMaps.dll"
+					: "arm64-v8a/_Microsoft.Android.TypeMaps.dll");
+
+				var files = new List<ITaskItem> { preTrim };
+				if (includeFinal) {
+					files.Add (final);
+					files.Add (new TaskItem (final));
+				}
+				var selected = new FastDeploy ().FilterPreTrimTypeMapFiles (files.ToArray ());
+				Assert.AreEqual (expectedCount, selected.Length);
+				Assert.AreEqual (!includeFinal || !finalExists || !trimmed || !sameAbi,
+					selected.Any (item => item.ItemSpec == preTrimPath));
+			} finally {
+				Directory.Delete (path, recursive: true);
+			}
+		}
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
index 59231cee332..6886977af32 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
@@ -41,4 +41,35 @@ public void HaveAssemblyStoreIsEmittedForCoreCLR (bool haveAssemblyStore)
 		var config = (EnvironmentHelper.ApplicationConfig)EnvironmentHelper.ReadApplicationConfig (environmentFiles, AndroidRuntime.CoreCLR);
 		Assert.AreEqual (haveAssemblyStore, config.have_assembly_store);
 	}
+
+	[Test]
+	public void TypeMapAssemblyIsCountedOnceAcrossResolvedAssemblyLists ()
+	{
+		string outputRoot = Path.Combine (Root, "temp", TestName);
+		string monoAndroidPath = Path.Combine (TestEnvironment.MonoAndroidFrameworkDirectory, "Mono.Android.dll");
+		FileAssert.Exists (monoAndroidPath);
+		string typeMapPath = Path.Combine (outputRoot, "typemap", "_Test.TypeMap.dll");
+		var typeMap = new TaskItem (typeMapPath);
+		typeMap.SetMetadata ("Abi", "arm64-v8a");
+		typeMap.SetMetadata ("DestinationSubDirectory", "arm64-v8a/");
+		typeMap.SetMetadata ("RelativePath", "_Test.TypeMap.dll");
+
+		var task = new GenerateNativeApplicationConfigSources {
+			BuildEngine = new MockBuildEngine (TestContext.Out),
+			ResolvedAssemblies = [new TaskItem (monoAndroidPath), typeMap],
+			AdditionalResolvedAssemblies = [new TaskItem (typeMapPath)],
+			EnvironmentOutputDirectory = Path.Combine (outputRoot, "android"),
+			SupportedAbis = ["arm64-v8a"],
+			AndroidPackageName = "com.microsoft.android.typemapcounttest",
+			EnablePreloadAssembliesDefault = false,
+			AndroidRuntime = "CoreCLR",
+			UseAssemblyStore = true,
+		};
+
+		Assert.IsTrue (task.Execute (), "GenerateNativeApplicationConfigSources should succeed.");
+		var environmentFiles = EnvironmentHelper.GatherEnvironmentFiles (
+			outputRoot, "arm64-v8a", required: true, runtime: AndroidRuntime.CoreCLR);
+		var config = (EnvironmentHelper.ApplicationConfig)EnvironmentHelper.ReadApplicationConfig (environmentFiles, AndroidRuntime.CoreCLR);
+		Assert.AreEqual (2u, config.number_of_assemblies_in_apk, "The type map must not be counted again as a satellite assembly.");
+	}
 }

From 3885e7b8513ee707b83b205616ba37c374676762 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:40:45 +0200
Subject: [PATCH 16/58] Categorize Android libraries before Java compilation

Nested DeployToDevice builds must convert AndroidLibrary jars into program inputs before Java library selection and D8, including Kotlin binding jars.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets
index 04b17fe3b6b..f6de54356a0 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets
@@ -52,7 +52,7 @@ It is shared between "legacy" binding projects and .NET 7+ projects.
   </Target>
 
   <Target Name="_DetermineJavaLibrariesToCompile"
-      DependsOnTargets="_CollectJavaSourceForBinding;_CompileBindingJava">
+      DependsOnTargets="_CategorizeAndroidLibraries;_CollectJavaSourceForBinding;_CompileBindingJava">
 
     <DetermineJavaLibrariesToCompile
         MonoPlatformJarPaths="$(MonoPlatformJarPath);$(_RuntimeJar)"

From 31791c51fff61c719ce73f44c6395b3cf3afcf26 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:41:44 +0200
Subject: [PATCH 17/58] Preserve deserialization callback in trimmed CoreCLR
 apps

Root Java.Lang.Object.SetHandleOnDeserialized, which DataContractJsonSerializer invokes via reflection and whose removal leaves linked Release peers without a handle.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Microsoft.Android.Sdk/PreserveLists/Trimmable.CoreCLR.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/PreserveLists/Trimmable.CoreCLR.xml b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/PreserveLists/Trimmable.CoreCLR.xml
index 8c62546764a..eb3df072f85 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/PreserveLists/Trimmable.CoreCLR.xml
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/PreserveLists/Trimmable.CoreCLR.xml
@@ -5,5 +5,9 @@
     <type fullname="Android.Runtime.JNIEnvInit">
       <method name="Initialize" />
     </type>
+    <!-- DataContractJsonSerializer invokes this callback through reflection. -->
+    <type fullname="Java.Lang.Object">
+      <method name="SetHandleOnDeserialized" />
+    </type>
   </assembly>
 </linker>

From 85dd2393f9b5e10be75fd3e125a1d29cc3f63763 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 16:02:08 +0200
Subject: [PATCH 18/58] Remove obsolete LLVM typemap-positive build test cases

Keep the CoreCLR and NativeAOT trimmable/default assertions while dropping cases that explicitly select the rejected llvm-ir typemap. Remove the legacy-only marshal postlink cache test, retain FastTiming dump coverage under the default, and leave XA4265 rejection tests intact.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Xamarin.Android.Build.Tests/BuildTest.cs  |  73 ----
 .../BuildWithLibraryTests.cs                  |  32 +-
 .../TrimmableTypeMapBuildTests.cs             | 401 +++++-------------
 .../Tests/FastTimingTests.cs                  |  27 +-
 .../Tests/InstallAndRunTests.cs               |  29 +-
 .../Tests/WebViewJavascriptInterfaceTests.cs  |   1 -
 6 files changed, 122 insertions(+), 441 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
index 1f4891243d4..e9761a27251 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -2256,79 +2256,6 @@ public void CheckLintResourceFileReferencesAreFixed ([Values (AndroidRuntime.Cor
 			}
 		}
 
-		[TestCase (AndroidRuntime.CoreCLR)]
-		public void BuildDoesNotModifyNuGetPackageCache (AndroidRuntime runtime)
-		{
-			var proj = new XamarinAndroidApplicationProject {
-				IsRelease = true,
-				GlobalPackagesFolder = Path.Combine (Root, TestName, "packages"),
-				Imports = {
-					new Import (() => "EnableMarshalMethodsForPostLink.targets") {
-						TextContent = () =>
-"""
-<Project>
-	<!-- Exercise the in-place post-link path without enabling marshal methods for later CoreCLR targets. -->
-	<Target Name="_EnableMarshalMethodsForPostLink"
-		BeforeTargets="_RunAfterILLinkAdditionalSteps"
-		Condition=" '$(TestEnableMarshalMethodsForPostLink)' == 'true' ">
-		<PropertyGroup>
-			<_AndroidUseMarshalMethods>true</_AndroidUseMarshalMethods>
-		</PropertyGroup>
-	</Target>
-</Project>
-"""
-					},
-				},
-				PackageReferences = {
-					new Package { Id = "Humanizer.Core", Version = "2.14.1" },
-					new Package { Id = "Humanizer.Core.es", Version = "2.14.1" },
-				},
-			};
-			proj.SetRuntime (runtime);
-			proj.SetProperty ("AndroidTypeMapImplementation", "llvm-ir");
-			proj.SetProperty (KnownProperties.PublishTrimmed, true.ToString ());
-			proj.MainActivity = proj.DefaultMainActivity
-				.Replace ("//${USINGS}", "using Humanizer;")
-				.Replace ("//${AFTER_ONCREATE}", "System.Console.WriteLine (System.DateTime.UtcNow.Humanize ());");
-
-			using var builder = CreateApkBuilder ();
-			var buildParameters = new [] { $"RestorePackagesPath={proj.GlobalPackagesFolder}" };
-			Assert.IsTrue (builder.Restore (proj, parameters: buildParameters), "Package restore should have succeeded.");
-			Assert.IsTrue (builder.Build (proj, doNotCleanupOnUpdate: true, saveProject: false, parameters: buildParameters),
-				"Initial build should have succeeded.");
-
-			var satelliteAssemblies = Directory.GetFiles (proj.GlobalPackagesFolder, "*.resources.dll", SearchOption.AllDirectories);
-			Assert.IsNotEmpty (satelliteAssemblies, "The NuGet package should contain satellite assemblies.");
-
-			var originalWriteTimes = new Dictionary<string, DateTime> ();
-			foreach (string assembly in satelliteAssemblies) {
-				File.SetLastWriteTimeUtc (assembly, new DateTime (2000, 1, 1, 0, 0, 0, DateTimeKind.Utc));
-				originalWriteTimes.Add (assembly, File.GetLastWriteTimeUtc (assembly));
-			}
-
-			var postLinkStamp = Path.Combine (Root, builder.ProjectDirectory, proj.IntermediateOutputPath, "stamp", "_AdditionalPostLinkerSteps.stamp");
-			FileAssert.Exists (postLinkStamp);
-			File.Delete (postLinkStamp);
-
-			// A package cache is immutable: deny write sharing and verify timestamps remain unchanged.
-			var packageLocks = satelliteAssemblies
-				.Select (assembly => File.Open (assembly, FileMode.Open, FileAccess.Read, FileShare.Read))
-				.ToList ();
-			try {
-				var postLinkParameters = buildParameters.Append ("TestEnableMarshalMethodsForPostLink=true").ToArray ();
-				Assert.IsTrue (builder.RunTarget (proj, "_PrepareAssemblies", doNotCleanupOnUpdate: true, saveProject: false, parameters: postLinkParameters),
-					"Preparing assemblies should have succeeded.");
-				FileAssert.Exists (postLinkStamp);
-				foreach (string assembly in satelliteAssemblies) {
-					Assert.AreEqual (originalWriteTimes [assembly], File.GetLastWriteTimeUtc (assembly), $"Build should not modify '{assembly}'.");
-				}
-			} finally {
-				foreach (var packageLock in packageLocks) {
-					packageLock.Dispose ();
-				}
-			}
-		}
-
 		[Test]
 		[TestCase (true, AndroidRuntime.CoreCLR)]
 		[TestCase (false, AndroidRuntime.CoreCLR)]
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs
index d2691211cf1..b50e01701b0 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs
@@ -618,10 +618,9 @@ public void AndroidLibraryProjectsZipWithOddPaths ([Values (AndroidRuntime.CoreC
 			}
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR)]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR)]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT)]
-		public void DuplicateJCWNames (string typemapImplementation, AndroidRuntime runtime)
+		[TestCase (AndroidRuntime.CoreCLR)]
+		[TestCase (AndroidRuntime.NativeAOT)]
+		public void DuplicateJCWNames (AndroidRuntime runtime)
 		{
 			bool isRelease = runtime == AndroidRuntime.NativeAOT;
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
@@ -679,7 +678,6 @@ public SecondPeer (string value)
 				},
 			};
 			app.SetRuntime (runtime);
-			app.SetProperty ("AndroidTypeMapImplementation", typemapImplementation);
 			var projectPath = Path.Combine ("temp", $"{TestName}_{Guid.NewGuid ():N}");
 			using var lib1b = CreateDllBuilder (Path.Combine (projectPath, library1.ProjectName), cleanupAfterSuccessfulBuild: false);
 			using var lib2b = CreateDllBuilder (Path.Combine (projectPath, library2.ProjectName), cleanupAfterSuccessfulBuild: false);
@@ -690,8 +688,8 @@ public SecondPeer (string value)
 			using var appb = CreateApkBuilder (Path.Combine (projectPath, app.ProjectName), cleanupAfterSuccessfulBuild: false);
 			appb.ThrowOnBuildFailure = false;
 			Assert.IsFalse (appb.Build (app), "Build of App1 should have failed");
-var errors = appb.LastBuildOutput.Where (x => x.Contains ("error XA4215")).ToList ();
-Assert.IsNotEmpty (errors, "Error should be XA4215");
+			var errors = appb.LastBuildOutput.Where (x => x.Contains ("error XA4215")).ToList ();
+			Assert.IsNotEmpty (errors, "Error should be XA4215");
 			StringAssertEx.Contains ("examplelib.DuplicatePeer", errors, "Error should mention the conflicting Java type name");
 			StringAssertEx.Contains ("Library1.FirstPeer", errors, "Error should mention the first conflicting managed type");
 			StringAssertEx.Contains ("Library2.SecondPeer", errors, "Error should mention the second conflicting managed type");
@@ -699,19 +697,13 @@ public SecondPeer (string value)
 				"Distinct managed type names should not produce XA4214.");
 
 			var acwMapFile = appb.Output.GetIntermediaryPath ("acw-map.txt");
-			if (typemapImplementation == "llvm-ir") {
-				var javaFile = appb.Output.GetIntermediaryPath (Path.Combine ("android", "src", "examplelib", "DuplicatePeer.java"));
-				FileAssert.Exists (javaFile, "llvm-ir generates JCW sources before XA4215 is detected.");
-				FileAssert.DoesNotExist (acwMapFile, "llvm-ir should not write an ambiguous acw-map.");
-			} else {
-				var typemapDirectory = appb.Output.GetIntermediaryPath ("typemap");
-				var javaFile = Path.Combine (typemapDirectory, "java", "examplelib", "DuplicatePeer.java");
-				FileAssert.DoesNotExist (javaFile, "A failed trimmable typemap build should not write an ambiguous JCW source.");
-				FileAssert.DoesNotExist (acwMapFile, "A failed trimmable typemap build should not write an ambiguous acw-map.");
-				if (Directory.Exists (typemapDirectory)) {
-					Assert.IsEmpty (Directory.GetFiles (typemapDirectory, "*.dll"),
-						"A failed trimmable typemap build should not write typemap assemblies.");
-				}
+			var typemapDirectory = appb.Output.GetIntermediaryPath ("typemap");
+			var javaFile = Path.Combine (typemapDirectory, "java", "examplelib", "DuplicatePeer.java");
+			FileAssert.DoesNotExist (javaFile, "A failed trimmable typemap build should not write an ambiguous JCW source.");
+			FileAssert.DoesNotExist (acwMapFile, "A failed trimmable typemap build should not write an ambiguous acw-map.");
+			if (Directory.Exists (typemapDirectory)) {
+				Assert.IsEmpty (Directory.GetFiles (typemapDirectory, "*.dll"),
+					"A failed trimmable typemap build should not write typemap assemblies.");
 			}
 		}
 
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 50b6febf26a..d610504fdbd 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
@@ -38,14 +38,9 @@ public void Build_WithTrimmableTypeMap_Succeeds ([Values] bool isRelease, [Value
 			AssertTrimmableTypeMapOutputs (intermediateDir);
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "APT2008", false)]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "XA4258", true)]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "XA4258", true)]
-		public void Build_JavaTypeOnlyIdentifierStarts_MatchManifestLimitation (
-			string typeMapImplementation,
-			AndroidRuntime runtime,
-			string expectedCode,
-			bool expectNoOutputs)
+		[TestCase (AndroidRuntime.CoreCLR)]
+		[TestCase (AndroidRuntime.NativeAOT)]
+		public void Build_JavaTypeOnlyIdentifierStarts_MatchManifestLimitation (AndroidRuntime runtime)
 		{
 			bool isRelease = runtime == AndroidRuntime.NativeAOT;
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
@@ -56,7 +51,6 @@ public void Build_JavaTypeOnlyIdentifierStarts_MatchManifestLimitation (
 				IsRelease = isRelease,
 			};
 			proj.SetRuntime (runtime);
-			proj.SetProperty ("AndroidTypeMapImplementation", typeMapImplementation);
 			proj.Sources.Add (new BuildItem.Source ("ManifestIdentifierStarts.cs") {
 				TextContent = () => """
 					using Android.App;
@@ -91,40 +85,20 @@ public SupplementaryComponent () { }
 			builder.ThrowOnBuildFailure = false;
 			Assert.IsFalse (
 				builder.Build (proj),
-				$"{runtime}/{typeMapImplementation} should reject Java-only starts in manifest component names.");
-			StringAssertEx.Contains ($"error {expectedCode}", builder.LastBuildOutput);
-
-			if (expectNoOutputs) {
-				StringAssertEx.Contains ("\u00a2Peer", builder.LastBuildOutput);
-				StringAssertEx.Contains ("\u203fPeer", builder.LastBuildOutput);
-				StringAssertEx.Contains ("\U00010428Peer", builder.LastBuildOutput);
-				AssertNoUnicodeOutputs (builder, "\u00a2Peer");
-				AssertNoUnicodeOutputs (builder, "\u203fPeer");
-				AssertNoUnicodeOutputs (builder, "\U00010428Peer");
-				return;
-			}
-
-			foreach (var javaName in new [] {
-				"com/example/\u00a2Peer",
-				"com/example/\u203fPeer",
-				"com/example/\U00010428Peer",
-			}) {
-				var relativePath = (javaName + ".java").Replace ('/', Path.DirectorySeparatorChar);
-				FileAssert.Exists (
-					builder.Output.GetIntermediaryPath (Path.Combine ("android", "src", relativePath)),
-					$"llvm-ir should generate '{javaName}.java' before AAPT rejects the manifest name.");
-			}
+				$"{runtime} should reject Java-only starts in manifest component names.");
+			StringAssertEx.Contains ("error XA4258", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\u00a2Peer", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\u203fPeer", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\U00010428Peer", builder.LastBuildOutput);
+			AssertNoUnicodeOutputs (builder, "\u00a2Peer");
+			AssertNoUnicodeOutputs (builder, "\u203fPeer");
+			AssertNoUnicodeOutputs (builder, "\U00010428Peer");
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, true)]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, false)]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, false)]
-		public void Build_SupplementaryJavaIdentifier_MatchesRuntimeLimitation (
-			string typeMapImplementation,
-			AndroidRuntime runtime,
-			bool shouldSucceed)
+		[TestCase (AndroidRuntime.CoreCLR)]
+		[TestCase (AndroidRuntime.NativeAOT)]
+		public void Build_SupplementaryJavaIdentifier_MatchesRuntimeLimitation (AndroidRuntime runtime)
 		{
-			const string javaName = "com/example/\U00010428Peer\U00010400";
 			bool isRelease = runtime == AndroidRuntime.NativeAOT;
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
 				return;
@@ -134,7 +108,6 @@ public void Build_SupplementaryJavaIdentifier_MatchesRuntimeLimitation (
 				IsRelease = isRelease,
 			};
 			proj.SetRuntime (runtime);
-			proj.SetProperty ("AndroidTypeMapImplementation", typeMapImplementation);
 			proj.Sources.Add (new BuildItem.Source ("SupplementaryJavaIdentifier.cs") {
 				TextContent = () => """
 					using Android.Runtime;
@@ -154,60 +127,24 @@ public SupplementaryJavaIdentifier () { }
 
 			using var builder = CreateApkBuilder ();
 			builder.ThrowOnBuildFailure = false;
-			Assert.AreEqual (
-				shouldSucceed,
-				builder.Build (proj),
-				$"{runtime}/{typeMapImplementation} should match the supplementary runtime limitation.");
-			if (!shouldSucceed) {
-				StringAssertEx.Contains ("error XA4258", builder.LastBuildOutput);
-				StringAssertEx.Contains ("\U00010428Peer\U00010400", builder.LastBuildOutput);
-				AssertNoUnicodeOutputs (builder, "\U00010428Peer\U00010400");
-				return;
-			}
-
-			var relativeJavaPath = (javaName + ".java").Replace ('/', Path.DirectorySeparatorChar);
-			var javaPath = new [] {
-				builder.Output.GetIntermediaryPath (Path.Combine ("android", "src", relativeJavaPath)),
-				builder.Output.GetIntermediaryPath (Path.Combine ("typemap", "java", relativeJavaPath)),
-				builder.Output.GetIntermediaryPath (Path.Combine ("typemap", "linked-java", relativeJavaPath)),
-			}.FirstOrDefault (File.Exists);
-			Assert.IsNotNull (javaPath, $"{runtime}/{typeMapImplementation} should preserve the supplementary Java source path.");
-			StringAssert.Contains ("public class \U00010428Peer\U00010400", File.ReadAllText (javaPath));
-
-			var classFile = builder.Output.GetIntermediaryPath (
-				Path.Combine ("android", "bin", "classes", relativeJavaPath.Replace (".java", ".class")));
-			FileAssert.Exists (classFile, "javac should accept the supplementary Java identifier.");
-
-			var acwMap = builder.Output.GetIntermediaryPath ("acw-map.txt");
-			StringAssert.Contains (
-				"UnnamedProject.SupplementaryJavaIdentifier;com.example.\U00010428Peer\U00010400",
-				File.ReadAllText (acwMap));
-
-			var dexFile = builder.Output.GetIntermediaryPath (Path.Combine ("android", "bin", "classes.dex"));
-			Assert.IsTrue (
-				DexUtils.ContainsClass ($"L{javaName};", dexFile, AndroidSdkPath),
-				"llvm-ir should preserve the exact supplementary descriptor even though Android cannot load it.");
+			Assert.IsFalse (builder.Build (proj), $"{runtime} should reject the unsupported supplementary Java identifier.");
+			StringAssertEx.Contains ("error XA4258", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\U00010428Peer\U00010400", builder.LastBuildOutput);
+			AssertNoUnicodeOutputs (builder, "\U00010428Peer\U00010400");
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "JAVAC0000")]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "XA4258")]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "XA4258")]
-		public void Build_InvalidOrUnsupportedUnicodeIdentifiers_ReportDiagnosticWithoutTrimmableOutputs (
-			string typeMapImplementation,
-			AndroidRuntime runtime,
-			string expectedCode)
+		[TestCase (AndroidRuntime.CoreCLR)]
+		[TestCase (AndroidRuntime.NativeAOT)]
+		public void Build_InvalidOrUnsupportedUnicodeIdentifiers_ReportDiagnosticWithoutTrimmableOutputs (AndroidRuntime runtime)
 		{
 			bool isRelease = runtime == AndroidRuntime.NativeAOT;
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
 				return;
 			}
-			bool isTrimmable = typeMapImplementation == "trimmable";
-
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
 			};
 			proj.SetRuntime (runtime);
-			proj.SetProperty ("AndroidTypeMapImplementation", typeMapImplementation);
 			string projectSource = """
 				using Android.Runtime;
 
@@ -224,35 +161,31 @@ public class InvalidCombiningStart : Java.Lang.Object
 				{
 					public InvalidCombiningStart () { }
 				}
-				""";
-			if (isTrimmable) {
-				projectSource += """
 
-					[Register ("com/e\u0301xample/Cafe\u0301")]
-					public class UnsupportedCombiningMark : Java.Lang.Object
-					{
-						public UnsupportedCombiningMark () { }
-					}
+				[Register ("com/e\u0301xample/Cafe\u0301")]
+				public class UnsupportedCombiningMark : Java.Lang.Object
+				{
+					public UnsupportedCombiningMark () { }
+				}
 
-					[Register ("com/example/A\u0cf3")]
-					public class Unicode15CombiningMark : Java.Lang.Object
-					{
-						public Unicode15CombiningMark () { }
-					}
+				[Register ("com/example/A\u0cf3")]
+				public class Unicode15CombiningMark : Java.Lang.Object
+				{
+					public Unicode15CombiningMark () { }
+				}
 
-					[Register ("com/example/\u1c89Peer")]
-					public class NewerUnicodeLetter : Java.Lang.Object
-					{
-						public NewerUnicodeLetter () { }
-					}
+				[Register ("com/example/\u1c89Peer")]
+				public class NewerUnicodeLetter : Java.Lang.Object
+				{
+					public NewerUnicodeLetter () { }
+				}
 
-					[Register ("com/example/\u212bPeer")]
-					public class NonNfcIdentifier : Java.Lang.Object
-					{
-						public NonNfcIdentifier () { }
-					}
-					""";
-			}
+				[Register ("com/example/\u212bPeer")]
+				public class NonNfcIdentifier : Java.Lang.Object
+				{
+					public NonNfcIdentifier () { }
+				}
+				""";
 			proj.Sources.Add (new BuildItem.Source ("InvalidUnicodeIdentifiers.cs") {
 				TextContent = () => projectSource,
 			});
@@ -261,45 +194,25 @@ public NonNfcIdentifier () { }
 			builder.ThrowOnBuildFailure = false;
 			Assert.IsFalse (
 				builder.Build (proj),
-				$"{runtime}/{typeMapImplementation} should reject invalid or unsupported Java identifiers.");
-			StringAssertEx.Contains ($"error {expectedCode}", builder.LastBuildOutput);
-
-			if (isTrimmable) {
-				StringAssertEx.Contains ("1Peer", builder.LastBuildOutput);
-				StringAssertEx.Contains ("\u0301Peer", builder.LastBuildOutput);
-				StringAssertEx.Contains ("e\u0301xample", builder.LastBuildOutput);
-				StringAssertEx.Contains ("A\u0cf3", builder.LastBuildOutput);
-				StringAssertEx.Contains ("\u1c89Peer", builder.LastBuildOutput);
-				StringAssertEx.Contains ("\u212bPeer", builder.LastBuildOutput);
-				AssertNoUnicodeOutputs (builder, "1Peer");
-				AssertNoUnicodeOutputs (builder, "\u0301Peer");
-				AssertNoUnicodeOutputs (builder, "Cafe\u0301");
-				AssertNoUnicodeOutputs (builder, "A\u0cf3");
-				AssertNoUnicodeOutputs (builder, "\u1c89Peer");
-				AssertNoUnicodeOutputs (builder, "\u212bPeer");
-				return;
-			}
-
-			foreach (var javaName in new [] {
-				"com/example/1Peer",
-				"com/example/\u0301Peer",
-			}) {
-				var relativePath = (javaName + ".java").Replace ('/', Path.DirectorySeparatorChar);
-				var javaPath = builder.Output.GetIntermediaryPath (Path.Combine ("android", "src", relativePath));
-				FileAssert.Exists (javaPath, $"llvm-ir should reach javac with '{javaName}'.");
-				var source = File.ReadAllText (javaPath);
-				StringAssert.Contains ($"public class {javaName.Substring (javaName.LastIndexOf ('/') + 1)}", source);
-			}
+				$"{runtime} should reject invalid or unsupported Java identifiers.");
+			StringAssertEx.Contains ("error XA4258", builder.LastBuildOutput);
+			StringAssertEx.Contains ("1Peer", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\u0301Peer", builder.LastBuildOutput);
+			StringAssertEx.Contains ("e\u0301xample", builder.LastBuildOutput);
+			StringAssertEx.Contains ("A\u0cf3", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\u1c89Peer", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\u212bPeer", builder.LastBuildOutput);
+			AssertNoUnicodeOutputs (builder, "1Peer");
+			AssertNoUnicodeOutputs (builder, "\u0301Peer");
+			AssertNoUnicodeOutputs (builder, "Cafe\u0301");
+			AssertNoUnicodeOutputs (builder, "A\u0cf3");
+			AssertNoUnicodeOutputs (builder, "\u1c89Peer");
+			AssertNoUnicodeOutputs (builder, "\u212bPeer");
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, true, false)]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, false, true)]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, false, true)]
-		public void Build_CanonicallyEquivalentJavaNames_DoNotOverwriteOutputs (
-			string typeMapImplementation,
-			AndroidRuntime runtime,
-			bool shouldSucceed,
-			bool expectNoOutputs)
+		[TestCase (AndroidRuntime.CoreCLR)]
+		[TestCase (AndroidRuntime.NativeAOT)]
+		public void Build_CanonicallyEquivalentJavaNames_DoNotOverwriteOutputs (AndroidRuntime runtime)
 		{
 			bool isRelease = runtime == AndroidRuntime.NativeAOT;
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
@@ -310,7 +223,6 @@ public void Build_CanonicallyEquivalentJavaNames_DoNotOverwriteOutputs (
 				IsRelease = isRelease,
 			};
 			proj.SetRuntime (runtime);
-			proj.SetProperty ("AndroidTypeMapImplementation", typeMapImplementation);
 			proj.Sources.Add (new BuildItem.Source ("CanonicalJavaIdentifiers.cs") {
 				TextContent = () => """
 					using Android.Runtime;
@@ -333,83 +245,24 @@ public CanonicalEquivalentIdentifier () { }
 
 			using var builder = CreateApkBuilder ();
 			builder.ThrowOnBuildFailure = false;
-			Assert.AreEqual (
-				shouldSucceed,
-				builder.Build (proj),
-				$"{runtime}/{typeMapImplementation} should match canonical-equivalent Java output behavior.");
-
-			if (expectNoOutputs) {
-				StringAssertEx.Contains ("error XA4258", builder.LastBuildOutput);
-				StringAssertEx.Contains ("\u212bPeer", builder.LastBuildOutput);
-				AssertNoUnicodeOutputs (builder, "\u00c5Peer");
-				AssertNoUnicodeOutputs (builder, "\u212bPeer");
-				return;
-			}
-
-			var javaDirectory = builder.Output.GetIntermediaryPath (
-				Path.Combine ("android", "src", "com", "example"));
-			if (!CanonicalEquivalentPathsAlias (javaDirectory)) {
-				return;
-			}
-			var javaFile = AssertSingleFile (javaDirectory, "*Peer.java");
-			StringAssert.Contains ("public class \u212bPeer", File.ReadAllText (javaFile));
-
-			var classDirectory = builder.Output.GetIntermediaryPath (
-				Path.Combine ("android", "bin", "classes", "com", "example"));
-			AssertSingleFile (classDirectory, "*Peer.class");
-
-			var acwMap = File.ReadAllText (builder.Output.GetIntermediaryPath ("acw-map.txt"));
-			StringAssert.Contains ("UnnamedProject.ComposedIdentifier;com.example.\u00c5Peer", acwMap);
-			StringAssert.Contains ("UnnamedProject.CanonicalEquivalentIdentifier;com.example.\u212bPeer", acwMap);
-
-			var dexFile = builder.Output.GetIntermediaryPath (Path.Combine ("android", "bin", "classes.dex"));
-			Assert.IsFalse (DexUtils.ContainsClass ("Lcom/example/\u00c5Peer;", dexFile, AndroidSdkPath));
-			Assert.IsTrue (DexUtils.ContainsClass ("Lcom/example/\u212bPeer;", dexFile, AndroidSdkPath));
-
-			static string AssertSingleFile (string directory, string pattern)
-			{
-				var files = Directory.GetFiles (directory, pattern, SearchOption.TopDirectoryOnly);
-				Assert.AreEqual (
-					1,
-					files.Length,
-					"APFS should expose the canonical-equivalent llvm-ir paths as one overwritten file.");
-				return files [0];
-			}
-
-			static bool CanonicalEquivalentPathsAlias (string directory)
-			{
-				var probeDirectory = Path.Combine (directory, "canonical-path-probe-" + Guid.NewGuid ().ToString ("N"));
-				Directory.CreateDirectory (probeDirectory);
-				try {
-					File.WriteAllText (Path.Combine (probeDirectory, "\u00c5"), "composed");
-					File.WriteAllText (Path.Combine (probeDirectory, "\u212b"), "equivalent");
-					return Directory.GetFiles (probeDirectory).Length == 1;
-				} finally {
-					foreach (var file in Directory.GetFiles (probeDirectory)) {
-						File.Delete (file);
-					}
-					Directory.Delete (probeDirectory);
-				}
-			}
-		}
-
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "parameters", "XA4205")]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "parameters", "XA4205")]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "parameters", "XA4205")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "void", "XA4208")]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "void", "XA4208")]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "void", "XA4208")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic", "XA4207")]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic", "XA4207")]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic", "XA4207")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "parameters-and-void", "XA4205")]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "parameters-and-void", "XA4205")]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "parameters-and-void", "XA4205")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic-parameters-and-void", "XA4207")]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic-parameters-and-void", "XA4207")]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic-parameters-and-void", "XA4207")]
+			Assert.IsFalse (builder.Build (proj), $"{runtime} should reject canonical-equivalent Java names.");
+			StringAssertEx.Contains ("error XA4258", builder.LastBuildOutput);
+			StringAssertEx.Contains ("\u212bPeer", builder.LastBuildOutput);
+			AssertNoUnicodeOutputs (builder, "\u00c5Peer");
+			AssertNoUnicodeOutputs (builder, "\u212bPeer");
+		}
+
+		[TestCase (AndroidRuntime.CoreCLR, "parameters", "XA4205")]
+		[TestCase (AndroidRuntime.NativeAOT, "parameters", "XA4205")]
+		[TestCase (AndroidRuntime.CoreCLR, "void", "XA4208")]
+		[TestCase (AndroidRuntime.NativeAOT, "void", "XA4208")]
+		[TestCase (AndroidRuntime.CoreCLR, "generic", "XA4207")]
+		[TestCase (AndroidRuntime.NativeAOT, "generic", "XA4207")]
+		[TestCase (AndroidRuntime.CoreCLR, "parameters-and-void", "XA4205")]
+		[TestCase (AndroidRuntime.NativeAOT, "parameters-and-void", "XA4205")]
+		[TestCase (AndroidRuntime.CoreCLR, "generic-parameters-and-void", "XA4207")]
+		[TestCase (AndroidRuntime.NativeAOT, "generic-parameters-and-void", "XA4207")]
 		public void Build_InvalidExportField_ReportsLegacyDiagnostic (
-			string typeMapImplementation,
 			AndroidRuntime runtime,
 			string invalidShape,
 			string expectedCode)
@@ -427,46 +280,40 @@ public void Build_InvalidExportField_ReportsLegacyDiagnostic (
 				"generic-parameters-and-void" => "public void InitialValue (int value) { }",
 				_ => throw new InvalidOperationException ($"Unknown invalid [ExportField] shape '{invalidShape}'."),
 			};
-			var proj = CreateExportFieldValidationProject (runtime, typeMapImplementation, $"""
+			var proj = CreateExportFieldValidationProject (runtime, $"""
 						[ExportField ("VALUE")]
 						{initializer}
 				""", genericType: invalidShape.StartsWith ("generic", StringComparison.Ordinal));
 
 			using var builder = CreateApkBuilder ();
 			builder.ThrowOnBuildFailure = false;
-			Assert.IsFalse (builder.Build (proj), $"{runtime}/{typeMapImplementation} should reject {invalidShape} [ExportField] initializers.");
+			Assert.IsFalse (builder.Build (proj), $"{runtime} should reject {invalidShape} [ExportField] initializers.");
 			StringAssertEx.Contains ($"error {expectedCode}", builder.LastBuildOutput, $"The build should report {expectedCode}.");
 			if (invalidShape == "parameters-and-void") {
 				Assert.IsFalse (
 					builder.LastBuildOutput.Any (line => line.Contains ("error XA4208", StringComparison.Ordinal)),
-					"XA4205 should take precedence over XA4208, matching LLVM-IR."
+					"XA4205 should take precedence over XA4208."
 				);
 			} else if (invalidShape == "generic-parameters-and-void") {
 				Assert.IsFalse (
 					builder.LastBuildOutput.Any (line =>
 						line.Contains ("error XA4205", StringComparison.Ordinal) ||
 						line.Contains ("error XA4208", StringComparison.Ordinal)),
-					"XA4207 should take precedence over initializer signature diagnostics, matching LLVM-IR."
+					"XA4207 should take precedence over initializer signature diagnostics."
 				);
 			}
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "arbitrary-parameter", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "arbitrary-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "arbitrary-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "arbitrary-return", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "arbitrary-return", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "arbitrary-return", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "arbitrary-field", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "arbitrary-field", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "arbitrary-field", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic-parameter", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic-instantiation", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic-instantiation", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic-instantiation", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "function-pointer", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "function-pointer", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "function-pointer", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "by-ref-parameter", "XA4263")]
@@ -475,49 +322,34 @@ public void Build_InvalidExportField_ReportsLegacyDiagnostic (
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "pointer-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "rectangular-array-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "rectangular-array-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic-declaring-type", "XA4206")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic-declaring-type", "XA4206")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic-declaring-type", "XA4206")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "mismatched-export-parameter", "XALNS7004")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "mismatched-export-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "mismatched-export-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic-export-parameter", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic-export-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic-export-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "function-pointer-export-parameter", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "function-pointer-export-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "function-pointer-export-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "mismatched-field-export-parameter", "XALNS7004")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "mismatched-field-export-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "mismatched-field-export-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "special-array-parameter", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "special-array-parameter", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "special-array-parameter", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "special-array-return", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "special-array-return", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "special-array-return", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "special-array-field", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "special-array-field", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "special-array-field", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "special-xml-array-return", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "special-xml-array-return", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "special-xml-array-return", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "export-static-constructor", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "export-static-constructor", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "export-static-constructor", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "export-constructor-arbitrary", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "export-constructor-arbitrary", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "export-constructor-arbitrary", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "export-constructor-invalid-kind", "XALNS7004")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "export-constructor-invalid-kind", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "export-constructor-invalid-kind", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "export-constructor-valid-kind", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "export-constructor-valid-kind", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "export-constructor-valid-kind", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "export-named-constructor-arbitrary", "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "export-named-constructor-arbitrary", "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "export-named-constructor-arbitrary", "XA4263")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "export-named-constructor-valid-kind", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "export-named-constructor-valid-kind", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "export-named-constructor-valid-kind", "success")]
 		public void Build_ExportSignature_MatchesRuntimeClassification (
@@ -759,7 +591,7 @@ public SignaturePeer () {
 			builder.ThrowOnBuildFailure = false;
 			var succeeded = builder.Build (proj);
 			if (expectedCode == "success") {
-				Assert.IsTrue (succeeded, $"{runtime}/{typeMapImplementation} should retain legacy build support for {invalidShape}.");
+				Assert.IsTrue (succeeded, $"{runtime}/{typeMapImplementation} should support {invalidShape}.");
 				return;
 			}
 
@@ -885,7 +717,6 @@ public SpecialMappingLookalikePeer (
 
 		static XamarinAndroidApplicationProject CreateExportFieldValidationProject (
 			AndroidRuntime runtime,
-			string typeMapImplementation,
 			string members,
 			bool genericType = false)
 		{
@@ -897,7 +728,6 @@ static XamarinAndroidApplicationProject CreateExportFieldValidationProject (
 				},
 			};
 			proj.SetRuntime (runtime);
-			proj.SetProperty ("AndroidTypeMapImplementation", typeMapImplementation);
 			proj.Sources.Add (new BuildItem.Source ("ExportFieldValidation.cs") {
 				TextContent = () => $$"""
 					using Android.Runtime;
@@ -924,22 +754,18 @@ public void FindExportOutputs_FindsEveryArtifactKind ()
 			var typemapDirectory = Path.Combine (root, "typemap");
 			var acwMapFile = Path.Combine (root, "acw-map.txt");
 			var trimmableJavaDirectory = Path.Combine (typemapDirectory, "java", "com", "example");
-			var llvmIrJavaDirectory = Path.Combine (root, "android", "src", "com", "example");
 			Directory.CreateDirectory (trimmableJavaDirectory);
-			Directory.CreateDirectory (llvmIrJavaDirectory);
 
 			var expected = new [] {
 				Path.Combine (typemapDirectory, "_Example.TypeMap.dll"),
 				Path.Combine (typemapDirectory, "_Microsoft.Android.TypeMaps.dll"),
 				acwMapFile,
 				Path.Combine (trimmableJavaDirectory, "TrimmablePeer.java"),
-				Path.Combine (llvmIrJavaDirectory, "LlvmIrPeer.java"),
 			};
 			File.WriteAllBytes (expected [0], []);
 			File.WriteAllBytes (expected [1], []);
 			File.WriteAllText (expected [2], "Managed, Assembly;com/example/Peer");
 			File.WriteAllText (expected [3], "public int VALUE = InitialValue ();");
-			File.WriteAllText (expected [4], "public int VALUE = InitialValue ();");
 
 			CollectionAssert.AreEquivalent (
 				expected,
@@ -984,7 +810,6 @@ static string [] FindExportOutputs (string typemapDirectory, string acwMapFile,
 			return outputs.ToArray ();
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "JAVAC0000", "JAVAC0000")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "XA4262", "XA4258")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "XA4262", "XA4258")]
 		public void Build_IndependentConstructorAndJavaNameDiagnostics_AreBothReported (
@@ -1030,15 +855,9 @@ public class ReservedName : Java.Lang.Object { }
 			Assert.IsFalse (builder.Build (proj), $"{runtime}/{typeMapImplementation} should report both independent errors.");
 			StringAssertEx.Contains ($"error {constructorCode}", builder.LastBuildOutput);
 			StringAssertEx.Contains ($"error {javaNameCode}", builder.LastBuildOutput);
-			if (typeMapImplementation == "trimmable") {
-				AssertNoExportOutputs (builder, "InvalidConstructor");
-			} else {
-				StringAssertEx.Contains ("InvalidConstructor.java", builder.LastBuildOutput);
-				StringAssertEx.Contains ("for.java", builder.LastBuildOutput);
-			}
+			AssertNoExportOutputs (builder, "InvalidConstructor");
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "XALNS7003")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "success")]
 		public void Build_ExplicitExportConstructorAttributeOrders_MatchLegacyPipeline (
@@ -1089,12 +908,11 @@ public ExportFirst (uint value) { }
 			if (expectedCode == "success") {
 				Assert.IsTrue (succeeded, $"{runtime}/{typeMapImplementation} should preserve explicit constructor metadata.");
 			} else {
-				Assert.IsFalse (succeeded, $"{runtime}/{typeMapImplementation} should retain measured legacy validation.");
+				Assert.IsFalse (succeeded, $"{runtime}/{typeMapImplementation} should reject the unsupported constructor metadata.");
 				StringAssertEx.Contains ($"error {expectedCode}", builder.LastBuildOutput);
 			}
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT)]
 		public void Build_ImplicitConstructorUsesCompatibleBaseJniSignature (string typeMapImplementation, AndroidRuntime runtime)
@@ -1136,49 +954,35 @@ public IntBase (int value) {}
 			});
 
 			using var builder = CreateApkBuilder ();
-			Assert.IsTrue (builder.Build (proj), $"{runtime}/{typeMapImplementation} should match legacy JNI base compatibility.");
+			Assert.IsTrue (builder.Build (proj), $"{runtime}/{typeMapImplementation} should use a compatible JNI base constructor.");
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "lambda", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "lambda", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "lambda", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "parenthesized-lambda", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "parenthesized-lambda", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "parenthesized-lambda", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "typed-lambda", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "typed-lambda", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "typed-lambda", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "literal-comma", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "literal-comma", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "literal-comma", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "method-reference", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "method-reference", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "method-reference", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic-method-reference", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic-method-reference", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic-method-reference", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "generic-construction", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "generic-construction", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "generic-construction", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "nested-generic", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "nested-generic", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "nested-generic", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "instanceof-generic", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "instanceof-generic", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "instanceof-generic", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "comparison", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "comparison", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "comparison", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "shift", "success")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "shift", "success")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "shift", "success")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "ordinary-bare", "JAVAC0000")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "ordinary-bare", "XA4262")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "ordinary-bare", "XA4262")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "ordinary-call", "JAVAC0000")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "ordinary-call", "XA4262")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "ordinary-call", "XA4262")]
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "ordinary-arithmetic", "JAVAC0000")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "ordinary-arithmetic", "XA4262")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "ordinary-arithmetic", "XA4262")]
 		public void Build_SuperArgumentsLambdaAndMethodReference_MatchJavac (
@@ -1277,13 +1081,10 @@ public static class SimpleEntry<K, V> extends java.util.AbstractMap.SimpleEntry<
 			} else {
 				Assert.IsFalse (succeeded, $"{runtime}/{typeMapImplementation} should reject the bare p1 reference.");
 				StringAssertEx.Contains ($"error {expectedCode}", builder.LastBuildOutput);
-				if (typeMapImplementation == "trimmable") {
-					AssertNoExportOutputs (builder, "SuperArgumentsPeer");
-				}
+				AssertNoExportOutputs (builder, "SuperArgumentsPeer");
 			}
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, "XALNS7004")]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR, "XA4263")]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT, "XA4263")]
 		public void Build_UnsupportedExportConstructorOverloads_ReportOnlyExportDiagnostics (
@@ -1339,25 +1140,21 @@ public UnsupportedExportConstructorOverloads (
 			builder.ThrowOnBuildFailure = false;
 			Assert.IsFalse (builder.Build (proj), $"{runtime}/{typeMapImplementation} should reject unsupported exported constructors.");
 			StringAssertEx.Contains ($"error {expectedCode}", builder.LastBuildOutput);
-			if (typeMapImplementation == "trimmable") {
-				StringAssertEx.Contains ("unsupported signature type 'UnnamedProject.UnsupportedOne'", builder.LastBuildOutput);
-				StringAssertEx.Contains ("unsupported signature type 'UnnamedProject.UnsupportedTwo'", builder.LastBuildOutput);
-				Assert.IsFalse (builder.LastBuildOutput.Any (line =>
-					line.Contains ("Type 'UnnamedProject.UnsupportedExportConstructorOverloads'", StringComparison.Ordinal) &&
-					(line.Contains ("error XA4259", StringComparison.Ordinal) ||
-					 line.Contains ("error XA4260", StringComparison.Ordinal) ||
-					 line.Contains ("error XA4261", StringComparison.Ordinal))));
-			}
+			StringAssertEx.Contains ("unsupported signature type 'UnnamedProject.UnsupportedOne'", builder.LastBuildOutput);
+			StringAssertEx.Contains ("unsupported signature type 'UnnamedProject.UnsupportedTwo'", builder.LastBuildOutput);
+			Assert.IsFalse (builder.LastBuildOutput.Any (line =>
+				line.Contains ("Type 'UnnamedProject.UnsupportedExportConstructorOverloads'", StringComparison.Ordinal) &&
+				(line.Contains ("error XA4259", StringComparison.Ordinal) ||
+				 line.Contains ("error XA4260", StringComparison.Ordinal) ||
+				 line.Contains ("error XA4261", StringComparison.Ordinal))));
 			AssertNoExportOutputs (builder, "UnsupportedExportConstructorOverloads");
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR, true)]
-		[TestCase ("trimmable", AndroidRuntime.CoreCLR, false)]
-		[TestCase ("trimmable", AndroidRuntime.NativeAOT, false)]
-		public void Build_WithCollidingConstructorSignatures_MatchesLegacyCount (
+		[TestCase ("trimmable", AndroidRuntime.CoreCLR)]
+		[TestCase ("trimmable", AndroidRuntime.NativeAOT)]
+		public void Build_WithCollidingConstructorSignatures_ReportsXA4259 (
 			string typeMapImplementation,
-			AndroidRuntime runtime,
-			bool shouldSucceed)
+			AndroidRuntime runtime)
 		{
 			bool isRelease = runtime == AndroidRuntime.NativeAOT;
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
@@ -1387,11 +1184,7 @@ public ConstructorCollision (Kind value) { }
 
 			using var builder = CreateApkBuilder ();
 			builder.ThrowOnBuildFailure = false;
-			Assert.AreEqual (shouldSucceed, builder.Build (proj), $"{runtime}/{typeMapImplementation} should match legacy collision behavior.");
-			if (shouldSucceed) {
-				Assert.IsFalse (builder.LastBuildOutput.Any (line => line.Contains ("error XA4259", StringComparison.Ordinal)));
-				return;
-			}
+			Assert.IsFalse (builder.Build (proj), $"{runtime}/{typeMapImplementation} should reject colliding constructor signatures.");
 			StringAssertEx.Contains ("error XA4259", builder.LastBuildOutput);
 
 			var typemapDirectory = builder.Output.GetIntermediaryPath ("typemap");
diff --git a/tests/MSBuildDeviceIntegration/Tests/FastTimingTests.cs b/tests/MSBuildDeviceIntegration/Tests/FastTimingTests.cs
index f1c048a864f..a17287d45ee 100644
--- a/tests/MSBuildDeviceIntegration/Tests/FastTimingTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/FastTimingTests.cs
@@ -12,10 +12,9 @@ namespace Xamarin.Android.Build.Tests;
 public class FastTimingTests : DeviceTest
 {
 	[Test]
-	public void ConcurrentEventsCanGrowAndDump ()
+	public void TimingEventsCanDump ()
 	{
 		const string completedMessage = "FAST_TIMING_EVENTS_COMPLETED";
-		const string bufferGrowthMessage = "Allocated timing event buffer from 4096 to 8192";
 		const string dumpCompletedMessage = "[2/8] Assembly decompression";
 		const string timingFileName = "fast-timing.txt";
 
@@ -27,22 +26,11 @@ public void ConcurrentEventsCanGrowAndDump ()
 		var proj = new XamarinAndroidApplicationProject (packageName: packageName);
 		proj.SetRuntime (AndroidRuntime.CoreCLR);
 		proj.SetRuntimeIdentifiers ([DeviceAbi]);
-		proj.SetProperty ("AndroidTypeMapImplementation", "llvm-ir");
 		proj.SetProperty ("_AndroidFastTiming", "True");
 		proj.SetDefaultTargetDevice ();
-		proj.MainActivity = proj.DefaultMainActivity
-			.Replace ("//${USINGS}", "using System.Threading.Tasks;")
-			.Replace (
-				"//${AFTER_ONCREATE}",
-				$$"""
-			Parallel.For (0, 8, _ => {
-				for (int i = 0; i < 1024; i++) {
-					Android.Runtime.JNIEnv.GetJniName (typeof (MainActivity));
-				}
-			});
-			Android.Util.Log.Info ("FastTimingTest", "{{completedMessage}}");
-"""
-			);
+		proj.MainActivity = proj.DefaultMainActivity.Replace (
+			"//${AFTER_ONCREATE}",
+			$"Android.Util.Log.Info (\"FastTimingTest\", \"{completedMessage}\");");
 
 		using var builder = CreateApkBuilder (packageName: packageName);
 		Assert.IsTrue (builder.Install (proj), "Project should have installed.");
@@ -54,19 +42,14 @@ public void ConcurrentEventsCanGrowAndDump ()
 			RunAdbCommand ($"shell setprop debug.dotnet.timing to-file,filename={timingFileName}");
 			ClearAdbLogcat ();
 
-			bool sawBufferGrowth = false;
 			bool appCompleted = MonitorAdbLogcat (
-				line => {
-					sawBufferGrowth |= line.Contains (bufferGrowthMessage, StringComparison.Ordinal);
-					return line.Contains (completedMessage, StringComparison.Ordinal);
-				},
+				line => line.Contains (completedMessage, StringComparison.Ordinal),
 				Path.Combine (Root, builder.ProjectDirectory, "fast-timing-events.log"),
 				timeout: 60,
 				onMonitoringStarted: () => StartActivityAndAssert (proj)
 			);
 
 			Assert.IsTrue (appCompleted, $"Output did not contain {completedMessage}.");
-			Assert.IsTrue (sawBufferGrowth, $"Output did not contain {bufferGrowthMessage}.");
 
 			RunAdbCommand ($"shell run-as {proj.PackageName} rm -f cache/{timingFileName}");
 			RunAdbCommand (
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 803a2f87f2b..950367aace0 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -36,11 +36,6 @@ static IEnumerable<object[]> Get_DotNetRun_Data ()
 		{
 			var ret = new List<object[]> ();
 
-			foreach (AndroidRuntime runtime in new[] { AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT }) {
-				AddTestData (true, "llvm-ir", runtime);
-				AddTestData (false, "llvm-ir", runtime);
-			}
-
 			AddTestData (true, "trimmable", AndroidRuntime.CoreCLR);
 			AddTestData (false, "trimmable", AndroidRuntime.CoreCLR);
 			AddTestData (true, "trimmable", AndroidRuntime.NativeAOT);
@@ -65,10 +60,6 @@ public void DotNetRun (bool isRelease, string typemapImplementation, AndroidRunt
 				return;
 			}
 
-			if (runtime == AndroidRuntime.NativeAOT && typemapImplementation == "llvm-ir") {
-				Assert.Ignore ("NativeAOT doesn't work with LLVM-IR typemaps");
-			}
-
 			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease
 			};
@@ -108,7 +99,6 @@ public void CoreCLRAssemblyNameWithNativeImageSuffix ()
 			StartActivityAndAssert (proj);
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT)]
 		public void UnicodeJavaIdentifierActivityActivates (string typeMapImplementation, AndroidRuntime runtime)
@@ -1774,7 +1764,6 @@ public MyLayout (Android.Content.Context context, Android.Util.IAttributeSet att
 			Assert.IsTrue (didStart, "Activity should have started.");
 		}
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT)]
 		public void AppCompatJavaAliasCastsAndInflation (
@@ -2029,7 +2018,7 @@ public AppCompatImageButtonAlias (IntPtr handle, JniHandleOwnership transfer)
 				}
 				""".Replace (
 					"__ALLOW_REGISTERED_ALIAS_INFLATION__",
-					typemapImplementation == "llvm-ir" ? "true" : "false");
+					"false");
 			using var builder = CreateApkBuilder (packageName: packageName);
 			Assert.AreEqual (proj.PackageName, TestPackageNames [packageName], "Teardown should track the installed package.");
 			RunAdbCommand ($"uninstall {proj.PackageName}");
@@ -2525,15 +2514,13 @@ public void TypeAndMemberRemapping ([Values] bool isRelease, [Values (AndroidRun
 
 		static IEnumerable<TestCaseData> GetInterfaceMethodDesugaringData ()
 		{
-			foreach (var typemapImplementation in new [] { "llvm-ir", "trimmable" }) {
-				foreach (var useR8 in new [] { false, true }) {
-					foreach (var apiNative in new [] { true, false }) {
-						yield return CreateTestCase (
-							typemapImplementation,
-							AndroidRuntime.CoreCLR,
-							apiNative,
-							useR8);
-					}
+			foreach (var useR8 in new [] { false, true }) {
+				foreach (var apiNative in new [] { true, false }) {
+					yield return CreateTestCase (
+						"trimmable",
+						AndroidRuntime.CoreCLR,
+						apiNative,
+						useR8);
 				}
 			}
 
diff --git a/tests/MSBuildDeviceIntegration/Tests/WebViewJavascriptInterfaceTests.cs b/tests/MSBuildDeviceIntegration/Tests/WebViewJavascriptInterfaceTests.cs
index f6e5c8427e8..42f97cfedf8 100644
--- a/tests/MSBuildDeviceIntegration/Tests/WebViewJavascriptInterfaceTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/WebViewJavascriptInterfaceTests.cs
@@ -15,7 +15,6 @@ public class WebViewJavascriptInterfaceTests : DeviceTest
 		const string SuccessMarker = "# JAVASCRIPT_INTERFACE_RESULT ";
 		const string FailureMarker = "# JAVASCRIPT_INTERFACE_FAILURE ";
 
-		[TestCase ("llvm-ir", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.CoreCLR)]
 		[TestCase ("trimmable", AndroidRuntime.NativeAOT)]
 		public void LocalJavascriptInvokesManagedBridge (string typemapImplementation, AndroidRuntime runtime)

From 6caa22e6c4b720546166eee4b71ab338692136c4 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 08:54:30 +0200
Subject: [PATCH 19/58] Remove legacy native typemap runtime support

Keep trimmable managed mapping and JNI registration while dropping unused native typemap symbols, startup callbacks, and generated compatibility stubs.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/app-bundles.md           |   4 +-
 .../guides/internals/JavaJNI_Interop.md       |   5 +
 .../JavaInteropRuntime.cs                     |   2 +-
 .../Java.Interop/JreRuntime.cs                |   5 +-
 .../PreserveLists/Mono.Android.xml            |   2 -
 .../Android.Runtime/AndroidRuntime.cs         | 316 +----------
 src/Mono.Android/Android.Runtime/JNIEnv.cs    |  64 +--
 .../Android.Runtime/JNIEnvInit.cs             |  94 +--
 .../Android.Runtime/RuntimeNativeMethods.cs   |   9 -
 src/Mono.Android/Java.Interop/JavaConvert.cs  |  21 +-
 src/Mono.Android/Java.Interop/TypeManager.cs  | 420 +-------------
 .../JavaMarshalValueManager.cs                | 151 -----
 .../RuntimeFeature.cs                         |  10 -
 .../TrimmableTypeMap.cs                       |   4 +-
 .../TrimmableTypeMapValueManager.cs           |   4 +-
 src/Mono.Android/Mono.Android.csproj          |   1 -
 .../java/mono/android/TypeManager.java        |  20 -
 .../Microsoft.Android.Sdk.CoreCLR.targets     |   4 -
 ...soft.Android.Sdk.TypeMap.Trimmable.targets |  26 +-
 .../Tasks/BuildAppBundle.cs                   |   2 -
 .../Tasks/GenerateEmptyTypemapStub.cs         |  84 ---
 .../GenerateNativeApplicationConfigSources.cs |  25 +-
 .../GenerateNativeMarshalMethodSources.cs     | 183 ------
 .../GenerateNativeRuntimeLinkingSources.cs    | 113 ++++
 .../Tasks/PrepareAbiItems.cs                  |   3 -
 .../Xamarin.Android.Build.Tests/BuildTest2.cs |  10 -
 .../IncrementalBuildTest.cs                   |  15 +-
 ...rateNativeApplicationConfigSourcesTests.cs |   4 +
 .../Tasks/LlvmIrGeneratorTests.cs             |  20 -
 .../Utilities/EnvironmentHelper.cs            |  51 +-
 .../Utilities/ApplicationConfig.cs            |   2 -
 ...pplicationConfigNativeAssemblyGenerator.cs |   4 -
 .../MarshalMethodsNativeAssemblyGenerator.cs  |  80 ---
 .../Xamarin.Android.Common.targets            |  27 +-
 src/native/clr/host/CMakeLists.txt            |   1 -
 src/native/clr/host/host.cc                   |  27 +-
 src/native/clr/host/internal-pinvokes-clr.cc  |  19 -
 .../clr/host/internal-pinvokes-shared.cc      |   1 -
 src/native/clr/host/typemap.cc                | 533 ------------------
 src/native/clr/include/host/host.hh           |   2 -
 src/native/clr/include/host/typemap.hh        |  40 --
 .../include/runtime-base/internal-pinvokes.hh |   2 -
 src/native/clr/include/xamarin-app.hh         |  87 ---
 .../clr/pinvoke-override/precompiled.cc       |   6 -
 .../xamarin-app-stub/application_dso_stub.cc  |  39 --
 .../common/include/managed-interface.hh       |   3 -
 .../common/runtime-base/timing-internal.cc    |  12 -
 .../nativeaot/host/internal-pinvoke-stubs.cc  |  16 -
 .../include/runtime-base/internal-pinvokes.hh |   2 -
 .../Android.Runtime/JnienvArrayMarshaling.cs  |   9 -
 .../ActivationConstructorCacheTests.cs        | 251 ---------
 .../ConstructorActivationTests.cs             | 212 +------
 .../Java.Interop/ExportTests.cs               |  21 +-
 .../Java.Interop/InvokerActivationTests.cs    |  14 -
 .../Java.Interop/JavaConvertTest.cs           |   8 -
 .../Java.Interop/JnienvTest.cs                |  10 +-
 .../Java.Interop/ManagedObjectProxyTests.cs   |  23 +-
 .../TrimmableTypeMapRuntimeCoverageTests.cs   |  21 -
 .../TrimmableTypeMapTypeManagerTests.cs       |  48 --
 .../Mono.Android.NET-Tests.csproj             |   1 -
 .../TrustManagerMarshallingTests.cs           |  10 -
 .../TestInstrumentation.cs                    |  15 +-
 62 files changed, 206 insertions(+), 3012 deletions(-)
 delete mode 100644 src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs
 delete mode 100644 src/Mono.Android/java/mono/android/TypeManager.java
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
 delete mode 100644 src/native/clr/host/typemap.cc
 delete mode 100644 src/native/clr/include/host/typemap.hh
 delete mode 100644 tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ActivationConstructorCacheTests.cs

diff --git a/Documentation/guides/app-bundles.md b/Documentation/guides/app-bundles.md
index f34b91debc5..0a40cfa6d63 100644
--- a/Documentation/guides/app-bundles.md
+++ b/Documentation/guides/app-bundles.md
@@ -200,14 +200,14 @@ See the [.aab format spec][aab_format] for further detail.
 
 ## BundleConfig.json
 
-Since .NET assemblies and typemap files must remain uncompressed in
+Since .NET assemblies must remain uncompressed in
 .NET for Android apps, we will also need to specify a
 `BundleConfig.json` file:
 
 ```json
 {
   "compression": {
-    "uncompressedGlob": ["typemap.mj", "typemap.jm", "assemblies/*"]
+    "uncompressedGlob": ["assemblies/**"]
   }
 }
 ```
diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 2d6e8c82d72..5226edc2b1d 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,3 +1,8 @@
+> **Historical reference:** This guide describes the removed legacy LLVM IR/native
+> typemap and marshal-method registration pipeline. Current CoreCLR and NativeAOT
+> applications use the generated managed trimmable typemap and its Java callable
+> wrappers instead.
+
 <!--toc:start-->
 - [Introduction](#introduction)
 - [Java <-> Managed interoperability overview](#java-managed-interoperability-overview)
diff --git a/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs b/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs
index 0f51623426a..4f9d6269ffb 100644
--- a/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs
+++ b/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs
@@ -56,7 +56,7 @@ static void init (IntPtr jnienv, IntPtr klass, IntPtr classLoader, IntPtr langua
 			var options = new NativeAotRuntimeOptions {
 				EnvironmentPointer = jnienv,
 				ClassLoader        = new JniObjectReference (classLoader, JniObjectReferenceType.Global),
-				TypeManager        = JNIEnvInit.CreateTypeManager (initArgs),
+				TypeManager        = JNIEnvInit.CreateTypeManager (),
 				ValueManager       = JNIEnvInit.CreateValueManager (),
 			};
 			runtime = options.CreateJreVM ();
diff --git a/src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs b/src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs
index 7e6de55cc6f..d7f50f035b2 100644
--- a/src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs
+++ b/src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -80,11 +79,9 @@ static JniRuntime.JniTypeManager CreateDefaultTypeManager ()
 			return new TrimmableTypeMapTypeManager ();
 		}
 
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "CoreCLR value manager is preserved by the MarkJavaObjects trimmer step.")]
-		[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This value manager won't be used in Native AOT builds in the future.")]
 		static JniRuntime.JniValueManager CreateDefaultValueManager ()
 		{
-			return new JavaMarshalValueManager ();
+			return new TrimmableTypeMapValueManager ();
 		}
 
 		public override string? GetCurrentManagedThreadName ()
diff --git a/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml b/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml
index b16215d73a3..64c49ba0016 100644
--- a/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml
+++ b/src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml
@@ -10,7 +10,6 @@
 		</type>
 		<type fullname="Android.Runtime.JNIEnvInit">
 			<method name="Initialize" />
-			<method name="RegisterJniNatives" />
 		</type>
 		<type fullname="Android.Runtime.JNINativeWrapper" />
 		<type fullname="Android.Runtime.JObjectRefType" />
@@ -30,7 +29,6 @@
 		<type fullname="Android.Runtime.XmlReaderResourceParser" />
 		<type fullname="Android.Runtime.XmlReaderPullParser" />
 		-->
-		<type fullname="Java.Interop.TypeManager*JavaTypeManager" />
 		<type fullname="Java.Lang.AbstractMethodError">
 			<method name=".ctor" />
 		</type>
diff --git a/src/Mono.Android/Android.Runtime/AndroidRuntime.cs b/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
index 6f7231a97ce..aa7aa887010 100644
--- a/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
+++ b/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
@@ -1,16 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Runtime.Versioning;
 using System.Threading;
-using System.Reflection;
 
 using Java.Interop;
-using Java.Interop.Tools.TypeNameMappings;
 using Microsoft.Android.Runtime;
-using System.Diagnostics.CodeAnalysis;
 using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;
 
 #if JAVA_INTEROP
@@ -24,14 +18,12 @@ internal AndroidRuntime (IntPtr jnienv,
 				IntPtr vm,
 				IntPtr classLoader,
 				JniRuntime.JniTypeManager typeManager,
-				JniRuntime.JniValueManager valueManager,
-				bool jniAddNativeMethodRegistrationAttributePresent)
+				JniRuntime.JniValueManager valueManager)
 			: base (new AndroidRuntimeOptions (jnienv,
 					vm,
 					classLoader,
 					typeManager,
-					valueManager,
-					jniAddNativeMethodRegistrationAttributePresent))
+					valueManager))
 		{
 			// This is not ideal, but we need to set this while the runtime is initializing but we can't do it directly from the `JNIEnvInit.Initialize` method, since
 			// it lives in an assembly that does not reference Mono.Android.  So we do it here, because this class is instantiated by JNIEnvInit.Initialize.
@@ -106,8 +98,7 @@ public AndroidRuntimeOptions (IntPtr jnienv,
 				IntPtr vm,
 				IntPtr classLoader,
 				JniRuntime.JniTypeManager typeManager,
-				JniRuntime.JniValueManager valueManager,
-				bool jniAddNativeMethodRegistrationAttributePresent)
+				JniRuntime.JniValueManager valueManager)
 		{
 			EnvironmentPointer      = jnienv;
 			ClassLoader             = new JniObjectReference (classLoader, JniObjectReferenceType.Global);
@@ -115,7 +106,7 @@ public AndroidRuntimeOptions (IntPtr jnienv,
 			ObjectReferenceManager  = new ManagedObjectReferenceManager ();
 			TypeManager             = typeManager;
 			ValueManager            = valueManager;
-			JniAddNativeMethodRegistrationAttributePresent = jniAddNativeMethodRegistrationAttributePresent;
+			JniAddNativeMethodRegistrationAttributePresent = false;
 		}
 	}
 
@@ -315,304 +306,5 @@ public override void DeleteWeakGlobalReference (ref JniObjectReference value)
 			base.DeleteWeakGlobalReference (ref value);
 		}
 	}
-
-	[RequiresDynamicCode ("This type manager is reflection-backed and is not compatible with Native AOT.")]
-	[RequiresUnreferencedCode ("This type manager is reflection-backed and is not trimming-compatible.")]
-	class AndroidTypeManager : JniRuntime.ReflectionJniTypeManager {
-		bool jniAddNativeMethodRegistrationAttributePresent;
-
-		const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
-
-		public AndroidTypeManager (bool jniAddNativeMethodRegistrationAttributePresent)
-		{
-			this.jniAddNativeMethodRegistrationAttributePresent = jniAddNativeMethodRegistrationAttributePresent;
-		}
-
-		protected override IEnumerable<Type> GetTypesForSimpleReference (string jniSimpleReference)
-		{
-			foreach (var ti in base.GetTypesForSimpleReference (jniSimpleReference))
-				yield return ti;
-
-			var t = Java.Interop.TypeManager.GetJavaToManagedType (jniSimpleReference);
-			if (t != null)
-				yield return t;
-		}
-
-		protected override Type? GetTypeForSimpleReference (string jniSimpleReference)
-		{
-			var type = base.GetTypeForSimpleReference (jniSimpleReference);
-			if (type != null) {
-				return type;
-			}
-
-			return Java.Interop.TypeManager.GetJavaToManagedType (jniSimpleReference);
-		}
-
-		protected override string? GetSimpleReference (Type type)
-		{
-			string? j = JNIEnv.TypemapManagedToJava (type);
-			if (j != null) {
-				return GetReplacementTypeCore (j) ?? j;
-			}
-			// Intentionally don't call base.GetSimpleReference(type): Android's
-			// non-trimmable runtime uses the generated/registered typemap, not
-			// Java.Interop's JniTypeSignatureAttribute fallback.
-			return null;
-		}
-
-		protected override IEnumerable<string> GetSimpleReferences (Type type)
-		{
-			string? j = JNIEnv.TypemapManagedToJava (type);
-			j	   = GetReplacementTypeCore (j) ?? j;
-
-			if (j != null) {
-				return [j];
-			}
-			// Keep this in sync with GetSimpleReference(): no base fallback.
-			return [];
-		}
-
-		protected override IReadOnlyList<string>? GetStaticMethodFallbackTypesCore (string jniSimpleReference)
-		{
-			return JniRemappingLookup.GetStaticMethodFallbackTypes (jniSimpleReference, useReplacementTypes: true);
-		}
-
-		protected override string? GetReplacementTypeCore (string? jniSimpleReference)
-		{
-			return JniRemappingLookup.GetReplacementType (jniSimpleReference);
-		}
-
-		protected override JniRuntime.ReplacementMethodInfo? GetReplacementMethodInfoCore (string jniSourceType, string jniMethodName, string jniMethodSignature)
-		{
-			return JniRemappingLookup.GetReplacementMethodInfo (jniSourceType, jniMethodName, jniMethodSignature);
-		}
-
-		protected override JniRuntime.ReplacementMethodInfo? GetReplacementMethodInfoCore (string jniSourceType, ReadOnlySpan<char> jniMethodName, ReadOnlySpan<char> jniMethodSignature)
-		{
-			return JniRemappingLookup.GetReplacementMethodInfo (jniSourceType, jniMethodName, jniMethodSignature);
-		}
-
-		protected override Type? GetInvokerTypeCore (Type type)
-		{
-			if (type.IsInterface || type.IsAbstract) {
-				return JavaObjectExtensions.GetInvokerType (type)
-					?? base.GetInvokerTypeCore (type);
-			}
-
-			return null;
-		}
-
-		delegate Delegate GetCallbackHandler ();
-
-		// [Export] callback delegates are created dynamically via DynamicCallbackCodeGenerator and are not
-		// cached in static fields (unlike non-[Export] connector delegates). Without rooting them here,
-		// CoreCLR's GC can collect them between JNI registration and first invocation, causing a crash.
-		static readonly Lock prevent_delegate_gc_lock = new Lock ();
-		static readonly List<Delegate> prevent_delegate_gc = new List<Delegate> ();
-		static List<JniNativeMethodRegistration> sharedRegistrations = new List<JniNativeMethodRegistration> ();
-
-		static bool FastRegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<char> methods)
-		{
-			if (!MagicRegistrationMap.Filled)
-				return false;
-
-			bool lockTaken = false;
-			bool rv = false;
-
-			try {
-				Monitor.TryEnter (sharedRegistrations, ref lockTaken);
-				List<JniNativeMethodRegistration> registrations;
-				if (lockTaken) {
-					sharedRegistrations.Clear ();
-					registrations = sharedRegistrations;
-				} else {
-					registrations = new List<JniNativeMethodRegistration> ();
-				}
-				JniNativeMethodRegistrationArguments arguments = new JniNativeMethodRegistrationArguments (registrations, methods.ToString ());
-				rv = MagicRegistrationMap.CallRegisterMethod (arguments, type.FullName!);
-
-				if (registrations.Count > 0)
-					nativeClass.RegisterNativeMethods (registrations.ToArray ());
-			} finally {
-				if (lockTaken) {
-					Monitor.Exit (sharedRegistrations);
-				}
-			}
-
-			return rv;
-		}
-
-		class MagicRegistrationMap {
-#pragma warning disable CS0649 // Field is never assigned to;
-			// assigned to in generated IL: https://github.com/dotnet/android/blob/cbfa7e20acebd37b52ec4de9d5c1a4a66ddda799/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MonoDroidMarkStep.cs#L204
-			static Dictionary<string, int>? typesMap;
-#pragma warning restore CS0649
-
-			static void Prefill ()
-			{
-				// fill code added by the linker
-			}
-
-			static MagicRegistrationMap ()
-			{
-				Prefill ();
-			}
-
-			static public bool Filled {
-				get {
-					return typesMap != null && typesMap.Count > 0;
-				}
-			}
-
-			internal static bool CallRegisterMethod (JniNativeMethodRegistrationArguments arguments, string typeName)
-			{
-				int idx = 0;
-
-				if (typeName == null || !(typesMap?.TryGetValue (typeName, out idx) == true))
-					return false;
-
-				return CallRegisterMethodByIndex (arguments, idx);
-			}
-
-			static bool CallRegisterMethodByIndex (JniNativeMethodRegistrationArguments arguments, int? typeIdx)
-			{
-				// updated by the linker to register known types
-				return false;
-			}
-		}
-
-		[Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan<char>) instead.")]
-		public override void RegisterNativeMembers (JniType nativeClass, Type type, string? methods) =>
-			RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
-
-		public override void RegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<char> methods)
-		{
-			try {
-				if (methods.IsEmpty) {
-					if (jniAddNativeMethodRegistrationAttributePresent) {
-#pragma warning disable CS0618 // ReflectionJniTypeManager has not migrated its registration override to spans.
-						base.RegisterNativeMembers (nativeClass, type, methods.ToString ());
-#pragma warning restore CS0618
-					}
-					return;
-				} else if (FastRegisterNativeMembers (nativeClass, type, methods)) {
-					return;
-				}
-
-				int methodCount = CountMethods (methods);
-				if (methodCount < 1) {
-					if (jniAddNativeMethodRegistrationAttributePresent) {
-#pragma warning disable CS0618 // ReflectionJniTypeManager has not migrated its registration override to spans.
-						base.RegisterNativeMembers (nativeClass, type, methods.ToString ());
-#pragma warning restore CS0618
-					}
-					return;
-				}
-
-				JniNativeMethodRegistration [] natives = new JniNativeMethodRegistration [methodCount];
-				int nativesIndex = 0;
-				MethodInfo []? typeMethods = null;
-
-				ReadOnlySpan<char> methodsSpan = methods;
-				bool needToRegisterNatives = false;
-
-				while (!methodsSpan.IsEmpty) {
-					int newLineIndex = methodsSpan.IndexOf ('\n');
-
-					ReadOnlySpan<char> methodLine = methodsSpan.Slice (0, newLineIndex != -1 ? newLineIndex : methodsSpan.Length);
-					if (!methodLine.IsEmpty) {
-						SplitMethodLine (methodLine,
-							out ReadOnlySpan<char> name,
-							out ReadOnlySpan<char> signature,
-							out ReadOnlySpan<char> callbackString,
-							out ReadOnlySpan<char> callbackDeclaringTypeString);
-
-						Delegate? callback = null;
-						if (callbackString.SequenceEqual ("__export__")) {
-							var mname = name.Slice (2);
-							MethodInfo? minfo = null;
-							typeMethods ??= type.GetMethods (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
-							foreach (var mi in typeMethods)
-								if (mname.SequenceEqual (mi.Name) && signature.SequenceEqual (JavaNativeTypeManager.GetJniSignature (mi))) {
-									minfo = mi;
-									break;
-								}
-
-							if (minfo == null)
-								throw new InvalidOperationException (FormattableString.Invariant ($"Specified managed method '{mname.ToString ()}' was not found. Signature: {signature.ToString ()}"));
-
-							var exportAttribute = minfo.GetCustomAttribute<BaseExportAttribute> ()
-								?? throw new InvalidOperationException (FormattableString.Invariant ($"Specified managed method '{mname.ToString ()}' does not have [Export] attribute. Signature: {signature.ToString ()}"));
-
-							callback = exportAttribute.CreateDynamicCallback (minfo);
-							lock (prevent_delegate_gc_lock) {
-								prevent_delegate_gc.Add (callback);
-							}
-							needToRegisterNatives = true;
-						} else {
-							Type callbackDeclaringType = type;
-							if (!callbackDeclaringTypeString.IsEmpty) {
-								callbackDeclaringType = Type.GetType (callbackDeclaringTypeString.ToString (), throwOnError: true)!;
-							}
-							while (callbackDeclaringType.ContainsGenericParameters) {
-								callbackDeclaringType = callbackDeclaringType.BaseType!;
-							}
-
-							GetCallbackHandler connector = (GetCallbackHandler) Delegate.CreateDelegate (typeof (GetCallbackHandler),
-							                                                                             callbackDeclaringType, callbackString.ToString ());
-							callback = connector ();
-						}
-
-						if (callback != null) {
-							needToRegisterNatives = true;
-							natives [nativesIndex++] = new JniNativeMethodRegistration (name.ToString (), signature.ToString (), callback);
-						}
-					}
-
-					methodsSpan = newLineIndex != -1 ? methodsSpan.Slice (newLineIndex + 1) : default;
-				}
-
-				if (needToRegisterNatives) {
-					JniEnvironment.Types.RegisterNatives (nativeClass.PeerReference, natives, nativesIndex);
-				}
-			} catch (Exception e) {
-				JniEnvironment.Runtime.RaisePendingException (e);
-			}
-		}
-
-		static int CountMethods (ReadOnlySpan<char> methodsSpan)
-		{
-			int count = 0;
-			while (!methodsSpan.IsEmpty) {
-				count++;
-
-				int newLineIndex = methodsSpan.IndexOf ('\n');
-				methodsSpan = newLineIndex != -1 ? methodsSpan.Slice (newLineIndex + 1) : default;
-			}
-			return count;
-		}
-
-		static void SplitMethodLine (
-			ReadOnlySpan<char> methodLine,
-			out ReadOnlySpan<char> name,
-			out ReadOnlySpan<char> signature,
-			out ReadOnlySpan<char> callback,
-			out ReadOnlySpan<char> callbackDeclaringType)
-		{
-			int colonIndex = methodLine.IndexOf (':');
-			name = methodLine.Slice (0, colonIndex);
-			methodLine = methodLine.Slice (colonIndex + 1);
-
-			colonIndex = methodLine.IndexOf (':');
-			signature = methodLine.Slice (0, colonIndex);
-			methodLine = methodLine.Slice (colonIndex + 1);
-
-			colonIndex = methodLine.IndexOf (':');
-			callback = methodLine.Slice (0, colonIndex != -1 ? colonIndex : methodLine.Length);
-
-			callbackDeclaringType = colonIndex != -1 ? methodLine.Slice (colonIndex + 1) : default;
-		}
-	}
-
 }
 #endif // JAVA_INTEROP
diff --git a/src/Mono.Android/Android.Runtime/JNIEnv.cs b/src/Mono.Android/Android.Runtime/JNIEnv.cs
index f1e42f311a3..841e0c96f8e 100644
--- a/src/Mono.Android/Android.Runtime/JNIEnv.cs
+++ b/src/Mono.Android/Android.Runtime/JNIEnv.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
@@ -20,9 +19,6 @@ namespace Android.Runtime {
 	public static partial class JNIEnv {
 		const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 
-		[ThreadStatic]
-		static byte[]? mvid_bytes;
-
 		public static IntPtr Handle => JniEnvironment.EnvironmentPointer;
 
 		static Array ArrayCreateInstance (Type elementType, int length)
@@ -31,11 +27,7 @@ static Array ArrayCreateInstance (Type elementType, int length)
 				return Array.CreateInstance (elementType, length);
 			}
 
-			if (RuntimeFeature.TrimmableTypeMap) {
-				return SafeArrayFactory.CreateInstance (elementType, rank: 1, length);
-			}
-
-			throw new NotSupportedException ($"It is not possible to create an array with element type '{elementType}'.");
+			return SafeArrayFactory.CreateInstance (elementType, rank: 1, length);
 		}
 
 		internal static IntPtr IdentityHash (IntPtr v)
@@ -431,59 +423,9 @@ public static unsafe IntPtr NewObject (IntPtr jclass, IntPtr jmethod, params JVa
 			return JniEnvironment.Types.GetJniTypeNameFromInstance (new JniObjectReference (jobject));
 		}
 
-		internal static void LogTypemapTrace (StackTrace st)
+		internal static string? TypemapManagedToJava (Type type)
 		{
-			string? trace = st.ToString ()?.Trim ();
-			if (String.IsNullOrEmpty (trace))
-				return;
-
-			RuntimeNativeMethods.monodroid_log (LogLevel.Warn, LogCategories.Assembly, "typemap: called from");
-			foreach (string line in trace!.Split ('\n')) {
-				RuntimeNativeMethods.monodroid_log (LogLevel.Warn, LogCategories.Assembly, line);
-			}
-		}
-
-		internal static unsafe string? TypemapManagedToJava (Type type)
-		{
-			if (RuntimeFeature.TrimmableTypeMap) {
-				// The trimmable typemap doesn't use the native typemap tables.
-				// Delegate to the managed TrimmableTypeMap instead.
-				return TrimmableTypeMap.Instance.TryGetJniNameForManagedType (type, out var jniName) ? jniName : null;
-			}
-
-			byte[]? mvid_data = null;
-			// The Debug CoreCLR typemaps are keyed on the assembly display name, so computing the MVID would be wasted work.
-			if (!RuntimeFeature.ManagedToJavaUsesAssemblyFullName) {
-				if (mvid_bytes == null)
-					mvid_bytes = new byte[16];
-
-				var mvid = new Span<byte>(mvid_bytes);
-				if (!type.Module.ModuleVersionId.TryWriteBytes (mvid)) {
-					RuntimeNativeMethods.monodroid_log (LogLevel.Warn, LogCategories.Default, $"Failed to obtain module MVID using the fast method, falling back to the slow one");
-					mvid_data = type.Module.ModuleVersionId.ToByteArray ();
-				} else {
-					mvid_data = mvid_bytes;
-				}
-			}
-
-			if (type.FullName is null)
-				return null;
-			string? assemblyFullName = RuntimeFeature.ManagedToJavaUsesAssemblyFullName ? type.Assembly.FullName : null;
-			IntPtr ret;
-			fixed (byte* mvidptr = mvid_data) {
-				ret = RuntimeNativeMethods.clr_typemap_managed_to_java (type.FullName, assemblyFullName, (IntPtr)mvidptr);
-			}
-
-			if (ret == IntPtr.Zero) {
-				if (Logger.LogAssembly) {
-					RuntimeNativeMethods.monodroid_log (LogLevel.Warn, LogCategories.Default, $"typemap: failed to map managed type to Java type: {type.AssemblyQualifiedName} (Module ID: {type.Module.ModuleVersionId}; Type token: {type.MetadataToken})");
-					LogTypemapTrace (new StackTrace (true));
-				}
-
-				return null;
-			}
-
-			return Marshal.PtrToStringAnsi (ret);
+			return TrimmableTypeMap.Instance.TryGetJniNameForManagedType (type, out var jniName) ? jniName : null;
 		}
 
 		public static string GetJniName (Type type)
diff --git a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs
index 0048287ee5f..5ccf90f51ad 100644
--- a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs
+++ b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 
@@ -30,12 +29,10 @@ internal struct JnienvInitializeArgs {
 			public byte            brokenExceptionTransitions;
 			public int             packageNamingPolicy;
 			public byte            ioExceptionType;
-			public int             jniAddNativeMethodRegistrationAttributePresent;
 			public bool            jniRemappingInUse;
 			public bool            marshalMethodsEnabled;
 			public IntPtr          grefGCUserPeerable;
 			public IntPtr          propagateUncaughtExceptionFn;
-			public IntPtr          registerJniNativesFn;
 			public IntPtr          grefLogPath;
 			public IntPtr          lrefLogPath;
 			public IntPtr          referenceLogDirectory;
@@ -66,36 +63,10 @@ static void PropagateUncaughtException (IntPtr env, IntPtr javaThread, IntPtr ja
 			JNIEnv.PropagateUncaughtException (env, javaThread, javaException);
 		}
 
-		[UnmanagedCallersOnly]
-		[RequiresUnreferencedCode ("Uses reflection to access System.StartupHookProvider.")]
-		static unsafe void RegisterJniNatives (IntPtr typeName_ptr, int typeName_len, IntPtr jniClass, IntPtr methods_ptr, int methods_len)
-		{
-			string typeName = new string ((char*) typeName_ptr, 0, typeName_len);
-			var type = Type.GetType (typeName, throwOnError: false);
-			if (type == null) {
-				RuntimeNativeMethods.monodroid_log (LogLevel.Error,
-				               LogCategories.Default,
-				               $"Could not load type '{typeName}'. Skipping JNI registration of type '{Java.Interop.TypeManager.GetClassName (jniClass)}'.");
-				return;
-			}
-
-			var className = Java.Interop.TypeManager.GetClassName (jniClass);
-			Java.Interop.TypeManager.RegisterType (className, type);
-
-			JniType? jniType = null;
-			JniType.GetCachedJniType (ref jniType, className);
-
-			ReadOnlySpan<char> methods = new ReadOnlySpan<char> ((void*) methods_ptr, methods_len);
-			if (androidRuntime is null) {
-				throw new InvalidOperationException ("androidRuntime has not been initialized");
-			}
-			androidRuntime.TypeManager.RegisterNativeMembers (jniType, type, methods);
-		}
-
 		internal static void InitializeBeforeRuntimeCreation (JnienvInitializeArgs args)
 		{
 			InitializeCommonState (args);
-			InitializeTrimmableTypeMapDataIfNeeded ();
+			TypeMapLoader.Initialize ();
 		}
 
 		internal static void InitializeMaxGrefCounts (JnienvInitializeArgs args)
@@ -121,7 +92,7 @@ internal static void InitializeNativeAotRuntime (JniRuntime runtime, JnienvIniti
 			}
 			androidRuntime = runtime;
 			JniRuntime.SetCurrent (runtime);
-			RegisterTrimmableTypeMapNativeMethodsIfNeeded ();
+			TrimmableTypeMap.RegisterNativeMethods ();
 			SetSynchronizationContext ();
 		}
 
@@ -145,57 +116,32 @@ internal static unsafe void Initialize (JnienvInitializeArgs* args)
 
 			InitializeBeforeRuntimeCreation (*args);
 
-			JniRuntime.JniTypeManager typeManager = CreateTypeManager (*args);
+			JniRuntime.JniTypeManager typeManager = CreateTypeManager ();
 			JniRuntime.JniValueManager valueManager = CreateValueManager ();
 			androidRuntime = new AndroidRuntime (
 					args->env,
 					args->javaVm,
 					args->grefLoader,
 					typeManager,
-					valueManager,
-					args->jniAddNativeMethodRegistrationAttributePresent != 0
+					valueManager
 			);
 			JniRuntime.SetCurrent (androidRuntime);
-			RegisterTrimmableTypeMapNativeMethodsIfNeeded ();
+			TrimmableTypeMap.RegisterNativeMethods ();
 
 			args->propagateUncaughtExceptionFn = (IntPtr)(delegate* unmanaged<IntPtr, IntPtr, IntPtr, void>)&PropagateUncaughtException;
 
-			if (!RuntimeFeature.TrimmableTypeMap) {
-				args->registerJniNativesFn = GetRegisterJniNativesFnPtr ();
-			}
 			RunStartupHooksIfNeeded ();
 			SetSynchronizationContext ();
-
-			[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This method is never used with the trimmable type map.")]
-			IntPtr GetRegisterJniNativesFnPtr () =>
-				(IntPtr)(delegate* unmanaged<IntPtr, int, IntPtr, IntPtr, int, void>)&RegisterJniNatives;
 		}
 
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "The AndroidTypeManager branch is only reached when RuntimeFeature.TrimmableTypeMap is false; the linker substitutes the feature switch and trims this branch in trimmable apps.")]
-		internal static JniRuntime.JniTypeManager CreateTypeManager (JnienvInitializeArgs args)
+		internal static JniRuntime.JniTypeManager CreateTypeManager ()
 		{
-			if (RuntimeFeature.TrimmableTypeMap) {
-				return new TrimmableTypeMapTypeManager ();
-			}
-
-			return CreateAndroidTypeManager (args);
-
-			[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This type manager won't be used in Native AOT builds.")]
-			[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This type manager won't be used in Native AOT builds.")]
-			static JniRuntime.JniTypeManager CreateAndroidTypeManager (JnienvInitializeArgs args) => new AndroidTypeManager (args.jniAddNativeMethodRegistrationAttributePresent != 0);
+			return new TrimmableTypeMapTypeManager ();
 		}
 
 		internal static JniRuntime.JniValueManager CreateValueManager ()
 		{
-			if (RuntimeFeature.TrimmableTypeMap) {
-				return new TrimmableTypeMapValueManager ();
-			}
-
-			return CreateJavaMarshalValueManager ();
-
-			[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "CoreCLR value manager is preserved by the MarkJavaObjects trimmer step.")]
-			[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This value manager won't be used in Native AOT builds in the future.")]
-			JniRuntime.JniValueManager CreateJavaMarshalValueManager () => new JavaMarshalValueManager ();
+			return new TrimmableTypeMapValueManager ();
 		}
 
 		static void InitializeCommonState (JnienvInitializeArgs args)
@@ -223,30 +169,6 @@ static void InitializeCommonState (JnienvInitializeArgs args)
 			JavaNativeTypeManager.PackageNamingPolicy = (PackageNamingPolicy)args.packageNamingPolicy;
 		}
 
-		static void InitializeTrimmableTypeMapDataIfNeeded ()
-		{
-			if (RuntimeFeature.TrimmableTypeMap) {
-				InitializeTrimmableTypeMapData ();
-			}
-		}
-
-		static void RegisterTrimmableTypeMapNativeMethodsIfNeeded ()
-		{
-			if (RuntimeFeature.TrimmableTypeMap) {
-				// TypeMapLoader.Initialize() only loads managed typemap data. Registering
-				// mono.android.Runtime natives requires JniRuntime.Current and its ClassLoader.
-				TrimmableTypeMap.RegisterNativeMethods ();
-			}
-		}
-
-		// Separate method so the JIT doesn't try to resolve TypeMapLoader (from _Microsoft.Android.TypeMaps.dll)
-		// when compiling JNIEnvInit.Initialize() in non-trimmable builds where that assembly isn't present.
-		[MethodImpl (MethodImplOptions.NoInlining)]
-		static void InitializeTrimmableTypeMapData ()
-		{
-			TypeMapLoader.Initialize ();
-		}
-
 		static void RunStartupHooksIfNeeded ()
 		{
 			// Return if startup hooks are disabled or not CoreCLR
diff --git a/src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs b/src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs
index 14819922893..4083f34e538 100644
--- a/src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs
+++ b/src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs
@@ -123,15 +123,6 @@ internal static partial void _monodroid_register_reference_logging_callbacks (
 		[UnmanagedCallConv (CallConvs = new[] { typeof (CallConvCdecl) })]
 		internal static partial int _monodroid_max_gref_get ();
 
-		[LibraryImport (RuntimeConstants.InternalDllName, StringMarshalling = StringMarshalling.Utf8)]
-		[UnmanagedCallConv (CallConvs = new[] { typeof (CallConvCdecl) })]
-		internal static partial IntPtr clr_typemap_managed_to_java (string fullName, string? assemblyFullName, IntPtr mvid);
-
-		[LibraryImport (RuntimeConstants.InternalDllName, StringMarshalling = StringMarshalling.Utf8)]
-		[UnmanagedCallConv (CallConvs = new[] { typeof (CallConvCdecl) })]
-		[return: MarshalAs (UnmanagedType.U1)]
-		internal static partial bool clr_typemap_java_to_managed (string java_type_name, out IntPtr managed_assembly_name, out uint managed_type_token_id);
-
 		[LibraryImport (RuntimeConstants.InternalDllName)]
 		[UnmanagedCallConv (CallConvs = new[] { typeof (CallConvCdecl) })]
 		internal static partial delegate* unmanaged<MarkCrossReferencesArgs*, void> clr_initialize_gc_bridge (
diff --git a/src/Mono.Android/Java.Interop/JavaConvert.cs b/src/Mono.Android/Java.Interop/JavaConvert.cs
index 21724698937..5acc8105293 100644
--- a/src/Mono.Android/Java.Interop/JavaConvert.cs
+++ b/src/Mono.Android/Java.Interop/JavaConvert.cs
@@ -75,18 +75,14 @@ static class JavaConvert {
 				return (h, t) => JNIEnv.GetArray (h, t, target.GetElementType ());
 
 			if (target.IsGenericType && !target.IsGenericTypeDefinition) {
-				if (RuntimeFeature.UseTypeMapAttributesForJavaDictionaryValueTypeLookups) {
+				if (RuntimeFeature.UseTypeMapAttributesForJavaDictionaryValueTypeLookups ||
+						!System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported) {
 					if (SafeJavaCollectionFactory.TryGetFromJniHandleConverter (target, out var collectionConverter))
 						return collectionConverter;
-				} else if (System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported) {
+				} else {
 					var factoryConverter = TryMakeGenericCollectionTypeFactory (target);
 					if (factoryConverter != null)
 						return factoryConverter;
-				} else if (RuntimeFeature.TrimmableTypeMap) {
-					if (SafeJavaCollectionFactory.TryGetFromJniHandleConverter (target, out var collectionConverter))
-						return collectionConverter;
-				} else {
-					throw new NotSupportedException ($"Cannot convert Java collection elements to closed generic array element type '{target}' because the runtime does not support dynamic code generation.");
 				}
 			}
 
@@ -173,9 +169,7 @@ public ArrayElementConverter (Array array)
 					return JNIEnv.GetArray (handle, transfer, elementType.GetElementType ());
 
 				if (elementType != null && typeof (IJavaPeerable).IsAssignableFrom (elementType)) {
-					if (RuntimeFeature.TrimmableTypeMap)
-						return FromJniHandleWithTrimmableTypeMapping (handle, transfer, elementType);
-					return GetObjectWithSuppression (handle, transfer, elementType);
+					return FromJniHandleWithTrimmableTypeMapping (handle, transfer, elementType);
 				}
 
 				var value = FromJniHandleWithRuntimeTypeMapping (handle, transfer);
@@ -183,13 +177,6 @@ public ArrayElementConverter (Array array)
 					return value;
 				return Convert.ChangeType (value, elementType, CultureInfo.InvariantCulture);
 			}
-
-			[UnconditionalSuppressMessage ("ReflectionAnalysis", "IL2067:RequiresUnreferencedCode",
-				Justification = "Custom trimmer steps marks the activation constructors on IJavaPeerable types.")]
-			static object? GetObjectWithSuppression (IntPtr handle, JniHandleOwnership transfer, Type? elementType)
-			{
-				return Java.Lang.Object.GetObject (handle, transfer, elementType);
-			}
 		}
 
 		static object? FromJniHandleWithRuntimeTypeMapping (IntPtr handle, JniHandleOwnership transfer)
diff --git a/src/Mono.Android/Java.Interop/TypeManager.cs b/src/Mono.Android/Java.Interop/TypeManager.cs
index 5e6f3ef85e1..ce6f6950492 100644
--- a/src/Mono.Android/Java.Interop/TypeManager.cs
+++ b/src/Mono.Android/Java.Interop/TypeManager.cs
@@ -1,17 +1,8 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Threading;
-using Java.Interop.Tools.TypeNameMappings;
 
 using Android.Runtime;
-using Microsoft.Android.Runtime;
-using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;
 
 namespace Java.Interop {
 
@@ -99,388 +90,6 @@ public int Compare (string? x, string? y)
 			return mappings [i].Substring (c+1);
 		}
 
-		static _JniMarshal_PPLLLL_V? cb_activate;
-		internal static Delegate GetActivateHandler ()
-		{
-			return cb_activate ??= new _JniMarshal_PPLLLL_V (n_Activate);
-		}
-
-#if JAVA_INTEROP
-		internal static bool ActivationEnabled {
-			get { return !JniEnvironment.WithinNewObjectScope; }
-		}
-#else   // !JAVA_INTEROP
-		[ThreadStatic]
-		static bool activation_disabled;
-
-		internal static bool ActivationEnabled {
-			get { return !activation_disabled; }
-			set { activation_disabled = !value; }
-		}
-#endif	// !JAVA_INTEROP
-
-		[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type.GetType() can never statically know the string value from parameter 'signature'.")]
-		static Type[] GetParameterTypes (string? signature)
-		{
-			if (String.IsNullOrEmpty (signature))
-				return Array.Empty<Type> ();
-			string[] typenames = signature!.Split (':');
-			Type[] result = new Type [typenames.Length];
-			for (int i = 0; i < typenames.Length; i++)
-				result [i] = Type.GetType (typenames [i], throwOnError:true)!;
-			return result;
-		}
-
-		[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
-		[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type.GetType() can never statically know the string value from parameter 'typename_ptr'.")]
-		static void n_Activate (IntPtr jnienv, IntPtr jclass, IntPtr typename_ptr, IntPtr signature_ptr, IntPtr jobject, IntPtr parameters_ptr)
-		{
-			if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r))
-				return;
-
-			try {
-				var o   = Java.Lang.Object.PeekObject (jobject);
-				var ex  = o as IJavaPeerable;
-				if (ex != null) {
-					var state = ex.JniManagedPeerState;
-					if (!state.HasFlag (JniManagedPeerStates.Activatable) && !state.HasFlag (JniManagedPeerStates.Replaceable))
-						return;
-				}
-				if (!ActivationEnabled) {
-					if (Logger.LogGlobalRef) {
-						Logger.Log (LogLevel.Info, "monodroid-gref",
-							FormattableString.Invariant ($"warning: Skipping managed constructor invocation for handle 0x{jobject:x} (key_handle 0x{JNIEnv.IdentityHash (jobject):x}). Please use JNIEnv.StartCreateInstance() + JNIEnv.FinishCreateInstance() instead of JNIEnv.NewObject() and/or JNIEnv.CreateInstance()."));
-					}
-					return;
-				}
-
-				Type type = Type.GetType (JNIEnv.GetString (typename_ptr, JniHandleOwnership.DoNotTransfer)!, throwOnError:true)!;
-				if (type.IsGenericTypeDefinition) {
-					throw new NotSupportedException (
-							"Constructing instances of generic types from Java is not supported, as the type parameters cannot be determined.",
-							CreateJavaLocationException ());
-				}
-				Type[] ptypes = GetParameterTypes (JNIEnv.GetString (signature_ptr, JniHandleOwnership.DoNotTransfer));
-				var parms = JNIEnv.GetObjectArray (parameters_ptr, ptypes);
-				var cinfo = type.GetConstructor (ptypes);
-				if (cinfo == null) {
-					throw CreateMissingConstructorException (type, ptypes);
-				}
-				if (o != null) {
-					cinfo.Invoke (o, parms);
-					return;
-				}
-
-				Activate (jobject, cinfo, parms);
-			} catch (global::System.Exception __e) {
-				__r.OnUserUnhandledException (ref __envp, __e);
-				return;
-			} finally {
-				global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp);
-			}
-		}
-
-		[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "RuntimeHelpers.GetUninitializedObject() does not statically know the return value from ConstructorInfo.DeclaringType.")]
-		internal static void Activate (IntPtr jobject, ConstructorInfo cinfo, object? []? parms)
-		{
-			try {
-				var newobj = RuntimeHelpers.GetUninitializedObject (cinfo.DeclaringType!);
-				if (newobj is IJavaPeerable peer) {
-					peer.SetPeerReference (new JniObjectReference (jobject));
-				} else {
-					throw new InvalidOperationException ($"Unsupported type: '{newobj}'");
-				}
-				cinfo.Invoke (newobj, parms);
-			} catch (Exception e) {
-				var m = FormattableString.Invariant (
-					$"Could not activate JNI Handle 0x{jobject:x} (key_handle 0x{JNIEnv.IdentityHash (jobject):x}) of Java type '{JNIEnv.GetClassNameFromInstance (jobject)}' as managed type '{cinfo?.DeclaringType?.FullName}'.");
-				Logger.Log (LogLevel.Warn, "monodroid", m);
-				Logger.Log (LogLevel.Warn, "monodroid", CreateJavaLocationException ().ToString ());
-
-				throw new NotSupportedException (m, e);
-			}
-		}
-
-		static Exception CreateMissingConstructorException (Type type, Type[] ptypes)
-		{
-			var message = new System.Text.StringBuilder ();
-			message.Append ("Unable to find ");
-			if (ptypes.Length == 0)
-				message.Append ("the default constructor");
-			else {
-				message.Append ("a constructor with signature (")
-					.Append (ptypes [0].FullName);
-				for (int i = 1; i < ptypes.Length; ++i)
-					message.Append (", ").Append (ptypes [i].FullName);
-				message.Append (")");
-			}
-			message.Append (" on type ").Append (type.FullName)
-				.Append (".  Please provide the missing constructor.");
-			return new NotSupportedException (message.ToString (), CreateJavaLocationException ());
-		}
-
-		static Exception CreateJavaLocationException ()
-		{
-			using (var loc = new Java.Lang.Error ("Java callstack:"))
-				return new JavaLocationException (loc.ToString ());
-		}
-
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "Value of java_type_name isn't statically known.")]
-		static Type? clr_typemap_java_to_managed (string java_type_name)
-		{
-			bool result = RuntimeNativeMethods.clr_typemap_java_to_managed (java_type_name, out IntPtr managedAssemblyNamePointer, out uint managedTypeTokenId);
-			if (!result || managedAssemblyNamePointer == IntPtr.Zero) {
-				return null;
-			}
-
-			string? managedAssemblyName = Marshal.PtrToStringAnsi (managedAssemblyNamePointer);
-			if (managedAssemblyName is null) {
-				return null;
-			}
-
-			Assembly assembly = Assembly.Load (managedAssemblyName);
-			Type? ret = null;
-			foreach (Module module in assembly.Modules) {
-				ret = module.ResolveType ((int)managedTypeTokenId);
-				if (ret != null) {
-					break;
-				}
-			}
-
-			if (Logger.LogAssembly) {
-				Logger.Log (LogLevel.Info, "monodroid", $"Loaded type: {ret}");
-			}
-
-			return ret;
-		}
-
-		internal static Type? GetJavaToManagedType (string class_name)
-		{
-			lock (TypeManagerMapDictionaries.AccessLock) {
-				return GetJavaToManagedTypeCore (class_name);
-			}
-		}
-
-		static Type? GetJavaToManagedTypeCore (string class_name)
-		{
-			if (TypeManagerMapDictionaries.JniToManaged.TryGetValue (class_name, out Type? type)) {
-				return type;
-			}
-
-			if (RuntimeFeature.TrimmableTypeMap) {
-				throw new System.Diagnostics.UnreachableException (
-					$"{nameof (TypeManager)}.{nameof (GetJavaToManagedTypeCore)} should not be used when " +
-					$"{nameof (RuntimeFeature.TrimmableTypeMap)} is enabled. The trimmable path should resolve " +
-					$"types through {nameof (TrimmableTypeMapTypeManager)}.");
-			} else {
-				type = clr_typemap_java_to_managed (class_name);
-			}
-
-			if (type != null) {
-				TypeManagerMapDictionaries.JniToManaged.Add (class_name, type);
-				return type;
-			}
-
-			// Miss message is logged in the native runtime
-			if (Logger.LogAssembly)
-				JNIEnv.LogTypemapTrace (new System.Diagnostics.StackTrace (true));
-			return null;
-		}
-
-		[RequiresDynamicCode ("Legacy type manager peer creation can construct generic invoker types.")]
-		[RequiresUnreferencedCode ("Legacy type manager peer creation uses reflection over preserved Java peer types.")]
-		internal static IJavaPeerable? CreateInstance (IntPtr handle, JniHandleOwnership transfer)
-		{
-			return CreateInstance (handle, transfer, null);
-		}
-
-		[RequiresDynamicCode ("Legacy type manager peer creation can construct generic invoker types.")]
-		[RequiresUnreferencedCode ("Legacy type manager peer creation uses reflection over preserved Java peer types.")]
-		internal static IJavaPeerable? CreateInstance (IntPtr handle, JniHandleOwnership transfer, Type? targetType)
-		{
-			Type? type = null;
-			IntPtr class_ptr = JNIEnv.GetObjectClass (handle);
-			string? class_name = GetClassName (class_ptr);
-			lock (TypeManagerMapDictionaries.AccessLock) {
-				while (class_ptr != IntPtr.Zero) {
-					if (!string.IsNullOrEmpty (class_name)) {
-						type = GetJavaToManagedTypeCore (class_name);
-						if (type != null) {
-							break;
-						}
-					}
-
-					IntPtr super_class_ptr = JNIEnv.GetSuperclass (class_ptr);
-					JNIEnv.DeleteLocalRef (class_ptr);
-					class_name = null;
-					class_ptr = super_class_ptr;
-					if (class_ptr != IntPtr.Zero) {
-						class_name = GetClassName (class_ptr);
-					}
-				}
-			}
-
-			if (class_ptr != IntPtr.Zero) {
-				JNIEnv.DeleteLocalRef (class_ptr);
-				class_ptr = IntPtr.Zero;
-			}
-
-			if (targetType != null &&
-					(type == null ||
-					 !targetType.IsAssignableFrom (type))) {
-				type = targetType;
-			}
-
-			if (type == null) {
-				class_name = JNIEnv.GetClassNameFromInstance (handle);
-				JNIEnv.DeleteRef (handle, transfer);
-				throw new NotSupportedException (
-						FormattableString.Invariant ($"Internal error finding wrapper class for '{class_name}'. (Where is the Java.Lang.Object wrapper?!)"),
-						CreateJavaLocationException ());
-			}
-
-			if (type.IsInterface || type.IsAbstract) {
-				var invokerType = JavaObjectExtensions.GetInvokerType (type);
-				if (invokerType == null)
-					throw new NotSupportedException ("Unable to find Invoker for type '" + type.FullName + "'. Was it linked away?",
-							CreateJavaLocationException ());
-				type = invokerType;
-			}
-
-			var typeSig  = JNIEnvInit.androidRuntime?.TypeManager.GetTypeSignature (type) ?? default;
-			if (!typeSig.IsValid || typeSig.SimpleReference == null) {
-				throw new ArgumentException ($"Could not determine Java type corresponding to `{type.AssemblyQualifiedName}`.", nameof (targetType));
-			}
-
-			JniObjectReference typeClass = default;
-			JniObjectReference handleClass = default;
-			try {
-				try {
-					typeClass = JniEnvironment.Types.FindClass (typeSig.SimpleReference);
-				} catch (Exception e) {
-					throw new ArgumentException ($"Could not find Java class `{typeSig.SimpleReference}`.",
-							nameof (targetType),
-							e);
-				}
-
-				handleClass = JniEnvironment.Types.GetObjectClass (new JniObjectReference (handle));
-				if (!JniEnvironment.Types.IsAssignableFrom (handleClass, typeClass)) {
-					if (Logger.LogAssembly) {
-						var message = $"Handle 0x{handle:x} is of type '{JNIEnv.GetClassNameFromInstance (handle)}' which is not assignable to '{typeSig.SimpleReference}'";
-						Logger.Log (LogLevel.Debug, "monodroid-assembly", message);
-					}
-					if (RuntimeFeature.IsAssignableFromCheck) {
-						return null;
-					}
-				}
-			} finally {
-				JniObjectReference.Dispose (ref handleClass);
-				JniObjectReference.Dispose (ref typeClass);
-			}
-
-			IJavaPeerable? result = null;
-
-			try {
-				result = (IJavaPeerable) CreateProxy (type, handle, transfer);
-				if (Runtime.IsGCUserPeer (result.PeerReference.Handle)) {
-					result.SetJniManagedPeerState (JniManagedPeerStates.Replaceable | JniManagedPeerStates.Activatable);
-				}
-			} catch (MissingMethodException e) {
-				var key_handle  = JNIEnv.IdentityHash (handle);
-				JNIEnv.DeleteRef (handle, transfer);
-				throw new NotSupportedException (FormattableString.Invariant (
-					$"Unable to activate instance of type {type} from native handle 0x{handle:x} (key_handle 0x{key_handle:x})."), e);
-			}
-			return result;
- 		}
-
-		static  readonly    Type[]  XAConstructorSignature  = new Type [] { typeof (IntPtr), typeof (JniHandleOwnership) };
-		static  readonly    Type[]  JIConstructorSignature  = new Type [] { typeof (JniObjectReference).MakeByRefType (), typeof (JniObjectReferenceOptions) };
-		static  readonly    ConcurrentDictionary<Type, ActivationConstructor>  ActivationConstructorCache = new ConcurrentDictionary<Type, ActivationConstructor> (1, 3);
-
-		enum ActivationConstructorKind
-		{
-			Missing,
-			XA,
-			JI,
-		}
-
-		readonly record struct ActivationConstructor (ConstructorInfo? Constructor, ActivationConstructorKind Kind);
-
-		/// <summary>
-		/// Preserves constructor annotations through the stateful <c>GetOrAdd</c> factory,
-		/// whose <c>Func</c> key parameter cannot carry <see cref="DynamicallyAccessedMembersAttribute"/>.
-		/// </summary>
-		readonly struct AnnotatedType
-		{
-			public AnnotatedType (
-					[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-					Type type)
-			{
-				Type = type;
-			}
-
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-			public Type Type { get; }
-		}
-
-		internal static object CreateProxy (
-				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-				Type type,
-				IntPtr handle,
-				JniHandleOwnership transfer)
-		{
-			// Skip Activator.CreateInstance() as that requires public constructors,
-			// and we want to hide some constructors for sanity reasons.
-			var peer = GetUninitializedObject (type);
-			// XA constructors are the normal activation path; resolve XA first and cache the result.
-			var activation = GetActivationConstructor (type);
-			var constructor = activation.Constructor;
-			if (constructor != null && activation.Kind == ActivationConstructorKind.XA) {
-				constructor.Invoke (peer, new object[] { handle, transfer });
-				return peer;
-			}
-			// JI constructors are a legacy fallback slated for removal, but cache them while supported.
-			if (constructor != null && activation.Kind == ActivationConstructorKind.JI) {
-				JniObjectReference          r = new JniObjectReference (handle);
-				JniObjectReferenceOptions   o = JniObjectReferenceOptions.Copy;
-				constructor.Invoke (peer, new object [] { r, o });
-				JNIEnv.DeleteRef (handle, transfer);
-				return peer;
-			}
-			GC.SuppressFinalize (peer);
-			throw new MissingMethodException (
-					"No constructor found for " + type.FullName + "::.ctor(System.IntPtr, Android.Runtime.JniHandleOwnership)",
-					CreateJavaLocationException ());
-
-			static ActivationConstructor GetActivationConstructor (
-					[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-					Type type)
-			{
-				return ActivationConstructorCache.GetOrAdd (type,
-						static (_, state) => {
-							const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-							var constructor = state.Type.GetConstructor (flags, null, XAConstructorSignature, null);
-							if (constructor != null)
-								return new ActivationConstructor (constructor, ActivationConstructorKind.XA);
-
-							constructor = state.Type.GetConstructor (flags, null, JIConstructorSignature, null);
-							return new ActivationConstructor (
-								constructor,
-								constructor == null ? ActivationConstructorKind.Missing : ActivationConstructorKind.JI);
-						}, new AnnotatedType (type));
-			}
-
-			static IJavaPeerable GetUninitializedObject (
-					[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-					Type type)
-			{
-				var v   = (IJavaPeerable) System.Runtime.CompilerServices.RuntimeHelpers.GetUninitializedObject (type);
-				v.SetJniManagedPeerState (JniManagedPeerStates.Replaceable | JniManagedPeerStates.Activatable);
-				return v;
-			}
-		}
-
 		public static void RegisterType (string java_class, Type t)
 		{
 			string jniFromType = JNIEnv.GetJniName (t);
@@ -499,11 +108,11 @@ public static void RegisterType (string java_class, Type t)
 		}
 
 		const string TypeRegistrationNotSupported =
-			"Java package type registration is no longer supported. Java-to-managed type resolution now goes through the native and trimmable type maps.";
+			"Java package type registration is no longer supported. Java-to-managed type resolution now goes through the trimmable type map.";
 
 		// The package-based Java-to-managed type registration fallback was removed
 		// (https://github.com/dotnet/android/issues/11663); type resolution now goes
-		// through the native / trimmable type map, and the generator no longer emits
+		// through the trimmable type map, and the generator no longer emits
 		// the `Java.Interop.__TypeRegistrations` class that called these methods. These
 		// shipped public APIs are retained for binary compatibility but now throw, as
 		// they can no longer register anything.
@@ -517,30 +126,5 @@ public static void RegisterPackages (string[] packages, Converter<string, Type?>
 			throw new NotSupportedException (TypeRegistrationNotSupported);
 		}
 
-		[Register ("mono/android/TypeManager", DoNotGenerateAcw = true)]
-		internal class JavaTypeManager : Java.Lang.Object
-		{
-			[Register ("activate", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)V", "")]
-			static void n_Activate (IntPtr jnienv, IntPtr jclass, IntPtr typename_ptr, IntPtr signature_ptr, IntPtr jobject, IntPtr parameters_ptr)
-			{
-				TypeManager.n_Activate (jnienv, jclass, typename_ptr, signature_ptr, jobject, parameters_ptr);
-			}
-
-			[UnmanagedCallersOnly]
-			static void n_Activate_mm (IntPtr jnienv, IntPtr jclass, IntPtr typename_ptr, IntPtr signature_ptr, IntPtr jobject, IntPtr parameters_ptr)
-			{
-				// TODO: need a full wrapper code here, a'la JNINativeWrapper.CreateDelegate
-				try {
-					TypeManager.n_Activate (jnienv, jclass, typename_ptr, signature_ptr, jobject, parameters_ptr);
-				} catch (Exception ex) {
-					AndroidEnvironment.UnhandledException (ex);
-				}
-			}
-
-			internal static Delegate GetActivateHandler ()
-			{
-				return TypeManager.GetActivateHandler ();
-			}
-		}
 	}
 }
diff --git a/src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs b/src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs
deleted file mode 100644
index 3f453c31882..00000000000
--- a/src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using Android.Runtime;
-using Java.Interop;
-
-namespace Microsoft.Android.Runtime;
-
-[RequiresDynamicCode ("This value manager is reflection-backed and can break in AOT scenarios.")]
-[RequiresUnreferencedCode ("This value manager is reflection-backed and relies on custom trimming rules.")]
-sealed class JavaMarshalValueManager : JniRuntime.ReflectionJniValueManager
-{
-	const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
-	const BindingFlags ActivationConstructorBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-
-	static readonly Type[] XAConstructorSignature = new Type [] { typeof (IntPtr), typeof (JniHandleOwnership) };
-	static readonly Type[] JIConstructorSignature = new Type [] { typeof (JniObjectReference).MakeByRefType (), typeof (JniObjectReferenceOptions) };
-	static readonly ConcurrentDictionary<Type, ActivationConstructor> ActivationConstructorCache = new ConcurrentDictionary<Type, ActivationConstructor> (1, 3);
-
-	enum ActivationConstructorKind
-	{
-		Missing,
-		XA,
-		JI,
-	}
-
-	readonly record struct ActivationConstructor (ConstructorInfo? Constructor, ActivationConstructorKind Kind);
-
-	// The GetOrAdd factory's key parameter cannot carry constructor-preservation annotations.
-	readonly struct AnnotatedType
-	{
-		public AnnotatedType ([DynamicallyAccessedMembers (Constructors)] Type type)
-		{
-			Type = type;
-		}
-
-		[DynamicallyAccessedMembers (Constructors)]
-		public Type Type { get; }
-	}
-
-	public JavaMarshalValueManager ()
-	{
-		JavaMarshalRegisteredPeers.InitializeIfNeeded ();
-	}
-
-	public override void WaitForGCBridgeProcessing ()
-	{
-		// Intentionally empty. The Mono runtime's own implementation acknowledges this
-		// pattern is fundamentally flawed (see FIXME in sgen-bridge.c): a thread that
-		// passes the check can still race with bridge processing that starts immediately
-		// after. The wait cannot prevent the race, only reduce its window. On CoreCLR,
-		// JNI wrapper threads hold their own handle copies via JniObjectReference, so
-		// they are not affected by the bridge swapping control_block handles.
-	}
-
-	public override void CollectPeers ()
-	{
-		JavaMarshalRegisteredPeers.CollectPeers ();
-	}
-
-	public override void AddPeer (IJavaPeerable value)
-	{
-		JavaMarshalRegisteredPeers.AddPeer (value);
-	}
-
-	public override IJavaPeerable? PeekPeer (JniObjectReference reference)
-	{
-		EnsureNotDisposed ();
-		return JavaMarshalRegisteredPeers.PeekPeer (reference);
-	}
-
-	public override void RemovePeer (IJavaPeerable value)
-	{
-		JavaMarshalRegisteredPeers.RemovePeer (value);
-	}
-
-	public override void FinalizePeer (IJavaPeerable value)
-	{
-		JavaMarshalRegisteredPeers.FinalizePeer (value);
-	}
-
-	public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
-	{
-		return JavaMarshalRegisteredPeers.GetSurfacedPeers ();
-	}
-
-	protected override object? CreateNonArrayListValue (
-			ref JniObjectReference reference,
-			JniObjectReferenceOptions options,
-			Type targetType)
-	{
-		return JavaConvert.FromObjectReference (ref reference, options, targetType);
-	}
-
-	protected override bool TryConstructPeer (
-			IJavaPeerable self,
-			ref JniObjectReference reference,
-			JniObjectReferenceOptions options,
-			[DynamicallyAccessedMembers (Constructors)]
-			Type type)
-	{
-		var activation = GetActivationConstructor (type);
-		var c = activation.Constructor;
-		if (c == null)
-			return false;
-
-		if (activation.Kind == ActivationConstructorKind.XA) {
-			var args = new object[] {
-				reference.Handle,
-				JniHandleOwnership.DoNotTransfer,
-			};
-			c.Invoke (self, args);
-			JniObjectReference.Dispose (ref reference, options);
-			return true;
-		}
-
-		// Preserve ReflectionJniValueManager's JI fallback, including ref argument copy-back.
-		var jiArgs = new object[] { reference, options };
-		c.Invoke (self, jiArgs);
-		reference = (JniObjectReference) jiArgs [0];
-		JniObjectReference.Dispose (ref reference, options);
-		return true;
-	}
-
-	static ActivationConstructor GetActivationConstructor ([DynamicallyAccessedMembers (Constructors)] Type type)
-	{
-		return ActivationConstructorCache.GetOrAdd (type,
-				static (_, state) => {
-					var constructor = state.Type.GetConstructor (ActivationConstructorBindingFlags, null, XAConstructorSignature, null);
-					if (constructor != null)
-						return new ActivationConstructor (constructor, ActivationConstructorKind.XA);
-
-					constructor = state.Type.GetConstructor (ActivationConstructorBindingFlags, null, JIConstructorSignature, null);
-					return new ActivationConstructor (
-						constructor,
-						constructor == null ? ActivationConstructorKind.Missing : ActivationConstructorKind.JI);
-				}, new AnnotatedType (type));
-	}
-
-	protected override bool TryUnboxPeerObject (IJavaPeerable value, [NotNullWhen (true)] out object? result)
-	{
-		var proxy = value as JavaProxyThrowable;
-		if (proxy != null) {
-			result = proxy.InnerException;
-			return true;
-		}
-		return base.TryUnboxPeerObject (value, out result);
-	}
-}
diff --git a/src/Mono.Android/Microsoft.Android.Runtime/RuntimeFeature.cs b/src/Mono.Android/Microsoft.Android.Runtime/RuntimeFeature.cs
index 346ddf1399f..9ebc2fd70f1 100644
--- a/src/Mono.Android/Microsoft.Android.Runtime/RuntimeFeature.cs
+++ b/src/Mono.Android/Microsoft.Android.Runtime/RuntimeFeature.cs
@@ -10,10 +10,8 @@ static class RuntimeFeature
 	const bool IsAssignableFromCheckEnabledByDefault = true;
 	const bool StartupNoGCRegionEnabledByDefault = true;
 	const bool StartupHookSupportEnabledByDefault = true;
-	const bool TrimmableTypeMapEnabledByDefault = false;
 	const bool UseTypeMapAttributesForJavaDictionaryValueTypeLookupsEnabledByDefault = false;
 	const bool ObjectReferenceLoggingEnabledByDefault = false;
-	const bool ManagedToJavaUsesAssemblyFullNameEnabledByDefault = false;
 
 	const string FeatureSwitchPrefix = "Microsoft.Android.Runtime.RuntimeFeature.";
 	const string EventSourceSupportSwitch = "System.Diagnostics.Tracing.EventSource.IsSupported";
@@ -40,10 +38,6 @@ static class RuntimeFeature
 	internal static bool StartupHookSupport { get; } =
 		AppContext.TryGetSwitch (StartupHookProviderSwitch, out bool isEnabled) ? isEnabled : StartupHookSupportEnabledByDefault;
 
-	[FeatureSwitchDefinition ($"{FeatureSwitchPrefix}{nameof (TrimmableTypeMap)}")]
-	internal static bool TrimmableTypeMap { get; } =
-		AppContext.TryGetSwitch ($"{FeatureSwitchPrefix}{nameof (TrimmableTypeMap)}", out bool isEnabled) ? isEnabled : TrimmableTypeMapEnabledByDefault;
-
 	[FeatureSwitchDefinition ($"{FeatureSwitchPrefix}{nameof (UseTypeMapAttributesForJavaDictionaryValueTypeLookups)}")]
 	internal static bool UseTypeMapAttributesForJavaDictionaryValueTypeLookups { get; } =
 		AppContext.TryGetSwitch ($"{FeatureSwitchPrefix}{nameof (UseTypeMapAttributesForJavaDictionaryValueTypeLookups)}", out bool isEnabled) ? isEnabled : UseTypeMapAttributesForJavaDictionaryValueTypeLookupsEnabledByDefault;
@@ -56,8 +50,4 @@ static class RuntimeFeature
 	internal static bool EventSourceSupport { get; } =
 		!AppContext.TryGetSwitch (EventSourceSupportSwitch, out bool isEnabled) || isEnabled;
 
-	// Enabled for Debug builds, whose string-based typemaps support Fast Deployment without embedding assembly MVIDs.
-	[FeatureSwitchDefinition ($"{FeatureSwitchPrefix}{nameof (ManagedToJavaUsesAssemblyFullName)}")]
-	internal static bool ManagedToJavaUsesAssemblyFullName { get; } =
-		AppContext.TryGetSwitch ($"{FeatureSwitchPrefix}{nameof (ManagedToJavaUsesAssemblyFullName)}", out bool isEnabled) ? isEnabled : ManagedToJavaUsesAssemblyFullNameEnabledByDefault;
 }
diff --git a/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs b/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs
index ca6be17f1c5..ef1c6b17d6e 100644
--- a/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs
+++ b/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs
@@ -27,7 +27,7 @@ public class TrimmableTypeMap
 
 	internal static TrimmableTypeMap Instance =>
 		s_instance ?? throw new InvalidOperationException (
-			"TrimmableTypeMap has not been initialized. Ensure RuntimeFeature.TrimmableTypeMap is enabled and the JNI runtime is initialized.");
+			"TrimmableTypeMap has not been initialized. Ensure the JNI runtime is initialized.");
 
 	readonly ITypeMap _typeMap;
 	readonly ConcurrentDictionary<Type, JavaPeerProxy> _proxyCache = new ();
@@ -94,7 +94,7 @@ internal static unsafe void RegisterNativeMethods ()
 
 			if (s_instance is null) {
 				throw new InvalidOperationException (
-					"TrimmableTypeMap has not been initialized. Ensure RuntimeFeature.TrimmableTypeMap is enabled and the JNI runtime is initialized.");
+					"TrimmableTypeMap has not been initialized. Ensure the JNI runtime is initialized.");
 			}
 
 			using var runtimeClass = new JniType ("mono/android/Runtime"u8);
diff --git a/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs b/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs
index a5e4e230bfd..219ccf8ad13 100644
--- a/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs
+++ b/src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs
@@ -63,7 +63,7 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
 
 	public override void ActivatePeer (JniObjectReference reference, Type type, ConstructorInfo cinfo, object?[]? argumentValues)
 	{
-		throw new PlatformNotSupportedException ("Activating Java peers through the value manager is not supported when TrimmableTypeMap is enabled.");
+		throw new PlatformNotSupportedException ("Activating Java peers through the value manager is not supported.");
 	}
 
 	protected override void ConstructPeerCore (
@@ -181,7 +181,7 @@ protected override void ConstructPeerCore (
 
 			throw new NotSupportedException (
 				$"No generated {nameof (JavaPeerProxy)} was found for Java type '{javaType}' " +
-				$"with targetType '{targetName}' while {nameof (RuntimeFeature.TrimmableTypeMap)} is enabled. " +
+				$"with targetType '{targetName}'. " +
 				$"This indicates a missing trimmable typemap proxy or association and should be fixed in the generator.");
 		}
 
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index 3001ecf7dd3..183aaa6d818 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -368,7 +368,6 @@
     <Compile Include="Microsoft.Android.Runtime\ITypeMap.cs" />
     <Compile Include="Microsoft.Android.Runtime\JniRemappingLookup.cs" />
     <Compile Include="Microsoft.Android.Runtime\JavaMarshalRegisteredPeers.cs" />
-    <Compile Include="Microsoft.Android.Runtime\JavaMarshalValueManager.cs" />
     <Compile Include="Microsoft.Android.Runtime\PrimitiveArrayInfo.cs" />
     <Compile Include="Microsoft.Android.Runtime\RuntimeEventSource.cs" />
     <Compile Include="Microsoft.Android.Runtime\SingleUniverseTypeMap.cs" />
diff --git a/src/Mono.Android/java/mono/android/TypeManager.java b/src/Mono.Android/java/mono/android/TypeManager.java
deleted file mode 100644
index 035dd91228b..00000000000
--- a/src/Mono.Android/java/mono/android/TypeManager.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package mono.android;
-
-public class TypeManager {
-
-	public static void Activate (String typeName, String sig, Object instance, Object[] parameterList)
-	{
-		n_activate (typeName, sig, instance, parameterList);
-	}
-
-	private static native void n_activate (String typeName, String sig, Object instance, Object[] parameterList);
-
-//#MARSHAL_METHODS:START - do not remove or modify this line, it is required during application build
-	static {
-		String methods = 
-			"n_activate:(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)V:GetActivateHandler\n" +
-			"";
-		mono.android.Runtime.register ("Java.Interop.TypeManager+JavaTypeManager, Mono.Android", TypeManager.class, methods);
-	}
-//#MARSHAL_METHODS:END - do not remove or modify this line, it is required during application build
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.CoreCLR.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.CoreCLR.targets
index dc9feb20cdf..9ea09c2d056 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.CoreCLR.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.CoreCLR.targets
@@ -35,10 +35,6 @@ This file contains the CoreCLR-specific MSBuild logic for .NET for Android.
         Value="false"
         Trim="true"
     />
-    <RuntimeHostConfigurationOption Include="Microsoft.Android.Runtime.RuntimeFeature.ManagedToJavaUsesAssemblyFullName"
-        Value="$(AndroidIncludeDebugSymbols)"
-        Trim="true"
-    />
   </ItemGroup>
 
   <Target Name="_CLRUseLocalRuntimePacks" AfterTargets="ResolveFrameworkReferences"
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
index 35d4ba1d933..de8264ba5f9 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
@@ -3,7 +3,6 @@
 
   <UsingTask TaskName="Microsoft.Android.Tasks.GenerateTrimmableTypeMap" AssemblyFile="$(_MicrosoftAndroidBuildTasksAssembly)" Runtime="NET" TaskFactory="TaskHostFactory" Condition=" '$(MSBuildRuntimeType)' == 'Full' " />
   <UsingTask TaskName="Microsoft.Android.Tasks.GenerateTrimmableTypeMap" AssemblyFile="$(_MicrosoftAndroidBuildTasksAssembly)" Runtime="NET" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
-  <UsingTask TaskName="Xamarin.Android.Tasks.GenerateEmptyTypemapStub" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
   <UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeAotBootstrapSources" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
   <UsingTask TaskName="Xamarin.Android.Tasks.GenerateCoreClrRuntimeProviderSources" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
   <UsingTask TaskName="Xamarin.Android.Tasks.GenerateProguardConfiguration" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
@@ -81,8 +80,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <RuntimeHostConfigurationOption Include="Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap"
-        Value="true" Trim="true" />
     <RuntimeHostConfigurationOption Include="Microsoft.Android.Runtime.RuntimeFeature.UseTypeMapAttributesForJavaDictionaryValueTypeLookups"
         Value="$([MSBuild]::ValueOrDefault('$(PublishAot)', 'false'))" Trim="true" />
     <RuntimeHostConfigurationOption Include="System.Runtime.InteropServices.TypeMappingEntryAssembly"
@@ -450,7 +447,7 @@
     (_GetGeneratePackageManagerJavaInputs) can still read @(_GenerateJavaStubsInputs).
   -->
   <Target Name="_GenerateJavaStubs"
-      DependsOnTargets="_SetLatestTargetFrameworkVersion;_PrepareAssemblies;_GetGenerateJavaStubsInputs;_DefineBuildTargetAbis;_PrepareNativeAssemblySources"
+      DependsOnTargets="_SetLatestTargetFrameworkVersion;_PrepareAssemblies;_GetGenerateJavaStubsInputs;_DefineBuildTargetAbis"
       Inputs="$(_TrimmableTypeMapOutputStamp);$(_TrimmableJavaSourceStamp);@(_EnvironmentFiles)"
       Outputs="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp">
 
@@ -507,27 +504,6 @@
     <Touch Files="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp" AlwaysCreate="True" />
   </Target>
 
-  <!-- Native typemap stubs -->
-  <Target Name="_PrepareNativeAssemblySources"
-      Condition=" '$(_AndroidRuntime)' != 'NativeAOT' "
-      Inputs="@(_BuildTargetAbis)"
-      Outputs="@(_BuildTargetAbis->'$(_NativeAssemblySourceDir)typemap.%(Identity).ll')">
-    <ItemGroup>
-      <_TypeMapStubAbis Include="@(_BuildTargetAbis)" />
-      <_TypeMapAssemblySource Include="@(_TypeMapStubAbis->'$(_NativeAssemblySourceDir)typemap.%(Identity).ll')">
-        <abi>%(_TypeMapStubAbis.Identity)</abi>
-      </_TypeMapAssemblySource>
-    </ItemGroup>
-    <MakeDir Directories="$(_NativeAssemblySourceDir)" />
-    <GenerateEmptyTypemapStub
-        OutputDirectory="$(_NativeAssemblySourceDir)"
-        Abis="@(_TypeMapStubAbis)"
-        Debug="$(AndroidIncludeDebugSymbols)" />
-    <ItemGroup>
-      <FileWrites Include="@(_TypeMapAssemblySource)" />
-    </ItemGroup>
-  </Target>
-
   <!--
     Keep the resource designer assembly on the trimmable type map path.
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs
index e3366e8e224..3de61d74bcc 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs
@@ -23,8 +23,6 @@ public class BuildAppBundle : BundleTool
 
 		static readonly string [] UncompressedByDefault = new [] {
 			// .NET for Android specific files
-			"typemap.mj",
-			"typemap.jm",
 			"assemblies/**",
 			// Android specific files, listed here:
 			// https://github.com/google/bundletool/blob/5ac94cb61e949f135c50f6ce52bbb5f00e8e959f/src/main/java/com/android/tools/build/bundletool/io/ApkSerializerHelper.java#L111-L115
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
deleted file mode 100644
index 87ed570b634..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-#nullable enable
-
-using System;
-using System.IO;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Generates empty native typemap LLVM IR stub files (typemap.{abi}.ll) for the trimmable typemap path.
-/// These are compiled by the native toolchain to provide the type_map and related symbols that libmonodroid.so expects.
-/// </summary>
-public class GenerateEmptyTypemapStub : AndroidTask
-{
-	public override string TaskPrefix => "GETS";
-
-	[Required]
-	public string OutputDirectory { get; set; } = "";
-
-	[Required]
-	public ITaskItem [] Abis { get; set; } = [];
-
-	public bool Debug { get; set; }
-
-	public override bool RunTask ()
-	{
-		Directory.CreateDirectory (OutputDirectory);
-
-		foreach (var abi in Abis) {
-			string abiName = abi.ItemSpec;
-			string stubPath = Path.Combine (OutputDirectory, $"typemap.{abiName}.ll");
-			Files.CopyIfStringChanged (GenerateStubLlvmIr (abiName), stubPath);
-		}
-
-		return !Log.HasLoggedErrors;
-	}
-
-	string GenerateStubLlvmIr (string abi)
-	{
-		var (triple, datalayout) = abi switch {
-			"arm64-v8a" => ("aarch64-unknown-linux-android21", "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"),
-			"x86_64" => ("x86_64-unknown-linux-android21", "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"),
-			"armeabi-v7a" => ("armv7-unknown-linux-androideabi21", "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"),
-			"x86" => ("i686-unknown-linux-android21", "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128"),
-			_ => throw new NotSupportedException ($"Unsupported ABI: {abi}"),
-		};
-
-		string header = $$"""
-; ModuleID = 'typemap.{{abi}}.ll'
-source_filename = "typemap.{{abi}}.ll"
-target datalayout = "{{datalayout}}"
-target triple = "{{triple}}"
-
-""";
-
-		if (Debug) {
-			return header + """
-%struct.TypeMap = type { i32, ptr, ptr }
-%struct.TypeMapManagedTypeInfo = type { i32, i32 }
-
-@type_map = dso_local constant %struct.TypeMap zeroinitializer, align 8
-@type_map_managed_type_info = dso_local constant [0 x %struct.TypeMapManagedTypeInfo] zeroinitializer, align 8
-@type_map_assembly_names = dso_local constant [1 x i8] zeroinitializer, align 1
-@type_map_managed_type_names = dso_local constant [1 x i8] zeroinitializer, align 1
-@type_map_java_type_names = dso_local constant [1 x i8] zeroinitializer, align 1
-""";
-		}
-
-		return header + """
-@managed_to_java_map_module_count = dso_local constant i32 0, align 4
-@managed_to_java_map = dso_local constant [0 x i8] zeroinitializer, align 8
-@java_to_managed_map = dso_local constant [0 x i8] zeroinitializer, align 8
-@java_to_managed_hashes = dso_local constant [0 x i32] zeroinitializer, align 4
-@modules_map_data = dso_local constant [0 x i8] zeroinitializer, align 8
-@modules_duplicates_data = dso_local constant [0 x i8] zeroinitializer, align 8
-@java_type_count = dso_local constant i32 0, align 4
-@java_type_names = dso_local constant [1 x i8] zeroinitializer, align 1
-@java_type_names_size = dso_local constant i64 0, align 8
-@managed_type_names = dso_local constant [1 x i8] zeroinitializer, align 1
-@managed_assembly_names = dso_local constant [1 x i8] zeroinitializer, align 1
-""";
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
index d333e1d899f..8fe4acf9d73 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
@@ -173,7 +173,6 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 
 			int android_runtime_jnienv_class_token = -1;
 			int jnienv_initialize_method_token = -1;
-			int jnienv_registerjninatives_method_token = -1;
 			foreach (var assembly in ResolvedAssemblies) {
 				if (ShouldSkipAssembly (assembly)) {
 					continue;
@@ -190,7 +189,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 					continue;
 				}
 
-				GetRequiredTokens (assembly.ItemSpec, out android_runtime_jnienv_class_token, out jnienv_initialize_method_token, out jnienv_registerjninatives_method_token);
+				GetRequiredTokens (assembly.ItemSpec, out android_runtime_jnienv_class_token, out jnienv_initialize_method_token);
 			}
 
 			if (AdditionalResolvedAssemblies != null) {
@@ -232,7 +231,6 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 				UsesAssemblyPreload = envBuilder.Parser.UsesAssemblyPreload,
 				AndroidPackageName = AndroidPackageName,
 				PackageNamingPolicy = pnp,
-				JniAddNativeMethodRegistrationAttributePresent = false,
 				NumberOfAssembliesInApk = assemblyCount,
 				BundledAssemblyNameWidth = assemblyNameWidth,
 				NativeLibraries = uniqueNativeLibraries,
@@ -240,7 +238,6 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 				NativeLibrariesAlwaysJniPreload = NativeLibrariesAlwaysJniPreload,
 				AndroidRuntimeJNIEnvToken = android_runtime_jnienv_class_token,
 				JNIEnvInitializeToken = jnienv_initialize_method_token,
-				JNIEnvRegisterJniNativesToken = jnienv_registerjninatives_method_token,
 				JniRemappingReplacementTypeCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementTypeCount,
 				JniRemappingReplacementMethodIndexEntryCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementMethodIndexEntryCount,
 				MarshalMethodsEnabled = false,
@@ -279,19 +276,14 @@ bool ShouldIgnoreSplitConfigs ()
 			return BundleConfigSplitConfigsChecker.ShouldIgnoreSplitConfigs (Log, CustomBundleConfigFile);
 		}
 
-		void GetRequiredTokens (string assemblyFilePath, out int android_runtime_jnienv_class_token, out int jnienv_initialize_method_token, out int jnienv_registerjninatives_method_token)
+		void GetRequiredTokens (string assemblyFilePath, out int android_runtime_jnienv_class_token, out int jnienv_initialize_method_token)
 		{
 			using (var pe = new PEReader (File.OpenRead (assemblyFilePath))) {
-				GetRequiredTokens (pe.GetMetadataReader (), out android_runtime_jnienv_class_token, out jnienv_initialize_method_token, out jnienv_registerjninatives_method_token);
+				GetRequiredTokens (pe.GetMetadataReader (), out android_runtime_jnienv_class_token, out jnienv_initialize_method_token);
 			}
 
-			if (android_runtime_jnienv_class_token == -1 || jnienv_initialize_method_token == -1 || jnienv_registerjninatives_method_token == -1) {
-
-				// In the trimmable typemap path (CoreCLR), some JNIEnvInit methods may be trimmed.
-				// Use token 0 for missing tokens — native code will skip them.
-				if (jnienv_registerjninatives_method_token == -1) {
-					jnienv_registerjninatives_method_token = 0;
-				}
+			if (android_runtime_jnienv_class_token == -1 || jnienv_initialize_method_token == -1) {
+				// Use token 0 for missing tokens; native code will skip them.
 				if (jnienv_initialize_method_token == -1) {
 					jnienv_initialize_method_token = 0;
 				}
@@ -301,11 +293,10 @@ void GetRequiredTokens (string assemblyFilePath, out int android_runtime_jnienv_
 			}
 		}
 
-		void GetRequiredTokens (MetadataReader reader, out int android_runtime_jnienv_class_token, out int jnienv_initialize_method_token, out int jnienv_registerjninatives_method_token)
+		void GetRequiredTokens (MetadataReader reader, out int android_runtime_jnienv_class_token, out int jnienv_initialize_method_token)
 		{
 			android_runtime_jnienv_class_token = -1;
 			jnienv_initialize_method_token = -1;
-			jnienv_registerjninatives_method_token = -1;
 
 			TypeDefinition? typeDefinition = null;
 
@@ -330,11 +321,9 @@ void GetRequiredTokens (MetadataReader reader, out int android_runtime_jnienv_cl
 
 				if (jnienv_initialize_method_token == -1 && MonoAndroidHelper.StringEquals (name, "Initialize")) {
 					jnienv_initialize_method_token = MetadataTokens.GetToken (reader, methodHandle);
-				} else if (jnienv_registerjninatives_method_token == -1 && MonoAndroidHelper.StringEquals (name, "RegisterJniNatives")) {
-					jnienv_registerjninatives_method_token = MetadataTokens.GetToken (reader, methodHandle);
 				}
 
-				if (jnienv_initialize_method_token != -1 && jnienv_registerjninatives_method_token != -1) {
+				if (jnienv_initialize_method_token != -1) {
 					break;
 				}
 			}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
deleted file mode 100644
index db89fe63a2e..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Generates an empty native marshal-method compatibility source and optional P/Invoke
-/// preservation code. The compatibility source supplies symbols expected by the native host.
-/// </summary>
-/// <remarks>
-/// The generated LLVM IR (.ll) is compiled with the other application native sources.
-/// </remarks>
-public class GenerateNativeMarshalMethodSources : AndroidTask
-{
-	/// <summary>
-	/// Gets the task prefix used for logging and error messages.
-	/// </summary>
-	public override string TaskPrefix => "GNM";
-
-	/// <summary>
-	/// Gets or sets whether native runtime linking is enabled.
-	/// When true, generates additional P/Invoke preservation code to prevent
-	/// native linker from removing required methods.
-	/// </summary>
-	public bool EnableNativeRuntimeLinking { get; set; }
-
-	/// <summary>
-	/// Gets or sets the Mono runtime components to include in the build.
-	/// Used for P/Invoke preservation when native linking is enabled.
-	/// </summary>
-	public ITaskItem[] MonoComponents { get; set; } = [];
-
-	/// <summary>
-	/// Gets or sets the output directory for environment files.
-	/// Generated LLVM IR files are written to this directory.
-	/// </summary>
-	[Required]
-	public string EnvironmentOutputDirectory { get; set; } = "";
-
-	/// <summary>
-	/// Gets or sets the resolved assemblies to process.
-	/// These assemblies are scanned for P/Invokes when native linking is enabled.
-	/// </summary>
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	/// <summary>
-	/// Gets or sets the target Android runtime.
-	/// </summary>
-	[Required]
-	public string AndroidRuntime { get; set; } = "";
-
-	/// <summary>
-	/// Gets or sets the list of supported Android ABIs to generate code for.
-	/// Common values include arm64-v8a, armeabi-v7a, x86_64, and x86.
-	/// </summary>
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	// Parsed Android runtime type
-	AndroidRuntime androidRuntime;
-
-	/// <summary>
-	/// Executes the native marshal method source generation task.
-	/// Coordinates the generation of LLVM IR files for all supported Android ABIs.
-	/// </summary>
-	/// <returns>
-	/// true if the task completed successfully; false if errors occurred during processing.
-	/// </returns>
-	/// <remarks>
-	/// The execution flow is:
-	/// 
-	/// 1. Parse the Android runtime type
-	/// 2. Scan framework assemblies for P/Invokes when native linking is enabled
-	/// 3. Generate LLVM IR files for each supported ABI
-	/// 4. Write the empty marshal-method source
-	/// </remarks>
-	public override bool RunTask ()
-	{
-		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
-
-		// Generate native code for each supported ABI
-		foreach (var abi in SupportedAbis)
-			Generate (abi);
-
-		return !Log.HasLoggedErrors;
-	}
-
-	/// <summary>
-	/// Generates native LLVM IR source files for a specific Android ABI.
-	/// Creates the empty marshal-method source and optional P/Invoke preservation code.
-	/// </summary>
-	/// <param name="abi">The target Android ABI to generate code for (e.g., "arm64-v8a").</param>
-	/// <remarks>
-	/// This method handles the complete code generation workflow:
-	/// 
-	/// 1. **Setup**: Determines target architecture, file paths, and assembly information
-	/// 2. **Generator Creation**: Creates the empty compatibility source
-	/// 3. **P/Invoke Preservation** (optional): Generates code to preserve P/Invoke methods
-	/// 4. **Compatibility Stub**: Generates the empty marshal-method LLVM IR
-	/// 5. **File Output**: Writes generated code to disk with proper error handling
-	/// 
-	/// The generated files are:
-	/// - `marshal_methods.{abi}.ll`: Empty marshal-method compatibility LLVM IR
-	/// - `pinvoke_preserve.{abi}.ll`: P/Invoke preservation code (when native linking enabled)
-	/// 
-	/// Both generators construct an LLVM IR module and then generate the actual code,
-	/// with proper stream management and error recovery in case of partial writes.
-	/// </remarks>
-	void Generate (string abi)
-	{
-		// Setup target information and file paths
-		var targetAbi = abi.ToLowerInvariant ();
-		var targetArch = MonoAndroidHelper.AbiToTargetArch (abi);
-		var marshalMethodsBaseAsmFilePath = Path.Combine (EnvironmentOutputDirectory, $"marshal_methods.{targetAbi}");
-		var pinvokePreserveBaseAsmFilePath = EnableNativeRuntimeLinking ? Path.Combine (EnvironmentOutputDirectory, $"pinvoke_preserve.{targetAbi}") : null;
-		var marshalMethodsLlFilePath = $"{marshalMethodsBaseAsmFilePath}.ll";
-		var pinvokePreserveLlFilePath = pinvokePreserveBaseAsmFilePath != null ? $"{pinvokePreserveBaseAsmFilePath}.ll" : null;
-		// Generate the native host's empty marshal-method compatibility symbols.
-		MarshalMethodsNativeAssemblyGenerator marshalMethodsAsmGen = androidRuntime switch {
-			Tasks.AndroidRuntime.CoreCLR => new MarshalMethodsNativeAssemblyGenerator (Log),
-			_ => throw new NotSupportedException ($"Internal error: unsupported runtime type '{androidRuntime}'")
-		};
-
-		// Generate P/Invoke preservation code if native linking is enabled
-		bool fileFullyWritten;
-		if (EnableNativeRuntimeLinking) {
-			var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, targetArch, ScanPInvokes (targetArch), MonoComponents);
-			LLVMIR.LlvmIrModule pinvokePreserveModule = pinvokePreserveGen.Construct ();
-			using var pinvokePreserveWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
-			fileFullyWritten = false;
-			try {
-				pinvokePreserveGen.Generate (pinvokePreserveModule, targetArch, pinvokePreserveWriter, pinvokePreserveLlFilePath!);
-				pinvokePreserveWriter.Flush ();
-				Files.CopyIfStreamChanged (pinvokePreserveWriter.BaseStream, pinvokePreserveLlFilePath!);
-				fileFullyWritten = true;
-			} finally {
-				// Log partial contents for debugging if generation failed
-				if (!fileFullyWritten) {
-					MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{pinvokePreserveLlFilePath}'", pinvokePreserveWriter.BaseStream);
-				}
-			}
-		}
-
-		// Generate marshal methods code
-		var marshalMethodsModule = marshalMethodsAsmGen.Construct ();
-		using var marshalMethodsWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
-
-		fileFullyWritten = false;
-		try {
-			marshalMethodsAsmGen.Generate (marshalMethodsModule, targetArch, marshalMethodsWriter, marshalMethodsLlFilePath);
-			marshalMethodsWriter.Flush ();
-			Files.CopyIfStreamChanged (marshalMethodsWriter.BaseStream, marshalMethodsLlFilePath);
-			fileFullyWritten = true;
-		} finally {
-			// Log partial contents for debugging if generation failed
-			if (!fileFullyWritten) {
-				MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{marshalMethodsLlFilePath}'", marshalMethodsWriter.BaseStream);
-			}
-		}
-	}
-
-	List<PinvokeScanner.PinvokeEntryInfo> ScanPInvokes (AndroidTargetArch arch)
-	{
-		// Generated trimmable type map assemblies are attached only to the first ABI.
-		var assemblies = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: false);
-		if (!assemblies.TryGetValue (arch, out var archAssemblies)) {
-			throw new InvalidOperationException ($"No resolved assemblies for architecture '{arch}'.");
-		}
-		var frameworkAssemblies = archAssemblies.Values
-			.Where (assembly => bool.TryParse (assembly.GetMetadata ("FrameworkAssembly"), out bool isFramework) && isFramework)
-			.ToList ();
-		using var resolver = MonoAndroidHelper.MakeResolver (Log, arch, archAssemblies, loadDebugSymbols: false);
-		return new PinvokeScanner (Log).Scan (arch, resolver, frameworkAssemblies);
-	}
-
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs
new file mode 100644
index 00000000000..3c50e45cfc3
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs
@@ -0,0 +1,113 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
+using Xamarin.Android.Tools;
+
+namespace Xamarin.Android.Tasks;
+
+/// <summary>
+/// Generates P/Invoke preservation code for native runtime linking.
+/// </summary>
+/// <remarks>
+/// The generated LLVM IR (.ll) is compiled with the other application native sources.
+/// </remarks>
+public class GenerateNativeRuntimeLinkingSources : AndroidTask
+{
+	/// <summary>
+	/// Gets the task prefix used for logging and error messages.
+	/// </summary>
+	public override string TaskPrefix => "GNM";
+
+	/// <summary>
+	/// Gets or sets the Mono runtime components to include in the build.
+	/// Used for P/Invoke preservation.
+	/// </summary>
+	public ITaskItem[] MonoComponents { get; set; } = [];
+
+	/// <summary>
+	/// Gets or sets the output directory for environment files.
+	/// Generated LLVM IR files are written to this directory.
+	/// </summary>
+	[Required]
+	public string EnvironmentOutputDirectory { get; set; } = "";
+
+	/// <summary>
+	/// Gets or sets the resolved assemblies to process.
+	/// These assemblies are scanned for P/Invokes when native linking is enabled.
+	/// </summary>
+	[Required]
+	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
+
+	/// <summary>
+	/// Gets or sets the list of supported Android ABIs to generate code for.
+	/// Common values include arm64-v8a, armeabi-v7a, x86_64, and x86.
+	/// </summary>
+	[Required]
+	public string [] SupportedAbis { get; set; } = [];
+
+	/// <summary>
+	/// Generates the P/Invoke preservation sources for all supported Android ABIs.
+	/// </summary>
+	/// <returns>
+	/// true if the task completed successfully; false if errors occurred during processing.
+	/// </returns>
+	/// <remarks>
+	/// Scans framework assemblies for P/Invokes and emits LLVM IR for each ABI.
+	/// </remarks>
+	public override bool RunTask ()
+	{
+		foreach (var abi in SupportedAbis)
+			Generate (abi);
+
+		return !Log.HasLoggedErrors;
+	}
+
+	/// <summary>
+	/// Generates a native LLVM IR P/Invoke preservation source for an ABI.
+	/// </summary>
+	/// <param name="abi">The target Android ABI to generate code for (e.g., "arm64-v8a").</param>
+	/// <remarks>
+	/// Writes <c>pinvoke_preserve.{abi}.ll</c>.
+	/// </remarks>
+	void Generate (string abi)
+	{
+		// Setup target information and file paths
+		var targetAbi = abi.ToLowerInvariant ();
+		var targetArch = MonoAndroidHelper.AbiToTargetArch (abi);
+		var pinvokePreserveLlFilePath = Path.Combine (EnvironmentOutputDirectory, $"pinvoke_preserve.{targetAbi}.ll");
+
+		var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, targetArch, ScanPInvokes (targetArch), MonoComponents);
+		LLVMIR.LlvmIrModule pinvokePreserveModule = pinvokePreserveGen.Construct ();
+		using var pinvokePreserveWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
+		bool fileFullyWritten = false;
+		try {
+			pinvokePreserveGen.Generate (pinvokePreserveModule, targetArch, pinvokePreserveWriter, pinvokePreserveLlFilePath);
+			pinvokePreserveWriter.Flush ();
+			Files.CopyIfStreamChanged (pinvokePreserveWriter.BaseStream, pinvokePreserveLlFilePath);
+			fileFullyWritten = true;
+		} finally {
+			if (!fileFullyWritten) {
+				MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{pinvokePreserveLlFilePath}'", pinvokePreserveWriter.BaseStream);
+			}
+		}
+	}
+
+	List<PinvokeScanner.PinvokeEntryInfo> ScanPInvokes (AndroidTargetArch arch)
+	{
+		// Generated trimmable type map assemblies are attached only to the first ABI.
+		var assemblies = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: false);
+		if (!assemblies.TryGetValue (arch, out var archAssemblies)) {
+			throw new InvalidOperationException ($"No resolved assemblies for architecture '{arch}'.");
+		}
+		var frameworkAssemblies = archAssemblies.Values
+			.Where (assembly => bool.TryParse (assembly.GetMetadata ("FrameworkAssembly"), out bool isFramework) && isFramework)
+			.ToList ();
+		using var resolver = MonoAndroidHelper.MakeResolver (Log, arch, archAssemblies, loadDebugSymbols: false);
+		return new PinvokeScanner (Log).Scan (arch, resolver, frameworkAssemblies);
+	}
+
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
index 1f77da7a250..023dc507fbc 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
@@ -15,7 +15,6 @@ public class PrepareAbiItems : AndroidTask
 		const string EnvBase = "environment";
 		const string CompressedAssembliesBase = "compressed_assemblies";
 		const string JniRemappingBase = "jni_remap";
-		const string MarshalMethodsBase = "marshal_methods";
 		const string PinvokePreserveBase = "pinvoke_preserve";
 		const string JniInitFuncsBase = "jni_init_funcs";
 
@@ -51,8 +50,6 @@ public override bool RunTask ()
 				baseName = CompressedAssembliesBase;
 			} else if (MonoAndroidHelper.StringEquals ("jniremap", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = JniRemappingBase;
-			} else if (MonoAndroidHelper.StringEquals ("marshal_methods", Mode, StringComparison.OrdinalIgnoreCase)) {
-				baseName = MarshalMethodsBase;
 			} else if (MonoAndroidHelper.StringEquals ("runtime_linking", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = PinvokePreserveBase;
 			} else if (MonoAndroidHelper.StringEquals ("jni_init", Mode, StringComparison.OrdinalIgnoreCase)) {
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
index 95c1cc36fa7..3b7f28e539c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -1280,16 +1280,6 @@ public void CheckTimestamps ([Values] bool isRelease, [Values (AndroidRuntime.Co
 				start = DateTime.UtcNow;
 				Assert.IsTrue (b.Build (proj), "second build should have succeeded.");
 
-				// These files won't exist in OSS .NET for Android, thus the existence check and
-				// Assert.Ignore below. They will also not exist in the commercial version of
-				// .NET for Android unless fastdev is enabled.
-				foreach (var file in new [] { "typemap.mj", "typemap.jm" }) {
-					var info = new FileInfo (Path.Combine (intermediate, "android", file));
-					if (info.Exists) {
-						Assert.IsTrue (info.LastWriteTimeUtc > start, $"`{file}` is older than `{start}`, with a timestamp of `{info.LastWriteTimeUtc}`!");
-					}
-				}
-
 				//One last build with no changes
 				Assert.IsTrue (b.Build (proj), "third build should have succeeded.");
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
index 1eed625101d..2e899d3032f 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
@@ -1440,12 +1440,8 @@ public void GenerateJavaStubsAndAssembly ([Values] bool isRelease, [Values (Andr
 
 				if (!isRelease && runtime == AndroidRuntime.CoreCLR) {
 					string projectDirectory = Path.Combine (Root, b.ProjectDirectory);
-					string intermediate = Path.Combine (projectDirectory, proj.IntermediateOutputPath, MonoAndroidHelper.AbiToRid (abi));
-					string typemap = Path.Combine (intermediate, "android", $"typemaps.{abi}.ll");
 					string apk = Directory.GetFiles (Path.Combine (projectDirectory, proj.OutputPath), "*-Signed.apk", SearchOption.AllDirectories).Single ();
-					DateTime typemapWriteTime = File.GetLastWriteTimeUtc (typemap);
 					DateTime apkWriteTime = File.GetLastWriteTimeUtc (apk);
-					string typemapHash = Files.HashFile (typemap);
 					string apkHash = Files.HashFile (apk);
 
 					// Change managed code without changing any Java type mappings.
@@ -1458,8 +1454,6 @@ public void GenerateJavaStubsAndAssembly ([Values] bool isRelease, [Values (Andr
 					b.Output.AssertTargetIsSkipped ("_CreateApplicationSharedLibraries");
 					b.Output.AssertTargetIsSkipped ("_BuildApkFastDev");
 					b.Output.AssertTargetIsSkipped ("_Sign");
-					Assert.AreEqual (typemapWriteTime, File.GetLastWriteTimeUtc (typemap), $"{typemap} should not be rewritten when its mappings have not changed.");
-					Assert.AreEqual (typemapHash, Files.HashFile (typemap), $"{typemap} contents should not change.");
 					Assert.AreEqual (apkWriteTime, File.GetLastWriteTimeUtc (apk), $"{apk} should not be rewritten for an incremental C# change.");
 					Assert.AreEqual (apkHash, Files.HashFile (apk), $"{apk} contents should not change.");
 				}
@@ -1469,8 +1463,6 @@ public void GenerateJavaStubsAndAssembly ([Values] bool isRelease, [Values (Andr
 		readonly string [] ExpectedAssemblyFiles = new [] {
 			Path.Combine ("android", "environment.@ABI@.o"),
 			Path.Combine ("android", "environment.@ABI@.ll"),
-			Path.Combine ("android", "typemap.@ABI@.o"),
-			Path.Combine ("android", "typemap.@ABI@.ll"),
 			Path.Combine ("app_shared_libraries", "@ABI@", "libxamarin-app.so")
 		};
 
@@ -1488,6 +1480,13 @@ void AssertAssemblyFilesInFileWrites (XamarinAndroidApplicationProject proj, Pro
 				CollectionAssert.Contains (lines, path, $"{file} is not in FileWrites!");
 				FileAssert.Exists (path);
 			}
+			var typeMapAssembly = Path.Combine (intermediate, "typemap", "_Microsoft.Android.TypeMaps.dll");
+			CollectionAssert.Contains (lines, typeMapAssembly, "The managed type map assembly should be in FileWrites.");
+			FileAssert.Exists (typeMapAssembly);
+
+			foreach (var obsoleteSource in new [] { $"typemap.{abi}.ll", $"marshal_methods.{abi}.ll" }) {
+				FileAssert.DoesNotExist (Path.Combine (intermediate, "android", obsoleteSource));
+			}
 		}
 
 #pragma warning disable 414
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
index 6886977af32..1e11f0e39df 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
@@ -40,6 +40,10 @@ public void HaveAssemblyStoreIsEmittedForCoreCLR (bool haveAssemblyStore)
 		);
 		var config = (EnvironmentHelper.ApplicationConfig)EnvironmentHelper.ReadApplicationConfig (environmentFiles, AndroidRuntime.CoreCLR);
 		Assert.AreEqual (haveAssemblyStore, config.have_assembly_store);
+
+		string source = File.ReadAllText (Path.Combine (outputRoot, "android", "environment.arm64-v8a.ll"));
+		Assert.That (source, Does.Not.Contain ("jni_add_native_method_registration_attribute_present"));
+		Assert.That (source, Does.Not.Contain ("jnienv_registerjninatives_method_token"));
 	}
 
 	[Test]
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
index d9631f035c9..9fdd6e03778 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
@@ -82,25 +82,5 @@ public void GeneratedIR_FunctionWithWhitespaceParameterName_ProducesValidOutput
 			Assert.That (output, Does.Contain ("@test_function"), "Generated LLVM IR should contain the function name");
 		}
 
-		[Test]
-		public void EmptyMarshalMethodsSourceRetainsNativeHostEntryPoint ()
-		{
-			var log = new TaskLoggingHelper (new MockBuildEngine (TestContext.Out, [], [], []), "test");
-			var generator = new MarshalMethodsNativeAssemblyGenerator (log);
-			var module = generator.Construct ();
-
-			using var stream = new MemoryStream ();
-			using (var writer = new StreamWriter (stream, new UTF8Encoding (false), 1024, leaveOpen: true)) {
-				generator.Generate (module, AndroidTargetArch.Arm64, writer, "marshal_methods.arm64-v8a.ll");
-			}
-
-			stream.Position = 0;
-			using var reader = new StreamReader (stream);
-			string output = reader.ReadToEnd ();
-			Assert.That (output, Does.Contain ("@xamarin_app_init"));
-			Assert.That (output, Does.Contain ("@get_function_pointer"));
-			Assert.That (output, Does.Not.Contain ("@Java_"));
-		}
-
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
index 95ceae94026..dc3128a68da 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
@@ -43,7 +43,6 @@ public interface IApplicationConfig
 		public sealed class ApplicationConfig : IApplicationConfig
 		{
 			public bool   uses_assembly_preload;
-			public bool   jni_add_native_method_registration_attribute_present;
 			public bool   marshal_methods_enabled;
 			public bool   ignore_split_configs;
 			public uint   number_of_runtime_properties;
@@ -56,14 +55,13 @@ public sealed class ApplicationConfig : IApplicationConfig
 			public uint   number_of_shared_libraries;
 			public uint   android_runtime_jnienv_class_token;
 			public uint   jnienv_initialize_method_token;
-			public uint   jnienv_registerjninatives_method_token;
 			public uint   jni_remapping_replacement_type_count;
 			public uint   jni_remapping_replacement_method_index_entry_count;
 			public string android_package_name = String.Empty;
 			public bool   have_assembly_store;
 		}
 
-		const uint ApplicationConfigFieldCount_CoreCLR = 19;
+		const uint ApplicationConfigFieldCount_CoreCLR = 17;
 
 		// This is used by the CoreCLR host, not NativeAOT.
 		public sealed class DSOCacheEntry64
@@ -132,11 +130,6 @@ public sealed class JniPreloads
 			"format_tag",
 			"init_runtime_property_names",
 			"init_runtime_property_values",
-			"java_to_managed_hashes",
-			"java_to_managed_map",
-			"java_type_count",
-			"managed_to_java_map",
-			"managed_to_java_map_module_count",
 			AppEnvironmentVariableContentsSymbolName,
 			AppEnvironmentVariablesSymbolName,
 			ApplicationConfigSymbolName,
@@ -261,92 +254,82 @@ static IApplicationConfig ReadApplicationConfig_CoreCLR (EnvironmentFile envFile
 						ret.uses_assembly_preload = ConvertFieldToBool ("uses_assembly_preload", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 1: // jni_add_native_method_registration_attribute_present: bool / .byte
-						AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
-						ret.jni_add_native_method_registration_attribute_present = ConvertFieldToBool ("jni_add_native_method_registration_attribute_present", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
-						break;
-
-					case 2: // marshal_methods_enabled: bool / .byte
+					case 1: // marshal_methods_enabled: bool / .byte
 						AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
 						ret.marshal_methods_enabled = ConvertFieldToBool ("marshal_methods_enabled", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 3: // ignore_split_configs: bool / .byte
+					case 2: // ignore_split_configs: bool / .byte
 						AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
 						ret.ignore_split_configs = ConvertFieldToBool ("ignore_split_configs", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 4: // number_of_runtime_properties: uint32_t / .word | .long
+					case 3: // number_of_runtime_properties: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.number_of_runtime_properties = ConvertFieldToByte ("number_of_runtime_properties", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 5: // package_naming_policy: uint32_t / .word | .long
+					case 4: // package_naming_policy: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.package_naming_policy = ConvertFieldToUInt32 ("package_naming_policy", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 6: // environment_variable_count: uint32_t / .word | .long
+					case 5: // environment_variable_count: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.environment_variable_count = ConvertFieldToUInt32 ("environment_variable_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 7: // system_property_count: uint32_t / .word | .long
+					case 6: // system_property_count: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.system_property_count = ConvertFieldToUInt32 ("system_property_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 8: // number_of_assemblies_in_apk: uint32_t / .word | .long
+					case 7: // number_of_assemblies_in_apk: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.number_of_assemblies_in_apk = ConvertFieldToUInt32 ("number_of_assemblies_in_apk", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 9: // bundled_assembly_name_width: uint32_t / .word | .long
+					case 8: // bundled_assembly_name_width: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.bundled_assembly_name_width = ConvertFieldToUInt32 ("bundled_assembly_name_width", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 10: // number_of_dso_cache_entries: uint32_t / .word | .long
+					case 9: // number_of_dso_cache_entries: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.number_of_dso_cache_entries = ConvertFieldToUInt32 ("number_of_dso_cache_entries", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 11: // number_of_shared_libraries: uint32_t / .word | .long
+					case 10: // number_of_shared_libraries: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.number_of_shared_libraries = ConvertFieldToUInt32 ("number_of_shared_libraries", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 12: // android_runtime_jnienv_class_token: uint32_t / .word | .long
+					case 11: // android_runtime_jnienv_class_token: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.android_runtime_jnienv_class_token = ConvertFieldToUInt32 ("android_runtime_jnienv_class_token", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 13: // jnienv_initialize_method_token: uint32_t / .word | .long
+					case 12: // jnienv_initialize_method_token: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.jnienv_initialize_method_token = ConvertFieldToUInt32 ("jnienv_initialize_method_token", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 14: // jnienv_registerjninatives_method_token: uint32_t / .word | .long
-						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
-						ret.jnienv_registerjninatives_method_token = ConvertFieldToUInt32 ("jnienv_registerjninatives_method_token", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
-						break;
-
-					case 15: // jni_remapping_replacement_type_count: uint32_t / .word | .long
+					case 13: // jni_remapping_replacement_type_count: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.jni_remapping_replacement_type_count = ConvertFieldToUInt32 ("jni_remapping_replacement_type_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 16: // jni_remapping_replacement_method_index_entry_count: uint32_t / .word | .long
+					case 14: // jni_remapping_replacement_method_index_entry_count: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						ret.jni_remapping_replacement_method_index_entry_count = ConvertFieldToUInt32 ("jni_remapping_replacement_method_index_entry_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 17: // android_package_name: string / [pointer type]
+					case 15: // android_package_name: string / [pointer type]
 						Assert.IsTrue (expectedPointerTypes.Contains (field [0]), $"Unexpected pointer field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
 						pointers.Add (field [1].Trim ());
 						break;
 
-					case 18: // have_assembly_store: bool / .byte
+					case 16: // have_assembly_store: bool / .byte
 						AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
 						ret.have_assembly_store = ConvertFieldToBool ("have_assembly_store", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs
index e726f98fbde..ec788e1f126 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs
@@ -26,7 +26,6 @@ namespace Xamarin.Android.Tasks;
 sealed class ApplicationConfig
 {
 	public bool   uses_assembly_preload;
-	public bool   jni_add_native_method_registration_attribute_present;
 	public bool   marshal_methods_enabled;
 	public bool   ignore_split_configs;
 	public uint   number_of_runtime_properties;
@@ -45,7 +44,6 @@ sealed class ApplicationConfig
 	public uint   jnienv_initialize_method_token;
 
 	[NativeAssembler (NumberFormat = LLVMIR.LlvmIrVariableNumberFormat.Hexadecimal)]
-	public uint   jnienv_registerjninatives_method_token;
 	public uint   jni_remapping_replacement_type_count;
 	public uint   jni_remapping_replacement_method_index_entry_count;
 	public string android_package_name = String.Empty;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
index 7d11bc694bb..7bf0427a1bb 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
@@ -183,12 +183,10 @@ sealed class DsoCacheState
 
 	public bool UsesAssemblyPreload { get; set; }
 	public string AndroidPackageName { get; set; } = "";
-	public bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
 	public int NumberOfAssembliesInApk { get; set; }
 	public int BundledAssemblyNameWidth { get; set; } // including the trailing NUL
 	public int AndroidRuntimeJNIEnvToken { get; set; }
 	public int JNIEnvInitializeToken { get; set; }
-	public int JNIEnvRegisterJniNativesToken { get; set; }
 	public int JniRemappingReplacementTypeCount { get; set; }
 	public int JniRemappingReplacementMethodIndexEntryCount { get; set; }
 	public PackageNamingPolicy PackageNamingPolicy { get; set; }
@@ -267,7 +265,6 @@ protected override void Construct (LlvmIrModule module)
 		DsoCacheState dsoState = InitDSOCache ();
 		var app_cfg = new ApplicationConfig {
 			uses_assembly_preload = UsesAssemblyPreload,
-			jni_add_native_method_registration_attribute_present = JniAddNativeMethodRegistrationAttributePresent,
 			marshal_methods_enabled = MarshalMethodsEnabled,
 			ignore_split_configs = IgnoreSplitConfigs,
 			number_of_runtime_properties = (uint)(runtimeProperties == null ? 0 : runtimeProperties.Count),
@@ -280,7 +277,6 @@ protected override void Construct (LlvmIrModule module)
 			number_of_dso_cache_entries = (uint)dsoState.DsoCache.Count,
 			android_runtime_jnienv_class_token = (uint)AndroidRuntimeJNIEnvToken,
 			jnienv_initialize_method_token = (uint)JNIEnvInitializeToken,
-			jnienv_registerjninatives_method_token = (uint)JNIEnvRegisterJniNativesToken,
 			jni_remapping_replacement_type_count = (uint)JniRemappingReplacementTypeCount,
 			jni_remapping_replacement_method_index_entry_count = (uint)JniRemappingReplacementMethodIndexEntryCount,
 			android_package_name = AndroidPackageName,
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
deleted file mode 100644
index 53a165ca1c1..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Build.Utilities;
-using Xamarin.Android.Tasks.LLVMIR;
-
-namespace Xamarin.Android.Tasks;
-
-// The native host still expects xamarin_app_init even though marshal methods are disabled.
-class MarshalMethodsNativeAssemblyGenerator : LlvmIrComposer
-{
-	[NativeClass]
-	sealed class _JNIEnv
-	{}
-
-	public MarshalMethodsNativeAssemblyGenerator (TaskLoggingHelper log) : base (log)
-	{}
-
-	protected override void Construct (LlvmIrModule module)
-	{
-		module.DefaultStringGroup = "mm";
-
-		var getFunctionPtrVariable = module.AddGlobalVariable (
-			typeof (IntPtr),
-			"get_function_pointer",
-			null,
-			LlvmIrVariableOptions.LocalWritableInsignificantAddr,
-			" get_function_pointer (uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr)"
-		);
-
-		var initParams = new List<LlvmIrFunctionParameter> {
-			new (typeof (_JNIEnv), "env") {
-				NoCapture = true,
-				NoUndef = true,
-				ReadNone = true,
-			},
-			new (typeof (IntPtr), "fn") {
-				NoUndef = true,
-			},
-		};
-
-		var initSignature = new LlvmIrFunctionSignature (
-			name: "xamarin_app_init",
-			returnType: typeof (void),
-			parameters: initParams
-		);
-
-		var attributes = module.AddAttributeSet (new LlvmIrFunctionAttributeSet {
-			new MustprogressFunctionAttribute (),
-			new NofreeFunctionAttribute (),
-			new NorecurseFunctionAttribute (),
-			new NosyncFunctionAttribute (),
-			new NounwindFunctionAttribute (),
-			new WillreturnFunctionAttribute (),
-			new MemoryFunctionAttribute {
-				Default = MemoryAttributeAccessKind.Write,
-				Argmem = MemoryAttributeAccessKind.None,
-				InaccessibleMem = MemoryAttributeAccessKind.None,
-			},
-			new UwtableFunctionAttribute (),
-			new MinLegalVectorWidthFunctionAttribute (0),
-			new NoTrappingMathFunctionAttribute (true),
-			new StackProtectorBufferSizeFunctionAttribute (8),
-		});
-		var init = new LlvmIrFunction (initSignature, attributes);
-
-		// Name these variables so LLVM's unnamed labels remain sequential.
-		var fnNullResult = init.CreateLocalVariable (typeof (bool), "fnIsNull");
-		LlvmIrVariable putsResult = init.CreateLocalVariable (typeof (int), "putsResult");
-		var ifThenInstructions = new List<LlvmIrInstruction> {
-			module.CreatePuts ("get_function_pointer MUST be specified\n", putsResult),
-			module.CreateAbort (),
-			new LlvmIrInstructions.Unreachable (),
-		};
-
-		module.AddIfThenElse (init, fnNullResult, LlvmIrIcmpCond.Equal, initParams [1], null, ifThenInstructions);
-		init.Body.Store (initParams [1], getFunctionPtrVariable, module.TbaaAnyPointer);
-		init.Body.Ret (typeof (void));
-		module.Add (init);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 18705bbb9c2..543fd08ed66 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -59,7 +59,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateLibraryResources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateManagedAidlProxies" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeApplicationConfigSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeMarshalMethodSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
+<UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeRuntimeLinkingSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesigner" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesignerAssembly" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GeneratePackageManagerJava" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -1505,13 +1505,6 @@ because xbuild doesn't support framework reference assemblies.
     Mode="compressed">
       <Output TaskParameter="AssemblySources" ItemName="_CompressedAssembliesAssemblySource" />
   </PrepareAbiItems>
-  <PrepareAbiItems
-    BuildTargetAbis="@(_BuildTargetAbis)"
-    NativeSourcesDir="$(_NativeAssemblySourceDir)"
-    Debug="$(AndroidIncludeDebugSymbols)"
-    Mode="marshal_methods">
-      <Output TaskParameter="AssemblySources" ItemName="_MarshalMethodsAssemblySource" />
-  </PrepareAbiItems>
   <PrepareAbiItems
     Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' "
     BuildTargetAbis="@(_BuildTargetAbis)"
@@ -1680,19 +1673,17 @@ because xbuild doesn't support framework reference assemblies.
       >
   </GenerateNativeApplicationConfigSources>
 
-  <GenerateNativeMarshalMethodSources
-      AndroidRuntime="$(_AndroidRuntime)"
-      EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
+  <GenerateNativeRuntimeLinkingSources
+      Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' "
       MonoComponents="@(_MonoComponent)"
       EnvironmentOutputDirectory="$(IntermediateOutputPath)android"
       ResolvedAssemblies="@(_ResolvedAssemblies)"
       SupportedAbis="@(_BuildTargetAbis)">
-  </GenerateNativeMarshalMethodSources>
+  </GenerateNativeRuntimeLinkingSources>
 
   <Touch Files="$(_AndroidStampDirectory)_GeneratePackageManagerJava.stamp" AlwaysCreate="True" />
   <ItemGroup>
     <FileWrites Include="@(_EnvironmentAssemblySource)" />
-    <FileWrites Include="@(_MarshalMethodsAssemblySource)" />
     <FileWrites Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' " Include="@(_RuntimeLinkingAssemblySource)" />
   </ItemGroup>
 </Target>
@@ -1904,9 +1895,6 @@ because xbuild doesn't support framework reference assemblies.
 
 <Target Name="_PrepareNativeAssemblyItems" DependsOnTargets="_GenerateJavaStubs">
   <ItemGroup>
-    <_NativeAssemblyTarget Include="@(_TypeMapAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
-      <abi>%(_TypeMapAssemblySource.abi)</abi>
-    </_NativeAssemblyTarget>
     <_NativeAssemblyTarget Include="@(_EnvironmentAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
       <abi>%(_EnvironmentAssemblySource.abi)</abi>
     </_NativeAssemblyTarget>
@@ -1916,9 +1904,6 @@ because xbuild doesn't support framework reference assemblies.
     <_CompressedNativeAssemblyTarget Include="@(_CompressedAssembliesAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
       <abi>%(_CompressedAssembliesAssemblySource.abi)</abi>
     </_CompressedNativeAssemblyTarget>
-    <_NativeAssemblyTarget Include="@(_MarshalMethodsAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
-      <abi>%(_MarshalMethodsAssemblySource.abi)</abi>
-    </_NativeAssemblyTarget>
     <_NativeAssemblyTarget Include="@(_AndroidRemapAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
       <abi>%(_AndroidRemapAssemblySource.abi)</abi>
     </_NativeAssemblyTarget>
@@ -1946,10 +1931,10 @@ because xbuild doesn't support framework reference assemblies.
 
 <Target Name="_CompileNativeAssemblySources"
     DependsOnTargets="_PrepareNativeAssemblyItems;_GenerateCompressedAssembliesNativeSourceFiles"
-    Inputs="@(_TypeMapAssemblySource);@(_TypeMapAssemblyInclude);@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_MarshalMethodsAssemblySource);@(_AndroidRemapAssemblySource);@(_RuntimeLinkingAssemblySource)"
+    Inputs="@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_AndroidRemapAssemblySource);@(_RuntimeLinkingAssemblySource)"
     Outputs="@(_NativeAssemblyTarget)">
   <CompileNativeAssembly
-      Sources="@(_TypeMapAssemblySource);@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_MarshalMethodsAssemblySource);@(_AndroidRemapAssemblySource);@(_RuntimeLinkingAssemblySource)"
+      Sources="@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_AndroidRemapAssemblySource);@(_RuntimeLinkingAssemblySource)"
       DebugBuild="$(AndroidIncludeDebugSymbols)"
       WorkingDirectory="$(_NativeAssemblySourceDir)"
       AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
diff --git a/src/native/clr/host/CMakeLists.txt b/src/native/clr/host/CMakeLists.txt
index 4f91f28cb8c..67a7330f649 100644
--- a/src/native/clr/host/CMakeLists.txt
+++ b/src/native/clr/host/CMakeLists.txt
@@ -38,7 +38,6 @@ set(XAMARIN_MONODROID_SOURCES
   os-bridge.cc
   runtime-environment.cc
   runtime-util.cc
-  typemap.cc
 )
 
 if(DEBUG_BUILD)
diff --git a/src/native/clr/host/host.cc b/src/native/clr/host/host.cc
index 3fc603a446f..50ebd76532b 100644
--- a/src/native/clr/host/host.cc
+++ b/src/native/clr/host/host.cc
@@ -484,7 +484,6 @@ void Host::Java_mono_android_Runtime_initInternal (
 	init.brokenExceptionTransitions                     = 0;
 	init.packageNamingPolicy                            = static_cast<int>(application_config.package_naming_policy);
 	init.boundExceptionType                             = 0; // System
-	init.jniAddNativeMethodRegistrationAttributePresent = application_config.jni_add_native_method_registration_attribute_present ? 1 : 0;
 	init.jniRemappingInUse                              = application_config.jni_remapping_replacement_type_count > 0 || application_config.jni_remapping_replacement_method_index_entry_count > 0;
 	init.marshalMethodsEnabled                          = application_config.marshal_methods_enabled;
 	init.grefLogPath                                    = Logger::gref_log_path ();
@@ -536,10 +535,6 @@ void Host::Java_mono_android_Runtime_initInternal (
 	log_debugf (LOG_DEFAULT, "Calling into managed runtime init");
 	FastTiming::time_call ("JNIEnv.Initialize UCO"sv, initialize, &init);
 
-	// RegisterJniNatives and PropagateUncaughtException are returned from Initialize
-	// to avoid extra create_delegate calls. RegisterJniNatives is null when using the
-	// trimmable typemap path (the method is trimmed; registration is handled in managed code).
-	jnienv_register_jni_natives = init.registerJniNativesFn;
 	jnienv_propagate_uncaught_exception = init.propagateUncaughtExceptionFn;
 	abort_unless (jnienv_propagate_uncaught_exception != nullptr, "Failed to obtain unmanaged-callers-only function pointer to the PropagateUncaughtException method.");
 
@@ -551,28 +546,17 @@ void Host::Java_mono_android_Runtime_initInternal (
 	MonodroidState::mark_startup_done ();
 }
 
-void Host::Java_mono_android_Runtime_register (JNIEnv *env, jstring managedType, jclass nativeClass, jstring methods) noexcept
+void Host::Java_mono_android_Runtime_register (JNIEnv *env, jstring managedType, [[maybe_unused]] jclass nativeClass, [[maybe_unused]] jstring methods) noexcept
 {
 	if (FastTiming::enabled ()) [[unlikely]] {
 		internal_timing.start_event (TimingEventKind::RuntimeRegister);
 	}
 
-	jsize managedType_len = env->GetStringLength (managedType);
-	const jchar *managedType_ptr = env->GetStringChars (managedType, nullptr);
-	int methods_len = env->GetStringLength (methods);
-	const jchar *methods_ptr = env->GetStringChars (methods, nullptr);
-
 	const char *mt_ptr = env->GetStringUTFChars (managedType, nullptr);
 	log_debugf (LOG_ASSEMBLY, "Registering type: '%s'", optional_string (mt_ptr));
 	env->ReleaseStringUTFChars (managedType, mt_ptr);
 
-	// TODO: must attach thread to the runtime here
-	if (jnienv_register_jni_natives != nullptr) {
-		jnienv_register_jni_natives (managedType_ptr, managedType_len, nativeClass, methods_ptr, methods_len);
-	}
-
-	env->ReleaseStringChars (methods, methods_ptr);
-	env->ReleaseStringChars (managedType, managedType_ptr);
+	// Generated Java wrappers still call this entry point. TrimmableTypeMap registers native methods in managed code.
 
 	if (FastTiming::enabled ()) [[unlikely]] {
 		internal_timing.end_event (true /* uses_more_info */);
@@ -583,13 +567,6 @@ void Host::Java_mono_android_Runtime_register (JNIEnv *env, jstring managedType,
 	}
 }
 
-void Host::Java_mono_android_Runtime_registerNatives ([[maybe_unused]] JNIEnv *env, [[maybe_unused]] jclass nativeClass) noexcept
-{
-	// In the trimmable typemap path, registerNatives is handled entirely in managed code
-	// via a dynamically registered JNI native method. This C++ stub exists only as a
-	// fallback for the legacy code path (which doesn't use registerNatives).
-}
-
 auto HostCommon::Java_JNI_OnLoad (JavaVM *vm, [[maybe_unused]] void *reserved) noexcept -> jint
 {
 	jvm = vm;
diff --git a/src/native/clr/host/internal-pinvokes-clr.cc b/src/native/clr/host/internal-pinvokes-clr.cc
index 7c978f9ee08..fcf0cb6e236 100644
--- a/src/native/clr/host/internal-pinvokes-clr.cc
+++ b/src/native/clr/host/internal-pinvokes-clr.cc
@@ -1,7 +1,6 @@
 #include <host/gc-bridge.hh>
 #include <host/host.hh>
 #include <host/os-bridge.hh>
-#include <host/typemap.hh>
 #include <runtime-base/android-system.hh>
 #include <runtime-base/cpu-arch.hh>
 #include <runtime-base/internal-pinvokes.hh>
@@ -9,24 +8,6 @@
 
 using namespace xamarin::android;
 
-const char* clr_typemap_managed_to_java (
-	const char *typeName,
-	[[maybe_unused]] const char *assemblyFullName,
-	[[maybe_unused]] const uint8_t *mvid
-) noexcept
-{
-#if defined(RELEASE)
-	return TypeMapper::managed_to_java (typeName, mvid);
-#else
-	return TypeMapper::managed_to_java (typeName, assemblyFullName);
-#endif
-}
-
-bool clr_typemap_java_to_managed (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept
-{
-	return TypeMapper::java_to_managed (java_type_name, assembly_name, managed_type_token_id);
-}
-
 const char*
 _monodroid_lookup_replacement_type (const char *jniSimpleReference)
 {
diff --git a/src/native/clr/host/internal-pinvokes-shared.cc b/src/native/clr/host/internal-pinvokes-shared.cc
index dbb37d6084f..6bba9b3711d 100644
--- a/src/native/clr/host/internal-pinvokes-shared.cc
+++ b/src/native/clr/host/internal-pinvokes-shared.cc
@@ -1,7 +1,6 @@
 #include <host/gc-bridge.hh>
 #include <host/host-common.hh>
 #include <host/os-bridge.hh>
-#include <host/typemap.hh>
 #include <runtime-base/cpu-arch.hh>
 #include <runtime-base/internal-pinvokes.hh>
 #include <runtime-base/jni-remapping.hh>
diff --git a/src/native/clr/host/typemap.cc b/src/native/clr/host/typemap.cc
deleted file mode 100644
index 9512d3107f6..00000000000
--- a/src/native/clr/host/typemap.cc
+++ /dev/null
@@ -1,533 +0,0 @@
-#include <array>
-#include <cstdint>
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-#include <limits>
-
-#include <host/typemap.hh>
-#include <runtime-base/crc32.hh>
-#include <runtime-base/timing-internal.hh>
-#include <runtime-base/search.hh>
-#include <runtime-base/util.hh>
-#include <xamarin-app.hh>
-
-using namespace xamarin::android;
-
-namespace {
-	[[gnu::always_inline]]
-	auto same_string (const char *value, size_t value_length, const char *key, size_t key_length) noexcept -> bool
-	{
-		return value_length == key_length && strncmp (value, key, key_length) == 0;
-	}
-
-#if defined (DEBUG)
-	// Returns the length of the formatted name, or the negative capacity the caller must provide
-	// when `buffer` is too small.
-	auto format_managed_type_name (const char *type_name, const char *assembly_name, char *buffer, size_t buffer_size) noexcept -> ssize_t
-	{
-		int full_name_length = snprintf (buffer, buffer_size, "%s, %s", type_name, assembly_name);
-		abort_unless (full_name_length >= 0, "Failed to format the managed type name");
-
-		size_t length = static_cast<size_t>(full_name_length);
-		abort_unless (length < static_cast<size_t>(std::numeric_limits<ssize_t>::max ()), "Managed type name is too long");
-		if (length >= buffer_size) {
-			return -static_cast<ssize_t>(length + 1uz);
-		}
-
-		return static_cast<ssize_t>(length);
-	}
-#endif // def DEBUG
-
-	class MonoGuidString
-	{
-		static inline constexpr size_t MVID_SIZE = 16;
-		static inline constexpr size_t NUM_HYPHENS = 4;
-		static inline constexpr size_t BUF_SIZE = (MVID_SIZE * 2) + NUM_HYPHENS + 1;
-
-	public:
-		explicit MonoGuidString (const uint8_t *mvid) noexcept
-		{
-			if (mvid == nullptr) {
-				_ascii_form[0] = '\0';
-				return;
-			}
-
-			// In the caller we trust, we have no way to validate the size here
-			auto to_hex = [this, &mvid] (size_t &dest_idx, size_t src_idx) {
-				Util::to_hex (mvid[src_idx], _ascii_form[dest_idx], _ascii_form[dest_idx + 1]);
-				dest_idx += 2;
-			};
-
-			auto hyphen = [this] (size_t &dest_idx) {
-				_ascii_form[dest_idx++] = '-';
-			};
-
-			size_t dest_idx = 0;
-			to_hex (dest_idx, 3); to_hex (dest_idx, 2); to_hex (dest_idx, 1); to_hex (dest_idx, 0);
-			hyphen (dest_idx);
-
-			to_hex (dest_idx, 5); to_hex (dest_idx, 4);
-			hyphen (dest_idx);
-
-			to_hex (dest_idx, 7); to_hex (dest_idx, 6);
-			hyphen (dest_idx);
-
-			to_hex (dest_idx, 8); to_hex (dest_idx, 9);
-			hyphen (dest_idx);
-
-			to_hex (dest_idx, 10); to_hex (dest_idx, 11); to_hex (dest_idx, 12);
-			to_hex (dest_idx, 13); to_hex (dest_idx, 14); to_hex (dest_idx, 15);
-
-			_ascii_form[_ascii_form.size () - 1] = '\0';
-		}
-
-		auto c_str () const noexcept -> const char*
-		{
-			return _ascii_form.data ();
-		}
-
-	private:
-		std::array<char, BUF_SIZE> _ascii_form;
-	};
-}
-
-#if defined(DEBUG)
-[[gnu::always_inline, gnu::flatten]]
-auto TypeMapper::find_index_by_name (const char *typeName, const TypeMapEntry *map, const char (&name_map)[], const char *from_name, const char *to_name) noexcept -> ssize_t
-{
-	log_debugf (LOG_ASSEMBLY, "typemap: map %s -> %s uses strings", from_name, to_name);
-
-	auto equal = [](TypeMapEntry const& entry, const char *key, const char (&name_map)[]) -> bool {
-		if (entry.from == std::numeric_limits<uint32_t>::max ()) [[unlikely]] {
-			return 1;
-		}
-
-		const char *type_name = &name_map[entry.from];
-		return strcmp (type_name, key) == 0;
-	};
-
-	auto less_than = [](TypeMapEntry const& entry, const char *key, const char (&name_map)[]) -> bool {
-		if (entry.from == std::numeric_limits<uint32_t>::max ()) [[unlikely]] {
-			return 1;
-		}
-
-		const char *type_name = &name_map[entry.from];
-		return strcmp (type_name, key) < 0;
-	};
-
-	return Search::binary_search<TypeMapEntry, const char*, const char[], equal, less_than> (name_map, typeName, map, type_map.entry_count);
-}
-
-[[gnu::always_inline, gnu::flatten]]
-auto TypeMapper::find_index_by_hash (const char *typeName, const TypeMapEntry *map, const char (&name_map)[], const char *from_name, const char *to_name) noexcept -> ssize_t
-{
-	log_debugf (LOG_ASSEMBLY, "typemap: map %s -> %s uses hashes", from_name, to_name);
-
-	size_t type_name_length = strlen (typeName);
-	hash_t type_name_hash = crc32_hash (typeName, type_name_length);
-
-	auto less_than = [](TypeMapEntry const& entry, hash_t key) -> bool {
-		return entry.from != std::numeric_limits<uint32_t>::max () && entry.from_hash < key;
-	};
-
-	size_t idx = Search::lower_bound<TypeMapEntry, hash_t, less_than> (type_name_hash, map, type_map.entry_count);
-	while (idx < type_map.entry_count) {
-		TypeMapEntry const& entry = map[idx];
-		if (entry.from == std::numeric_limits<uint32_t>::max () || entry.from_hash != type_name_hash) {
-			break;
-		}
-
-		const char *mapped_type_name = &name_map[entry.from];
-		if (same_string (mapped_type_name, strlen (mapped_type_name), typeName, type_name_length)) {
-			return static_cast<ssize_t>(idx);
-		}
-		idx++;
-	}
-
-	return -1z;
-}
-
-[[gnu::always_inline, gnu::flatten]]
-auto TypeMapper::index_to_name (ssize_t idx, const char* typeName, const TypeMapEntry *map, const char (&name_map)[], const char *from_name, const char *to_name) -> const char*
-{
-	if (idx < 0) [[unlikely]] {
-		log_debugf (LOG_ASSEMBLY, "typemap: unable to map from %s type '%s' to %s type", from_name, optional_string (typeName), to_name);
-		return nullptr;
-	}
-
-	TypeMapEntry const& entry = map[idx];
-	const char *mapped_name = &name_map[entry.to];
-
-	log_debugf (
-		LOG_ASSEMBLY,
-		"typemap: %s type '%s' maps to %s type '%s'",
-		from_name,
-		optional_string (typeName),
-		to_name,
-		optional_string (mapped_name)
-	);
-	return mapped_name;
-}
-
-[[gnu::always_inline, gnu::flatten]]
-auto TypeMapper::managed_to_java_debug (const char *typeName, const char *assemblyFullName) noexcept -> const char*
-{
-	char stack_buffer [Constants::SENSIBLE_PATH_MAX];
-	char *full_type_name = Util::format_with_retry (
-		stack_buffer,
-		sizeof (stack_buffer),
-		[typeName, assemblyFullName](char *buffer, size_t buffer_size) noexcept {
-			return format_managed_type_name (typeName, assemblyFullName, buffer, buffer_size);
-		}
-	);
-
-	ssize_t idx = find_index_by_hash (full_type_name, type_map.managed_to_java, type_map_managed_type_names, MANAGED, JAVA);
-	const char *mapped_name = index_to_name (idx, full_type_name, type_map.managed_to_java, type_map_java_type_names, MANAGED, JAVA);
-	if (full_type_name != stack_buffer) {
-		std::free (full_type_name);
-	}
-
-	return mapped_name;
-}
-#endif // def DEBUG
-
-#if defined(RELEASE)
-[[gnu::always_inline]]
-auto TypeMapper::compare_mvid (const uint8_t *mvid, TypeMapModule const& module) noexcept -> int
-{
-	return memcmp (module.module_uuid, mvid, sizeof(module.module_uuid));
-}
-
-[[gnu::always_inline]]
-auto TypeMapper::find_module_entry (const uint8_t *mvid, const TypeMapModule *entries, size_t entry_count) noexcept -> const TypeMapModule*
-{
-	if (entries == nullptr || mvid == nullptr) [[unlikely]] {
-		return nullptr;
-	}
-
-	auto equal = [](TypeMapModule const& entry, const uint8_t *key) -> bool { return compare_mvid (key, entry) == 0; };
-	auto less_than = [](TypeMapModule const& entry, const uint8_t *key) -> bool { return compare_mvid (key, entry) < 0; };
-	ssize_t idx = Search::binary_search<TypeMapModule, const uint8_t*, equal, less_than> (mvid, entries, entry_count);
-	if (idx >= 0) [[likely]] {
-		return &entries[idx];
-	}
-
-	return nullptr;
-}
-
-[[gnu::always_inline]]
-auto TypeMapper::find_managed_to_java_map_entry (hash_t name_hash, const char *type_name, size_t type_name_length, const TypeMapModuleEntry *map, size_t entry_count) noexcept -> const TypeMapModuleEntry*
-{
-	if (map == nullptr) {
-		return nullptr;
-	};
-
-	auto less_than = [](TypeMapModuleEntry const& entry, hash_t key) -> bool {
-		return entry.managed_type_name_hash < key;
-	};
-
-	size_t idx = Search::lower_bound<TypeMapModuleEntry, hash_t, less_than> (name_hash, map, entry_count);
-	while (idx < entry_count && map[idx].managed_type_name_hash == name_hash) {
-		TypeMapModuleEntry const& entry = map[idx];
-		const char *managed_type_name = &managed_type_names[entry.managed_type_name_index];
-		if (same_string (managed_type_name, entry.managed_type_name_length, type_name, type_name_length)) {
-			return &entry;
-		}
-		idx++;
-	}
-
-	return nullptr;
-}
-
-[[gnu::always_inline]]
-auto TypeMapper::managed_to_java_release (const char *typeName, const uint8_t *mvid) noexcept -> const char*
-{
-	const TypeMapModule *match = find_module_entry (mvid, managed_to_java_map, managed_to_java_map_module_count);
-	if (match == nullptr) {
-		if (mvid == nullptr) {
-			log_warnf (LOG_ASSEMBLY, "typemap: no mvid specified in call to typemap_managed_to_java");
-		} else {
-			log_infof (LOG_ASSEMBLY, "typemap: module matching MVID [%s] not found.", MonoGuidString (mvid).c_str ());
-		}
-		return nullptr;
-	}
-
-	if (Util::should_log (LOG_ASSEMBLY)) {
-		log_debugf (LOG_ASSEMBLY, "typemap: found module matching MVID [%s]", MonoGuidString (mvid).c_str ());
-	}
-	size_t type_name_length = strlen (typeName);
-	hash_t name_hash = crc32_hash (typeName, type_name_length);
-
-	// We implicitly trust the build process that the indexes are correct. This is by design, the libxamarin-app.so built
-	// with the application is immutable and the build process made sure that the data in it matches the application.
-	const TypeMapModuleEntry *const map = &modules_map_data[match->map_index];
-	const TypeMapModuleEntry *entry = find_managed_to_java_map_entry (name_hash, typeName, type_name_length, map, match->entry_count);
-	if (entry == nullptr) [[unlikely]] {
-		if (match->duplicate_count > 0 && match->duplicate_map_index < std::numeric_limits<decltype (match->duplicate_map_index)>::max ()) {
-			if (Util::should_log (LOG_ASSEMBLY)) {
-				log_debugf (
-					LOG_ASSEMBLY,
-					"typemap: searching module [%s] duplicate map for type '%s' (hash %x)",
-					MonoGuidString (mvid).c_str (),
-					optional_string (typeName),
-					name_hash
-				);
-			}
-
-			const TypeMapModuleEntry *const duplicate_map = &modules_duplicates_data[match->duplicate_map_index];
-			entry = find_managed_to_java_map_entry (name_hash, typeName, type_name_length, duplicate_map, match->duplicate_count);
-		}
-
-		if (entry == nullptr) {
-			log_warnf (
-				LOG_ASSEMBLY,
-				"typemap: managed type '%s' (hash %x) not found in module [%s] (%.*s).",
-				optional_string (typeName),
-				name_hash,
-				MonoGuidString (mvid).c_str (),
-				static_cast<int>(match->assembly_name_length),
-				&managed_assembly_names[match->assembly_name_index]
-			);
-			return nullptr;
-		}
-	}
-
-	if (entry->java_map_index >= java_type_count) [[unlikely]] {
-		log_warnf (
-			LOG_ASSEMBLY,
-			"typemap: managed type '%s' (hash %x) in module [%s] (%.*s) has invalid Java type index %u",
-			optional_string (typeName),
-			name_hash,
-			MonoGuidString (mvid).c_str (),
-			static_cast<int>(match->assembly_name_length),
-			&managed_assembly_names[match->assembly_name_index],
-			entry->java_map_index
-		);
-		return nullptr;
-	}
-
-	TypeMapJava const& java_entry = java_to_managed_map[entry->java_map_index];
-	if (java_entry.java_name_index >= java_type_names_size) [[unlikely]] {
-		log_warnf (
-			LOG_ASSEMBLY,
-			"typemap: managed type '%s' (hash %x) in module [%s] (%.*s) points to invalid Java type at index %u (invalid type name index %u)",
-			optional_string (typeName),
-			name_hash,
-			MonoGuidString (mvid).c_str (),
-			static_cast<int>(match->assembly_name_length),
-			&managed_assembly_names[match->assembly_name_index],
-			entry->java_map_index,
-			java_entry.java_name_index
-		);
-
-		return nullptr;
-	}
-
-	const char *ret = &java_type_names[java_entry.java_name_index];
-	if (ret == nullptr) [[unlikely]] {
-		log_warnf (LOG_ASSEMBLY, "typemap: empty Java type name returned for entry at index %u", entry->java_map_index);
-	}
-
-	if (Util::should_log (LOG_ASSEMBLY)) {
-		log_debugf (
-			LOG_ASSEMBLY,
-			"typemap: managed type '%s' (hash %x) in module [%s] (%.*s) corresponds to Java type '%s'",
-			optional_string (typeName),
-			name_hash,
-			MonoGuidString (mvid).c_str (),
-			static_cast<int>(match->assembly_name_length),
-			&managed_assembly_names[match->assembly_name_index],
-			ret
-		);
-	}
-
-	return ret;
-}
-#endif // def RELEASE
-
-[[gnu::flatten]]
-#if defined(RELEASE)
-auto TypeMapper::managed_to_java (const char *typeName, const uint8_t *mvid) noexcept -> const char*
-#else
-auto TypeMapper::managed_to_java (const char *typeName, const char *assemblyFullName) noexcept -> const char*
-#endif
-{
-	log_debugf (LOG_ASSEMBLY, "managed_to_java: looking up type '%s'", optional_string (typeName));
-	if (FastTiming::enabled ()) [[unlikely]] {
-		internal_timing.start_event (TimingEventKind::ManagedToJava);
-	}
-
-	if (typeName == nullptr) [[unlikely]] {
-		log_warnf (LOG_ASSEMBLY, "typemap: type name not specified in typemap_managed_to_java");
-		return nullptr;
-	}
-
-#if defined(RELEASE)
-	const char *ret = managed_to_java_release (typeName, mvid);
-#else
-	if (assemblyFullName == nullptr) [[unlikely]] {
-		log_warnf (LOG_ASSEMBLY, "typemap: assembly full name not specified in typemap_managed_to_java");
-		return nullptr;
-	}
-	const char *ret = managed_to_java_debug (typeName, assemblyFullName);
-#endif
-
-	if (FastTiming::enabled ()) [[unlikely]] {
-		internal_timing.end_event ();
-	}
-
-	return ret;
-}
-
-#if defined(DEBUG)
-[[gnu::flatten]]
-auto TypeMapper::java_to_managed_debug (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool
-{
-	if (assembly_name == nullptr || managed_type_token_id == nullptr) [[unlikely]] {
-		log_warnf (LOG_ASSEMBLY, "Managed land called java-to-managed mapping function with invalid pointers");
-		return false;
-	}
-
-	// We need to find entry matching the Java type name, which will then...
-	ssize_t idx = find_index_by_name (java_type_name, type_map.java_to_managed, type_map_java_type_names, JAVA, MANAGED);
-
-	// ..provide us with the managed type name index
-	const char *name = index_to_name (idx, java_type_name, type_map.java_to_managed, type_map_managed_type_names, JAVA, MANAGED);
-	if (name == nullptr) {
-		*assembly_name = nullptr;
-		*managed_type_token_id = 0;
-		return false;
-	}
-
-	// We explicitly trust the build process here, with regards to the size of the arrays
-	TypeMapManagedTypeInfo const& type_info = type_map_managed_type_info[idx];
-	*assembly_name = &type_map_assembly_names[type_info.assembly_name_index];
-	*managed_type_token_id = type_info.managed_type_token_id;
-
-	log_debugf (
-		LOG_ASSEMBLY,
-		"Mapped Java type '%s' to managed type '%s' in assembly '%s' and with token '%x'",
-		optional_string (java_type_name),
-		name,
-		*assembly_name,
-		*managed_type_token_id
-	);
-
-	return true;
-}
-#else // def DEBUG
-
-[[gnu::always_inline]]
-auto TypeMapper::find_java_to_managed_entry (hash_t name_hash, const char *java_type_name, size_t java_type_name_length) noexcept -> const TypeMapJava*
-{
-	auto less_than = [](hash_t const& entry, hash_t key) -> bool {
-		return entry < key;
-	};
-
-	size_t idx = Search::lower_bound<hash_t, hash_t, less_than> (name_hash, java_to_managed_hashes, java_type_count);
-	while (idx < java_type_count && java_to_managed_hashes[idx] == name_hash) {
-		TypeMapJava const& entry = java_to_managed_map[idx];
-		const char *mapped_java_type_name = &java_type_names[entry.java_name_index];
-		if (same_string (mapped_java_type_name, entry.java_name_length, java_type_name, java_type_name_length)) {
-			return &entry;
-		}
-		idx++;
-	}
-
-	return nullptr;
-}
-
-[[gnu::flatten]]
-auto TypeMapper::java_to_managed_release (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool
-{
-	if (java_type_name == nullptr || assembly_name == nullptr || managed_type_token_id == nullptr) [[unlikely]] {
-		if (java_type_name == nullptr) {
-			log_warnf (
-				LOG_ASSEMBLY,
-				"typemap: required parameter `%s` not passed to %s",
-				"java_type_name",
-				__PRETTY_FUNCTION__
-			);
-		}
-
-		if (assembly_name == nullptr) {
-			log_warnf (
-				LOG_ASSEMBLY,
-				"typemap: required parameter `%s` not passed to %s",
-				"assembly_name",
-				__PRETTY_FUNCTION__
-			);
-		}
-
-		if (managed_type_token_id == nullptr) {
-			log_warnf (
-				LOG_ASSEMBLY,
-				"typemap: required parameter `%s` not passed to %s",
-				"managed_type_token_id",
-				__PRETTY_FUNCTION__
-			);
-		}
-
-		return false;
-	}
-
-	size_t java_type_name_length = strlen (java_type_name);
-	hash_t name_hash = crc32_hash (java_type_name, java_type_name_length);
-	TypeMapJava const* java_entry = find_java_to_managed_entry (name_hash, java_type_name, java_type_name_length);
-	if (java_entry == nullptr) {
-		log_infof (
-			LOG_ASSEMBLY,
-			"typemap: unable to find mapping to a managed type from Java type '%s' (hash %x)",
-			optional_string (java_type_name),
-			name_hash
-		);
-
-		return false;
-	}
-
-	TypeMapModule const &module = managed_to_java_map[java_entry->module_index];
-	*assembly_name = &managed_assembly_names[module.assembly_name_index];
-	*managed_type_token_id = java_entry->managed_type_token_id;
-
-	log_debugf (
-		LOG_ASSEMBLY,
-		"Java type '%s' corresponds to managed type '%.*s' (token 0x%x in assembly '%.*s')",
-		optional_string (java_type_name),
-		static_cast<int>(java_entry->managed_type_name_length),
-		&managed_type_names[java_entry->managed_type_name_index],
-		*managed_type_token_id,
-		static_cast<int>(module.assembly_name_length),
-		&managed_assembly_names[module.assembly_name_index]
-	);
-
-	return true;
-}
-#endif // ndef DEBUG
-
-[[gnu::flatten]]
-auto TypeMapper::java_to_managed (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool
-{
-	log_debugf (LOG_ASSEMBLY, "java_to_managed: looking up type '%s'", optional_string (java_type_name));
-	if (FastTiming::enabled ()) [[unlikely]] {
-		internal_timing.start_event (TimingEventKind::JavaToManaged);
-	}
-
-	if (java_type_name == nullptr) [[unlikely]] {
-		log_warnf (LOG_ASSEMBLY, "typemap: type name not specified in typemap_java_to_managed");
-		return false;
-	}
-
-	bool ret;
-#if defined(RELEASE)
-	ret = java_to_managed_release (java_type_name, assembly_name, managed_type_token_id);
-#else
-	ret = java_to_managed_debug (java_type_name, assembly_name, managed_type_token_id);
-#endif
-
-	if (FastTiming::enabled ()) [[unlikely]] {
-		internal_timing.end_event ();
-	}
-
-	return ret;
-}
diff --git a/src/native/clr/include/host/host.hh b/src/native/clr/include/host/host.hh
index c9cd3f38523..b5b359774e6 100644
--- a/src/native/clr/include/host/host.hh
+++ b/src/native/clr/include/host/host.hh
@@ -20,7 +20,6 @@ namespace xamarin::android {
 			jstring runtimeNativeLibDir, jobjectArray appDirs, jint localDateTimeOffset, jobject loader,
 			jobjectArray assembliesJava, jboolean isEmulator, jboolean haveSplitApks) noexcept;
 		static void Java_mono_android_Runtime_register (JNIEnv *env, jstring managedType, jclass nativeClass, jstring methods) noexcept;
-		static void Java_mono_android_Runtime_registerNatives (JNIEnv *env, jclass nativeClass) noexcept;
 		static void propagate_uncaught_exception (JNIEnv *env, jobject javaThread, jthrowable javaException) noexcept;
 
 		static auto get_timing () noexcept -> Timing&
@@ -59,7 +58,6 @@ namespace xamarin::android {
 		// check with `FastTiming::enabled ()`.
 		static inline Timing _timing {};
 		static inline bool found_assembly_store = false;
-		static inline jnienv_register_jni_natives_fn jnienv_register_jni_natives = nullptr;
 		static inline jnienv_propagate_uncaught_exception_fn jnienv_propagate_uncaught_exception = nullptr;
 
 		static inline jclass java_TimeZone = nullptr;
diff --git a/src/native/clr/include/host/typemap.hh b/src/native/clr/include/host/typemap.hh
deleted file mode 100644
index 9e721a4e1f5..00000000000
--- a/src/native/clr/include/host/typemap.hh
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string_view>
-
-#include "../runtime-base/logger.hh"
-#include "../xamarin-app.hh"
-
-namespace xamarin::android {
-	class TypeMapper
-	{
-		static constexpr const char *MANAGED = "Managed";
-		static constexpr const char *JAVA = "Java";
-
-	public:
-#if defined(RELEASE)
-		static auto managed_to_java (const char *typeName, const uint8_t *mvid) noexcept -> const char*;
-#else
-		static auto managed_to_java (const char *typeName, const char *assemblyFullName) noexcept -> const char*;
-#endif
-		static auto java_to_managed (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool;
-
-	private:
-#if defined(RELEASE)
-		static auto compare_mvid (const uint8_t *mvid, TypeMapModule const& module) noexcept -> int;
-		static auto find_module_entry (const uint8_t *mvid, const TypeMapModule *entries, size_t entry_count) noexcept -> const TypeMapModule*;
-		static auto find_managed_to_java_map_entry (hash_t name_hash, const char *type_name, size_t type_name_length, const TypeMapModuleEntry *map, size_t entry_count) noexcept -> const TypeMapModuleEntry*;
-		static auto managed_to_java_release (const char *typeName, const uint8_t *mvid) noexcept -> const char*;
-		static auto java_to_managed_release (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool;
-
-		static auto find_java_to_managed_entry (hash_t name_hash, const char *java_type_name, size_t java_type_name_length) noexcept -> const TypeMapJava*;
-#else
-		static auto index_to_name (ssize_t index, const char *typeName, const TypeMapEntry *map, const char (&name_map)[], const char *from_name, const char *to_name) -> const char*;
-		static auto find_index_by_hash (const char *typeName, const TypeMapEntry *map, const char (&name_map)[], const char *from_name, const char *to_name) noexcept -> ssize_t;
-		static auto find_index_by_name (const char *typeName, const TypeMapEntry *map, const char (&name_map)[], const char *from_name, const char *to_name) noexcept -> ssize_t;
-		static auto managed_to_java_debug (const char *typeName, const char *assemblyFullName) noexcept -> const char*;
-		static auto java_to_managed_debug (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept -> bool;
-#endif
-	};
-}
diff --git a/src/native/clr/include/runtime-base/internal-pinvokes.hh b/src/native/clr/include/runtime-base/internal-pinvokes.hh
index c1fc0f1a5bb..68827ec8b82 100644
--- a/src/native/clr/include/runtime-base/internal-pinvokes.hh
+++ b/src/native/clr/include/runtime-base/internal-pinvokes.hh
@@ -10,8 +10,6 @@
 #include <runtime-base/timing.hh>
 
 extern "C" {
-	const char* clr_typemap_managed_to_java (const char *typeName, const char *assemblyFullName, const uint8_t *mvid) noexcept;
-	bool clr_typemap_java_to_managed (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept;
 	BridgeProcessingFtn clr_initialize_gc_bridge (
 		BridgeProcessingStartedFtn bridge_processing_started_callback,
 		BridgeProcessingFinishedFtn mark_cross_references_callback) noexcept;
diff --git a/src/native/clr/include/xamarin-app.hh b/src/native/clr/include/xamarin-app.hh
index c4d6ce850eb..a642275b833 100644
--- a/src/native/clr/include/xamarin-app.hh
+++ b/src/native/clr/include/xamarin-app.hh
@@ -32,68 +32,6 @@ static constexpr uint32_t ASSEMBLY_STORE_ABI = 0x00040000;
 // Increase whenever an incompatible change is made to the assembly store format
 static constexpr uint32_t ASSEMBLY_STORE_FORMAT_VERSION = 3 | ASSEMBLY_STORE_64BIT_FLAG | ASSEMBLY_STORE_ABI;
 
-static constexpr uint32_t MODULE_MAGIC_NAMES = 0x53544158; // 'XATS', little-endian
-static constexpr uint32_t MODULE_INDEX_MAGIC = 0x49544158; // 'XATI', little-endian
-static constexpr uint8_t  MODULE_FORMAT_VERSION = 2;       // Keep in sync with the value in src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
-
-#if defined (DEBUG)
-// MUST match src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
-//
-// If any of the members is set to maximum uint32_t value it means the entry is ignored (treated
-// as equivalent to `nullptr` if the member was a pointer). The reasoning is that no string could
-// begin at this offset (well, an empty string could, but we don't have those here)
-struct TypeMapEntry
-{
-	const uint32_t from;
-	const xamarin::android::hash_t from_hash;
-	const uint32_t to;
-};
-
-// MUST match src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
-struct TypeMapManagedTypeInfo
-{
-	const uint32_t assembly_name_index;
-	const uint32_t managed_type_token_id;
-};
-
-// MUST match src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
-struct TypeMap
-{
-	uint32_t             entry_count;
-	const TypeMapEntry  *java_to_managed;
-	const TypeMapEntry  *managed_to_java;
-};
-#else
-struct TypeMapModuleEntry
-{
-	xamarin::android::hash_t managed_type_name_hash;
-	uint32_t                 managed_type_name_index;
-	uint32_t                 managed_type_name_length;
-	uint32_t                 java_map_index;
-};
-
-struct TypeMapModule
-{
-	uint8_t                   module_uuid[16];
-	uint32_t                  entry_count;
-	uint32_t                  duplicate_count;
-	uint32_t                  assembly_name_index;
-	uint32_t                  assembly_name_length;
-	uint32_t                  map_index;
-	uint32_t                  duplicate_map_index;
-};
-
-struct TypeMapJava
-{
-	uint32_t  module_index;
-	uint32_t  managed_type_name_index;
-	uint32_t  managed_type_name_length;
-	uint32_t  managed_type_token_id;
-	uint32_t  java_name_index;
-	uint32_t  java_name_length;
-};
-#endif
-
 struct CompressedAssemblyHeader
 {
 	uint32_t magic; // COMPRESSED_DATA_MAGIC
@@ -204,7 +142,6 @@ struct AssemblyStoreSingleAssemblyRuntimeData final
 struct ApplicationConfig
 {
 	bool uses_assembly_preload;
-	bool jni_add_native_method_registration_attribute_present;
 	bool marshal_methods_enabled;
 	bool ignore_split_configs;
 	uint32_t number_of_runtime_properties;
@@ -217,7 +154,6 @@ struct ApplicationConfig
 	uint32_t number_of_shared_libraries;
 	uint32_t android_runtime_jnienv_class_token;
 	uint32_t jnienv_initialize_method_token;
-	uint32_t jnienv_registerjninatives_method_token;
 	uint32_t jni_remapping_replacement_type_count;
 	uint32_t jni_remapping_replacement_method_index_entry_count;
 	const char *android_package_name;
@@ -280,26 +216,6 @@ extern "C" {
 
 	[[gnu::visibility("default")]] extern const uint64_t format_tag;
 
-#if defined (DEBUG)
-	[[gnu::visibility("default")]] extern const TypeMap type_map; // MUST match src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
-	[[gnu::visibility("default")]] extern const TypeMapManagedTypeInfo type_map_managed_type_info[];
-	[[gnu::visibility("default")]] extern const char type_map_assembly_names[];
-	[[gnu::visibility("default")]] extern const char type_map_managed_type_names[];
-	[[gnu::visibility("default")]] extern const char type_map_java_type_names[];
-#else
-	[[gnu::visibility("default")]] extern const uint32_t managed_to_java_map_module_count;
-	[[gnu::visibility("default")]] extern const uint32_t java_type_count;
-	[[gnu::visibility("default")]] extern const char java_type_names[];
-	[[gnu::visibility("default")]] extern const uint64_t java_type_names_size;
-	[[gnu::visibility("default")]] extern const char managed_type_names[];
-	[[gnu::visibility("default")]] extern const char managed_assembly_names[];
-	[[gnu::visibility("default")]] extern const TypeMapModule managed_to_java_map[];
-	[[gnu::visibility("default")]] extern const TypeMapModuleEntry modules_map_data[];
-	[[gnu::visibility("default")]] extern const TypeMapModuleEntry modules_duplicates_data[];
-	[[gnu::visibility("default")]] extern const TypeMapJava java_to_managed_map[];
-	[[gnu::visibility("default")]] extern const xamarin::android::hash_t java_to_managed_hashes[];
-#endif
-
 	[[gnu::visibility("default")]] extern uint32_t compressed_assembly_count;
 	[[gnu::visibility("default")]] extern CompressedAssemblyDescriptor compressed_assembly_descriptors[];
 	[[gnu::visibility("default")]] extern uint32_t uncompressed_assemblies_data_size;
@@ -322,6 +238,3 @@ extern "C" {
 	[[gnu::visibility("default")]] extern const char *init_runtime_property_names[];
 	[[gnu::visibility("default")]] extern char *init_runtime_property_values[];
 }
-
-using get_function_pointer_fn = void(*)(uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr);
-extern "C" [[gnu::visibility("default")]] void xamarin_app_init (JNIEnv *env, get_function_pointer_fn fn) noexcept;
diff --git a/src/native/clr/pinvoke-override/precompiled.cc b/src/native/clr/pinvoke-override/precompiled.cc
index 5712cb8aa81..1f7042b189a 100644
--- a/src/native/clr/pinvoke-override/precompiled.cc
+++ b/src/native/clr/pinvoke-override/precompiled.cc
@@ -55,12 +55,6 @@ namespace {
 		if (entrypoint_name == "monodroid_TypeManager_get_java_class_name"sv) {
 			return reinterpret_cast<void*> (&monodroid_TypeManager_get_java_class_name);
 		}
-		if (entrypoint_name == "clr_typemap_managed_to_java"sv) {
-			return reinterpret_cast<void*> (&clr_typemap_managed_to_java);
-		}
-		if (entrypoint_name == "clr_typemap_java_to_managed"sv) {
-			return reinterpret_cast<void*> (&clr_typemap_java_to_managed);
-		}
 		if (entrypoint_name == "clr_initialize_gc_bridge"sv) {
 			return reinterpret_cast<void*> (&clr_initialize_gc_bridge);
 		}
diff --git a/src/native/clr/xamarin-app-stub/application_dso_stub.cc b/src/native/clr/xamarin-app-stub/application_dso_stub.cc
index 3890aef2639..24729f4fc22 100644
--- a/src/native/clr/xamarin-app-stub/application_dso_stub.cc
+++ b/src/native/clr/xamarin-app-stub/application_dso_stub.cc
@@ -7,35 +7,6 @@
 // designer on desktop.
 const uint64_t format_tag = FORMAT_TAG;
 
-#if defined (DEBUG)
-static TypeMapEntry java_to_managed[] = {};
-static TypeMapEntry managed_to_java[] = {};
-
-// MUST match src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
-const TypeMap type_map = {
-	.entry_count = 0,
-	.java_to_managed = java_to_managed,
-	.managed_to_java = managed_to_java,
-};
-
-const TypeMapManagedTypeInfo type_map_managed_type_info[] = {};
-const char type_map_assembly_names[] = {};
-const char type_map_managed_type_names[] = {};
-const char type_map_java_type_names[] = {};
-#else
-const uint32_t managed_to_java_map_module_count = 0;
-const uint32_t java_type_count = 0;
-const char java_type_names[] = {};
-const uint64_t java_type_names_size = 0;
-const char managed_type_names[] = {};
-const char managed_assembly_names[] = {};
-const TypeMapModule managed_to_java_map[] = {};
-const TypeMapModuleEntry modules_map_data[] = {};
-const TypeMapModuleEntry modules_duplicates_data[] = {};
-const TypeMapJava java_to_managed_map[] = {};
-const xamarin::android::hash_t java_to_managed_hashes[] = {};
-#endif
-
 uint32_t compressed_assembly_count = 0;
 CompressedAssemblyDescriptor compressed_assembly_descriptors[] = {};
 uint32_t uncompressed_assemblies_data_size = 0;
@@ -48,7 +19,6 @@ uint8_t uncompressed_assemblies_data_buffer[] = {};
 constexpr char android_package_name[] = "com.xamarin.test";
 const ApplicationConfig application_config = {
 	.uses_assembly_preload = false,
-	.jni_add_native_method_registration_attribute_present = false,
 	.marshal_methods_enabled = false,
 	.ignore_split_configs = false,
 	.number_of_runtime_properties = 3,
@@ -61,7 +31,6 @@ const ApplicationConfig application_config = {
 	.number_of_shared_libraries = 2,
 	.android_runtime_jnienv_class_token = 1,
 	.jnienv_initialize_method_token = 2,
-	.jnienv_registerjninatives_method_token = 3,
 	.jni_remapping_replacement_type_count = 2,
 	.jni_remapping_replacement_method_index_entry_count = 2,
 	.android_package_name = android_package_name,
@@ -129,14 +98,6 @@ const uint dso_jni_preloads_idx[1] = {
 
 const char dso_names_data[] = {};
 
-//
-// Support for marshal methods
-//
-void xamarin_app_init ([[maybe_unused]] JNIEnv *env, [[maybe_unused]] get_function_pointer_fn fn) noexcept
-{
-	// Dummy
-}
-
 static const JniRemappingIndexMethodEntry some_java_type_one_methods[] = {
 	{
 		.name = {
diff --git a/src/native/common/include/managed-interface.hh b/src/native/common/include/managed-interface.hh
index d0ff6cf9ac2..8316eefb70f 100644
--- a/src/native/common/include/managed-interface.hh
+++ b/src/native/common/include/managed-interface.hh
@@ -15,7 +15,6 @@ namespace xamarin::android {
 	};
 
 	using jnienv_propagate_uncaught_exception_fn = void (*)(JNIEnv *env, jobject javaThread, jthrowable javaException);
-	using jnienv_register_jni_natives_fn = void (*)(const jchar *typeName_ptr, int32_t typeName_len, jclass jniClass, const jchar *methods_ptr, int32_t methods_len);
 
 	enum class ReferenceLogEvent : int32_t
 	{
@@ -50,12 +49,10 @@ namespace xamarin::android {
 		uint8_t         brokenExceptionTransitions;
 		int             packageNamingPolicy;
 		uint8_t         boundExceptionType;
-		int             jniAddNativeMethodRegistrationAttributePresent;
 		bool            jniRemappingInUse;
 		bool            marshalMethodsEnabled;
 		jobject         grefGCUserPeerable;
 		jnienv_propagate_uncaught_exception_fn propagateUncaughtExceptionFn;
-		jnienv_register_jni_natives_fn registerJniNativesFn;
 		const char      *grefLogPath;
 		const char      *lrefLogPath;
 		const char      *referenceLogDirectory;
diff --git a/src/native/common/runtime-base/timing-internal.cc b/src/native/common/runtime-base/timing-internal.cc
index 8c629c3d19c..80f3a47ec56 100644
--- a/src/native/common/runtime-base/timing-internal.cc
+++ b/src/native/common/runtime-base/timing-internal.cc
@@ -138,8 +138,6 @@ void FastTiming::dump (size_t entries, bool indent, LineWriter line_writer, FILE
 
 	// Values are in nanoseconds
 	uint64_t total_assembly_load_time = 0u;
-	uint64_t total_java_to_managed_time = 0u;
-	uint64_t total_managed_to_java_time = 0u;
 	uint64_t total_assembly_decompression_time = 0u;
 
 	line_writer (output, "All logged events:"sv);
@@ -159,14 +157,6 @@ void FastTiming::dump (size_t entries, bool indent, LineWriter line_writer, FILE
 				total_assembly_decompression_time += event_time_ns;
 				break;
 
-			case TimingEventKind::JavaToManaged:
-				total_java_to_managed_time += event_time_ns;
-				break;
-
-			case TimingEventKind::ManagedToJava:
-				total_managed_to_java_time += event_time_ns;
-				break;
-
 			default:
 				// Ignore other kinds
 				break;
@@ -221,8 +211,6 @@ void FastTiming::dump (size_t entries, bool indent, LineWriter line_writer, FILE
 	// Do not change the sequence numbers. If a measurement is removed, its sequence number must not be reused.
 	// The sequence numbers are used by performance measuring utilities to find the figures.
 	log_time ("[2/5] Assembly load"sv, total_assembly_load_time);
-	log_time ("[2/6] Java to Managed lookup"sv, total_java_to_managed_time);
-	log_time ("[2/7] Managed to Java lookup"sv, total_managed_to_java_time);
 	log_time ("[2/8] Assembly decompression"sv, total_assembly_decompression_time);
 }
 
diff --git a/src/native/nativeaot/host/internal-pinvoke-stubs.cc b/src/native/nativeaot/host/internal-pinvoke-stubs.cc
index 1e7dd83833b..0abd5d06bcd 100644
--- a/src/native/nativeaot/host/internal-pinvoke-stubs.cc
+++ b/src/native/nativeaot/host/internal-pinvoke-stubs.cc
@@ -16,22 +16,6 @@ namespace {
 	}
 }
 
-const char* clr_typemap_managed_to_java (
-	[[maybe_unused]] const char *typeName,
-	[[maybe_unused]] const char *assemblyFullName,
-	[[maybe_unused]] const uint8_t *mvid) noexcept
-{
-	pinvoke_unreachable ();
-}
-
-bool clr_typemap_java_to_managed (
-	[[maybe_unused]] const char *java_type_name,
-	[[maybe_unused]] char const** assembly_name,
-	[[maybe_unused]]  uint32_t *managed_type_token_id) noexcept
-{
-	pinvoke_unreachable ();
-}
-
 const char* _monodroid_lookup_replacement_type ([[maybe_unused]] const char *jniSimpleReference)
 {
 	pinvoke_unreachable ();
diff --git a/src/native/nativeaot/include/runtime-base/internal-pinvokes.hh b/src/native/nativeaot/include/runtime-base/internal-pinvokes.hh
index 8b57bb79410..77572a8dec0 100644
--- a/src/native/nativeaot/include/runtime-base/internal-pinvokes.hh
+++ b/src/native/nativeaot/include/runtime-base/internal-pinvokes.hh
@@ -13,8 +13,6 @@ namespace xamarin::android {
 }
 
 extern "C" {
-	const char* clr_typemap_managed_to_java (const char *typeName, const char *assemblyFullName, const uint8_t *mvid) noexcept;
-	bool clr_typemap_java_to_managed (const char *java_type_name, char const** assembly_name, uint32_t *managed_type_token_id) noexcept;
 	BridgeProcessingFtn clr_initialize_gc_bridge (
 		BridgeProcessingStartedFtn bridge_processing_started_callback,
 		BridgeProcessingFinishedFtn mark_cross_references_callback) noexcept;
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/JnienvArrayMarshaling.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/JnienvArrayMarshaling.cs
index f3e457f43c8..2503521ed86 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/JnienvArrayMarshaling.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/JnienvArrayMarshaling.cs
@@ -477,9 +477,6 @@ public void GetObjectArray ()
 		[Category ("JNIObjectArray")]
 		public void GetObjectArray_AfterStalePeerLookup ()
 		{
-			if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap)
-				Assert.Ignore ("This test exercises trimmable type map peer creation.");
-
 			var manager = Java.Interop.JniRuntime.CurrentRuntime.ValueManager;
 			IntPtr constructor = JNIEnv.GetMethodID (Java.Lang.Class.Object, "<init>", "()V");
 			IntPtr handle = JNIEnv.NewObject (Java.Lang.Class.Object, constructor);
@@ -518,9 +515,6 @@ public void GetObjectArray_AfterStalePeerLookup ()
 		[Category ("JNIObjectArray")]
 		public async Task GetPeer_ConcurrentLookup_ReturnsRegisteredPeer ()
 		{
-			if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap)
-				Assert.Ignore ("This test exercises trimmable type map peer creation.");
-
 			var manager = Java.Interop.JniRuntime.CurrentRuntime.ValueManager;
 			Java.InteropTests.TrimmableRuntimeJavaInteropPeer.Reset ();
 			var reference = CreateTrimmableRuntimeJavaInteropPeerReference ();
@@ -583,9 +577,6 @@ public async Task GetPeer_ConcurrentLookup_ReturnsRegisteredPeer ()
 		[Category ("JNIObjectArray")]
 		public async Task GetObjectArray_DuringConcurrentPeerLookup ()
 		{
-			if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap)
-				Assert.Ignore ("This test exercises trimmable type map peer creation.");
-
 			Java.InteropTests.TrimmableRuntimeJavaInteropPeer.Reset ();
 			var reference = CreateTrimmableRuntimeJavaInteropPeerReference ();
 			var arrayReference = CreateObjectArrayReference (reference);
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ActivationConstructorCacheTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ActivationConstructorCacheTests.cs
deleted file mode 100644
index 066a0219af6..00000000000
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ActivationConstructorCacheTests.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-#nullable enable
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Android.Runtime;
-using Java.Interop;
-using NUnit.Framework;
-using JavaObject = Java.Interop.JavaObject;
-
-namespace Java.InteropTests;
-
-[TestFixture]
-[Category ("ReflectionActivationCache")]
-public class ActivationConstructorCacheTests
-{
-	const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
-
-	delegate bool TryConstructPeerDelegate (IJavaPeerable self, ref JniObjectReference reference, JniObjectReferenceOptions options, Type type);
-
-	[TestCase (typeof (XAPeer), 1)]
-	[TestCase (typeof (JIPeer), 2)]
-	[TestCase (typeof (MissingPeer), 2)]
-	public void ResolutionIsCached (Type peerType, int expectedLookups)
-	{
-		AssumeReflectionActivation ();
-		var type = new CountingType (peerType);
-		var resolve = GetResolver ();
-		var activation = resolve.Invoke (null, new object [] { type });
-		Assert.AreEqual (expectedLookups, type.Lookups);
-		for (int i = 0; i < 10; i++)
-			Assert.AreEqual (activation, resolve.Invoke (null, new object [] { type }));
-		Assert.AreEqual (expectedLookups, type.Lookups, "Warm resolution must not enter the reflection binder.");
-	}
-
-	[TestCase (typeof (XAPeer))]
-	[TestCase (typeof (JIPeer))]
-	[TestCase (typeof (MissingPeer))]
-	public void ConcurrentResolutionPublishesConsistentResult (Type peerType)
-	{
-		AssumeReflectionActivation ();
-		var type = new CountingType (peerType);
-		var resolve = GetResolver ();
-		var results = new object? [32];
-		Parallel.For (0, results.Length, i => results [i] = resolve.Invoke (null, new object [] { type }));
-		foreach (var result in results)
-			Assert.AreEqual (results [0], result);
-		var lookups = type.Lookups;
-		Assert.Greater (lookups, 0);
-		Parallel.For (0, results.Length, i => resolve.Invoke (null, new object [] { type }));
-		Assert.AreEqual (lookups, type.Lookups);
-	}
-
-	[TestCase (false, JniObjectReferenceOptions.Copy)]
-	[TestCase (false, JniObjectReferenceOptions.CopyAndDispose)]
-	[TestCase (true, JniObjectReferenceOptions.Copy)]
-	[TestCase (true, JniObjectReferenceOptions.CopyAndDispose)]
-	public void CoreClrConstructsExistingPeerAndPreservesOwnership (bool ji, JniObjectReferenceOptions options)
-	{
-		var construct = GetCoreClrConstructor ();
-		var peerType = ji ? typeof (JIPeer) : typeof (XAPeer);
-		var type = new CountingType (peerType);
-		for (int i = 0; i < 2; i++) {
-			using var source = new JavaObject ();
-			var reference = source.PeerReference.NewLocalRef ();
-			var self = (Java.Lang.Object) RuntimeHelpers.GetUninitializedObject (peerType);
-			((IJavaPeerable) self).SetJniManagedPeerState (JniManagedPeerStates.Replaceable | JniManagedPeerStates.Activatable);
-			try {
-				Assert.IsTrue (construct (self, ref reference, options, type));
-				Assert.IsTrue (JniEnvironment.Types.IsSameObject (source.PeerReference, self.PeerReference));
-				if (self is XAPeer xa) {
-					Assert.AreSame (self, xa.ConstructedSelf);
-					Assert.AreEqual (JniHandleOwnership.DoNotTransfer, xa.Transfer);
-					Assert.IsFalse (xa.UsedJI, "XA must win when both constructors exist.");
-				} else if (self is JIPeer jp) {
-					Assert.AreSame (self, jp.ConstructedSelf);
-					Assert.AreEqual (options, jp.Options);
-				}
-				Assert.AreEqual (options == JniObjectReferenceOptions.Copy, reference.IsValid);
-			} finally {
-				self.Dispose ();
-				JniObjectReference.Dispose (ref reference);
-			}
-		}
-		Assert.AreEqual (ji ? 2 : 1, type.Lookups, "Repeated construction must reuse the value manager's cache.");
-	}
-
-	[Test]
-	public void CoreClrMissingConstructorLeavesReferenceAndPeerUntouched ()
-	{
-		var construct = GetCoreClrConstructor ();
-		var type = new CountingType (typeof (MissingPeer));
-		using var source = new JavaObject ();
-		var reference = source.PeerReference.NewLocalRef ();
-		var original = reference;
-		var self = (MissingPeer) RuntimeHelpers.GetUninitializedObject (typeof (MissingPeer));
-		GC.SuppressFinalize (self);
-		try {
-			for (int i = 0; i < 2; i++) {
-				Assert.IsFalse (construct (self, ref reference, JniObjectReferenceOptions.CopyAndDispose, type));
-				Assert.AreEqual (original, reference);
-				Assert.IsFalse (self.PeerReference.IsValid);
-			}
-			Assert.AreEqual (2, type.Lookups);
-		} finally {
-			JniObjectReference.Dispose (ref reference);
-		}
-	}
-
-	[TestCase (typeof (ThrowingXAPeer))]
-	[TestCase (typeof (ThrowingJIPeer))]
-	public void CoreClrThrowingConstructorDoesNotDisposeOrCopyBackReference ([DynamicallyAccessedMembers (Constructors)] Type peerType)
-	{
-		var construct = GetCoreClrConstructor ();
-		var type = new CountingType (peerType);
-		using var source = new JavaObject ();
-		var reference = source.PeerReference.NewLocalRef ();
-		var original = reference;
-		try {
-			for (int i = 0; i < 2; i++) {
-				var self = (Java.Lang.Object) RuntimeHelpers.GetUninitializedObject (peerType);
-				GC.SuppressFinalize (self);
-				var exception = Assert.Throws<TargetInvocationException> (() =>
-					construct (self, ref reference, JniObjectReferenceOptions.CopyAndDispose, type));
-				Assert.IsInstanceOf<InvalidOperationException> (exception?.InnerException);
-				Assert.AreEqual ("activation failed", exception?.InnerException?.Message);
-				Assert.AreEqual (original, reference);
-				Assert.IsTrue (JniEnvironment.Types.IsSameObject (source.PeerReference, reference));
-			}
-			Assert.AreEqual (peerType == typeof (ThrowingXAPeer) ? 1 : 2, type.Lookups);
-		} finally {
-			JniObjectReference.Dispose (ref reference);
-		}
-	}
-
-	[DynamicDependency (Constructors, typeof (XAPeer))]
-	[DynamicDependency (Constructors, typeof (JIPeer))]
-	[DynamicDependency (Constructors, typeof (MissingPeer))]
-	[DynamicDependency (Constructors, typeof (ThrowingXAPeer))]
-	[DynamicDependency (Constructors, typeof (ThrowingJIPeer))]
-	static void AssumeReflectionActivation ()
-	{
-		if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap)
-			Assert.Ignore ("This test exercises reflection activation, not the generated trimmable typemap.");
-	}
-
-	[UnconditionalSuppressMessage ("Trimming", "IL2111", Justification = "Only the explicitly preserved test peer constructors are resolved, through CountingType.")]
-	[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This test explicitly exercises the reflection value manager with preserved peer constructors.")]
-	static MethodInfo GetResolver ()
-	{
-		var managerType = Type.GetType ("Microsoft.Android.Runtime.JavaMarshalValueManager, Mono.Android", throwOnError: true)
-			?? throw new InvalidOperationException ("Could not find the CoreCLR reflection value manager.");
-		return managerType.GetMethod ("GetActivationConstructor", BindingFlags.NonPublic | BindingFlags.Static)
-			?? throw new InvalidOperationException ("Could not find the value manager's activation constructor resolver.");
-	}
-
-	[UnconditionalSuppressMessage ("Trimming", "IL2111", Justification = "Only the explicitly preserved test peer constructors are invoked, through CountingType.")]
-	[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This test explicitly exercises the reflection value manager with preserved peer constructors.")]
-	static TryConstructPeerDelegate GetCoreClrConstructor ()
-	{
-		AssumeReflectionActivation ();
-		if (!AppContext.TryGetSwitch ("Microsoft.Android.Runtime.RuntimeFeature.IsCoreClrRuntime", out bool isCoreClr) || !isCoreClr)
-			Assert.Ignore ("This test exercises the CoreCLR reflection value manager.");
-		var manager = JniEnvironment.Runtime.ValueManager;
-		Assert.AreEqual ("Microsoft.Android.Runtime.JavaMarshalValueManager", manager.GetType ().FullName);
-		var managerType = Type.GetType ("Microsoft.Android.Runtime.JavaMarshalValueManager, Mono.Android", throwOnError: true)
-			?? throw new InvalidOperationException ("Could not find the CoreCLR reflection value manager.");
-		var method = managerType.GetMethod ("TryConstructPeer", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly)
-			?? throw new InvalidOperationException ("Could not find CoreCLR TryConstructPeer.");
-		return method.CreateDelegate<TryConstructPeerDelegate> (manager);
-	}
-
-	sealed class CountingType : TypeDelegator
-	{
-		int lookups;
-		public int Lookups => Volatile.Read (ref lookups);
-
-		public CountingType (Type type) : base (type) {}
-
-		public override bool Equals (object? other) => ReferenceEquals (this, other);
-		public override bool Equals (Type? other) => ReferenceEquals (this, other);
-		public override int GetHashCode () => RuntimeHelpers.GetHashCode (this);
-
-		[DynamicallyAccessedMembers (Constructors)]
-		protected override ConstructorInfo? GetConstructorImpl (BindingFlags bindingAttr, Binder? binder, CallingConventions callConvention, Type [] types, ParameterModifier []? modifiers)
-		{
-			Interlocked.Increment (ref lookups);
-			Assert.AreEqual (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, bindingAttr);
-			Assert.IsNull (binder);
-			return base.GetConstructorImpl (bindingAttr, binder, callConvention, types, modifiers);
-		}
-	}
-
-	sealed class XAPeer : Java.Lang.Object
-	{
-		public object? ConstructedSelf;
-		public JniHandleOwnership Transfer;
-		public bool UsedJI;
-
-		internal XAPeer (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
-		{
-			ConstructedSelf = this;
-			Transfer = transfer;
-		}
-
-		public XAPeer (ref JniObjectReference reference, JniObjectReferenceOptions options) : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
-		{
-			UsedJI = true;
-			Construct (ref reference, options);
-		}
-	}
-
-	sealed class JIPeer : Java.Lang.Object
-	{
-		public object? ConstructedSelf;
-		public JniObjectReferenceOptions Options;
-
-		internal JIPeer (ref JniObjectReference reference, JniObjectReferenceOptions options) : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
-		{
-			ConstructedSelf = this;
-			Options = options;
-			Construct (ref reference, options);
-		}
-	}
-
-	sealed class MissingPeer : Java.Lang.Object
-	{
-		public MissingPeer () {}
-	}
-
-	sealed class ThrowingXAPeer : Java.Lang.Object
-	{
-		public ThrowingXAPeer (IntPtr handle, JniHandleOwnership transfer) : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
-		{
-			throw new InvalidOperationException ("activation failed");
-		}
-	}
-
-	sealed class ThrowingJIPeer : Java.Lang.Object
-	{
-		public ThrowingJIPeer (ref JniObjectReference reference, JniObjectReferenceOptions options) : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
-		{
-			reference = default;
-			throw new InvalidOperationException ("activation failed");
-		}
-	}
-}
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs
index cec3fff3e38..0353e684447 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs
@@ -1,7 +1,6 @@
 #nullable enable annotations
 
 using System;
-using System.Reflection;
 
 using Android.App;
 using Android.Content;
@@ -18,63 +17,6 @@ namespace Java.InteropTests
 	[TestFixture]
 	public class ConstructorActivationTests
 	{
-		[Test]
-		[Category ("ReflectionCreateProxy")]
-		public void ReflectionCreateProxyCachesXAConstructor ()
-		{
-			AssumeReflectionActivation ();
-			ReflectionXAActivationPeer.Reset ();
-
-			Assert.IsFalse (IsReflectionActivationConstructorCached (typeof (ReflectionXAActivationPeer)));
-
-			using (CreateReflectionProxy<ReflectionXAActivationPeer> ())
-			using (CreateReflectionProxy<ReflectionXAActivationPeer> ()) {
-				Assert.AreEqual (2, ReflectionXAActivationPeer.XAConstructorInvocations);
-				Assert.AreEqual (0, ReflectionXAActivationPeer.JIConstructorInvocations);
-				Assert.IsTrue (IsReflectionActivationConstructorCached (typeof (ReflectionXAActivationPeer)));
-				var constructor = GetCachedReflectionActivationConstructor (typeof (ReflectionXAActivationPeer));
-				Assert.IsNotNull (constructor);
-				Assert.AreEqual (typeof (IntPtr), constructor.GetParameters () [0].ParameterType);
-			}
-		}
-
-		[Test]
-		[Category ("ReflectionCreateProxy")]
-		public void ReflectionCreateProxyCachesJIConstructorFallback ()
-		{
-			AssumeReflectionActivation ();
-			ReflectionJIActivationPeer.Reset ();
-
-			Assert.IsFalse (IsReflectionActivationConstructorCached (typeof (ReflectionJIActivationPeer)));
-
-			using (CreateReflectionProxy<ReflectionJIActivationPeer> ())
-			using (CreateReflectionProxy<ReflectionJIActivationPeer> ()) {
-				Assert.AreEqual (2, ReflectionJIActivationPeer.ConstructorInvocations);
-				Assert.AreEqual (JniObjectReferenceOptions.Copy, ReflectionJIActivationPeer.Options);
-				Assert.IsTrue (IsReflectionActivationConstructorCached (typeof (ReflectionJIActivationPeer)));
-				var constructor = GetCachedReflectionActivationConstructor (typeof (ReflectionJIActivationPeer));
-				Assert.IsNotNull (constructor);
-				Assert.IsTrue (constructor.GetParameters () [0].ParameterType.IsByRef);
-			}
-		}
-
-		[Test]
-		[Category ("ReflectionCreateProxy")]
-		public void ReflectionCreateProxyCachesMissingConstructor ()
-		{
-			AssumeReflectionActivation ();
-
-			Assert.IsFalse (IsReflectionActivationConstructorCached (typeof (ReflectionMissingActivationPeer)));
-
-			for (int i = 0; i < 2; i++) {
-				var exception = Assert.Throws<TargetInvocationException> (() => CreateReflectionProxy<ReflectionMissingActivationPeer> ());
-				Assert.IsInstanceOf<MissingMethodException> (exception?.InnerException);
-			}
-
-			Assert.IsTrue (IsReflectionActivationConstructorCached (typeof (ReflectionMissingActivationPeer)));
-			Assert.IsNull (GetCachedReflectionActivationConstructor (typeof (ReflectionMissingActivationPeer)));
-		}
-
 		[Test]
 		public void JavaSideDefaultConstructorRunsOnceAndRegistersPeer ()
 		{
@@ -283,7 +225,6 @@ public void JavaSideCharConstructorForwardsValue ()
 		public void JavaSideShortConstructorForwardsValue ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> ("(S)V", new JValue ((short) -1234))) {
 				Assert.AreEqual (1, ConstructorActivationMarshalObject.ConstructorInvocations);
@@ -356,7 +297,6 @@ public void JavaSidePrimitiveMixedConstructorForwardsValues ()
 		public void JavaSideStringConstructorForwardsValue ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var value = new Java.Lang.String ("hello constructor"))
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> ("(Ljava/lang/String;)V", new JValue (value))) {
@@ -369,7 +309,6 @@ public void JavaSideStringConstructorForwardsValue ()
 		public void JavaSideStringConstructorForwardsNull ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> ("(Ljava/lang/String;)V", JValue.Zero)) {
 				Assert.AreEqual (1, ConstructorActivationMarshalObject.ConstructorInvocations);
@@ -381,7 +320,6 @@ public void JavaSideStringConstructorForwardsNull ()
 		public void JavaSideTwoStringConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var first = new Java.Lang.String ("first"))
 			using (var second = new Java.Lang.String ("second"))
@@ -399,7 +337,6 @@ public void JavaSideTwoStringConstructorForwardsValues ()
 		public void JavaSideTwoStringConstructorForwardsNullSecondValue ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var first = new Java.Lang.String ("first"))
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> (
@@ -416,7 +353,6 @@ public void JavaSideTwoStringConstructorForwardsNullSecondValue ()
 		public void JavaSideStringIntConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var text = new Java.Lang.String ("string-int"))
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> (
@@ -433,7 +369,6 @@ public void JavaSideStringIntConstructorForwardsValues ()
 		public void JavaSideIntArrayConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
 					"([I)V",
@@ -447,7 +382,6 @@ public void JavaSideIntArrayConstructorForwardsValues ()
 		public void JavaSideIntArrayConstructorForwardsEmptyArray ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
 					"([I)V",
@@ -462,7 +396,6 @@ public void JavaSideIntArrayConstructorForwardsEmptyArray ()
 		public void JavaSideIntArrayConstructorForwardsNull ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> ("([I)V", JValue.Zero)) {
 				Assert.AreEqual (1, ConstructorActivationMarshalObject.ConstructorInvocations);
@@ -474,7 +407,6 @@ public void JavaSideIntArrayConstructorForwardsNull ()
 		public void JavaSideStringIntArrayConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var label = new Java.Lang.String ("string-array"))
 			{
@@ -498,7 +430,6 @@ public void JavaSideStringIntArrayConstructorForwardsValues ()
 		public void JavaSideBooleanArrayConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
 					"([Z)V",
@@ -512,7 +443,6 @@ public void JavaSideBooleanArrayConstructorForwardsValues ()
 		public void JavaSideByteArrayConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
 					"([B)V",
@@ -526,7 +456,6 @@ public void JavaSideByteArrayConstructorForwardsValues ()
 		public void JavaSideStringArrayConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
 					"([Ljava/lang/String;)V",
@@ -540,7 +469,6 @@ public void JavaSideStringArrayConstructorForwardsValues ()
 		public void JavaSideStringArrayConstructorForwardsNullElement ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
 					"([Ljava/lang/String;)V",
@@ -554,7 +482,6 @@ public void JavaSideStringArrayConstructorForwardsNullElement ()
 		public void JavaSideStringArrayConstructorForwardsNull ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> ("([Ljava/lang/String;)V", JValue.Zero)) {
 				Assert.AreEqual (1, ConstructorActivationMarshalObject.ConstructorInvocations);
@@ -566,7 +493,6 @@ public void JavaSideStringArrayConstructorForwardsNull ()
 		public void JavaSideObjectArrayConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var first = new Java.Lang.String ("object-array-value"))
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
@@ -584,7 +510,6 @@ public void JavaSideObjectArrayConstructorForwardsValues ()
 		public void JavaSideObjectArrayConstructorForwardsNull ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJava<ConstructorActivationMarshalObject> ("([Ljava/lang/Object;)V", JValue.Zero)) {
 				Assert.AreEqual (1, ConstructorActivationMarshalObject.ConstructorInvocations);
@@ -596,7 +521,6 @@ public void JavaSideObjectArrayConstructorForwardsNull ()
 		public void JavaSideNestedIntArrayConstructorForwardsValues ()
 		{
 			ConstructorActivationMarshalObject.Reset ();
-			AssumeTrimmableConstructorParameterMarshalling ();
 
 			using (var instance = CreateFromJavaWithLocalArray<ConstructorActivationMarshalObject> (
 					"([[I)V",
@@ -611,86 +535,6 @@ public void JavaSideNestedIntArrayConstructorForwardsValues ()
 			}
 		}
 
-		static void AssumeTrimmableConstructorParameterMarshalling ()
-		{
-			if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("Legacy TypeManager.n_Activate does not marshal string, short, or array constructor parameters; this case validates trimmable constructor UCO parameter marshalling.");
-			}
-		}
-
-		static void AssumeReflectionActivation ()
-		{
-			if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("This test validates the reflection-based TypeManager.CreateProxy activation path.");
-			}
-		}
-
-		static T CreateReflectionProxy<T> ()
-			where T : IJavaPeerable
-		{
-			IntPtr handle = JNIEnv.StartCreateInstance ("java/lang/Object", "()V");
-			JNIEnv.FinishCreateInstance (handle, "()V");
-			try {
-				const BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Static;
-				var createProxy = typeof (Java.Interop.TypeManager).GetMethod (
-						"CreateProxy",
-						flags,
-						null,
-						new [] { typeof (Type), typeof (IntPtr), typeof (JniHandleOwnership) },
-						null);
-				if (createProxy == null)
-					throw new InvalidOperationException ("Could not find TypeManager.CreateProxy.");
-
-				var proxy = createProxy.Invoke (null, new object [] { typeof (T), handle, JniHandleOwnership.TransferLocalRef });
-				handle = IntPtr.Zero;
-				if (proxy is not T result)
-					throw new InvalidOperationException ($"TypeManager.CreateProxy returned an unexpected peer for {typeof (T)}.");
-				return result;
-			} finally {
-				if (handle != IntPtr.Zero)
-					JNIEnv.DeleteLocalRef (handle);
-			}
-		}
-
-		static bool IsReflectionActivationConstructorCached (Type type)
-		{
-			var cache = GetReflectionActivationConstructorCache ();
-			var containsKey = cache.GetType ().GetMethod ("ContainsKey", new [] { typeof (Type) });
-			if (containsKey == null)
-				throw new InvalidOperationException ("Could not inspect the reflection activation constructor cache.");
-
-			return containsKey.Invoke (cache, new object [] { type }) is true;
-		}
-
-		static ConstructorInfo? GetCachedReflectionActivationConstructor (Type type)
-		{
-			var cache = GetReflectionActivationConstructorCache ();
-			var item = cache.GetType ().GetProperty ("Item");
-			if (item == null)
-				throw new InvalidOperationException ("Could not inspect a reflection activation constructor cache entry.");
-
-			var activation = item.GetValue (cache, new object [] { type });
-			if (activation == null)
-				throw new InvalidOperationException ("The reflection activation constructor cache entry is null.");
-
-			var constructor = activation.GetType ().GetProperty ("Constructor");
-			if (constructor == null)
-				throw new InvalidOperationException ("Could not inspect the cached reflection activation constructor.");
-
-			return constructor.GetValue (activation) as ConstructorInfo;
-		}
-
-		static object GetReflectionActivationConstructorCache ()
-		{
-			const BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Static;
-			var cacheField = typeof (Java.Interop.TypeManager).GetField ("ActivationConstructorCache", flags);
-			if (cacheField == null)
-				throw new InvalidOperationException ("Could not find the reflection activation constructor cache.");
-
-			return cacheField.GetValue (null) ??
-					throw new InvalidOperationException ("The reflection activation constructor cache is null.");
-		}
-
 		static T CreateFromJava<T> (string constructorSignature, params JValue [] arguments)
 			where T : Java.Lang.Object
 		{
@@ -731,9 +575,7 @@ static void AssertRegisteredSame<T> (T instance)
 			var registered = Java.Lang.Object.GetObject<T> (instance.Handle, JniHandleOwnership.DoNotTransfer);
 			try {
 				Assert.AreSame (instance, registered);
-				if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-					Assert.AreEqual (Java.Lang.JavaSystem.IdentityHashCode (instance), instance.JniIdentityHashCode);
-				}
+				Assert.AreEqual (Java.Lang.JavaSystem.IdentityHashCode (instance), instance.JniIdentityHashCode);
 			} finally {
 				if (registered != null && !object.ReferenceEquals (instance, registered))
 					registered.Dispose ();
@@ -750,58 +592,6 @@ static void AssertSameJavaObject (Java.Lang.Object expected, Java.Lang.Object ac
 		}
 	}
 
-	sealed class ReflectionXAActivationPeer : Java.Lang.Object
-	{
-		public static int XAConstructorInvocations;
-		public static int JIConstructorInvocations;
-
-		public ReflectionXAActivationPeer (IntPtr handle, JniHandleOwnership transfer)
-			: base (handle, transfer)
-		{
-			XAConstructorInvocations++;
-		}
-
-		public ReflectionXAActivationPeer (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
-		{
-			JIConstructorInvocations++;
-			Construct (ref reference, options);
-		}
-
-		public static void Reset ()
-		{
-			XAConstructorInvocations = 0;
-			JIConstructorInvocations = 0;
-		}
-	}
-
-	sealed class ReflectionJIActivationPeer : Java.Lang.Object
-	{
-		public static int ConstructorInvocations;
-		public static JniObjectReferenceOptions Options;
-
-		public ReflectionJIActivationPeer (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
-		{
-			ConstructorInvocations++;
-			Options = options;
-			Construct (ref reference, options);
-		}
-
-		public static void Reset ()
-		{
-			ConstructorInvocations = 0;
-			Options = JniObjectReferenceOptions.None;
-		}
-	}
-
-	sealed class ReflectionMissingActivationPeer : Java.Lang.Object
-	{
-		public ReflectionMissingActivationPeer ()
-		{
-		}
-	}
-
 	[Register ("net/dot/android/test/ConstructorActivationThrowing")]
 	public class ConstructorActivationThrowing : Java.Lang.Object
 	{
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ExportTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ExportTests.cs
index 39461a8fba2..1586ec19d75 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ExportTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ExportTests.cs
@@ -4,8 +4,6 @@
 
 using Java.Interop;
 
-using Microsoft.Android.Runtime;
-
 using NUnit.Framework;
 
 namespace Java.InteropTests
@@ -13,9 +11,7 @@ namespace Java.InteropTests
 	// Device-level coverage for [Export] / [ExportField] marshalling.
 	//
 	// These tests drive the Java side of an [Export]-bearing peer via JNIEnv,
-	// then assert what C# observed (and vice versa). They run under both the
-	// legacy llvm-ir typemap (which is the contract) and the trimmable typemap
-	// (which must match it).
+	// then assert what C# observed (and vice versa).
 	//
 	// Naming: each test is named Export_<Group>_<Feature>_<Behaviour> so the
 	// runner output is greppable.
@@ -175,8 +171,6 @@ public void Export_Method_PeerArray_RoundTrip ()
 		[Test, Category ("Export")]
 		public void Export_Method_Throws_PrimitiveReturn_SurfacesAsManagedException ()
 		{
-			AssumeTrimmableExportExceptionRouting ();
-
 			using var e = new ExportThrowing ();
 			var m = JNIEnv.GetMethodID (e.Class.Handle, "Throwing", "()I");
 			Assert.AreNotEqual (IntPtr.Zero, m, "JNI method id for Throwing not found");
@@ -193,8 +187,6 @@ public void Export_Method_Throws_PrimitiveReturn_SurfacesAsManagedException ()
 		[Test, Category ("Export")]
 		public void Export_Method_Throws_ObjectReturn_SurfacesAsManagedException ()
 		{
-			AssumeTrimmableExportExceptionRouting ();
-
 			using var e = new ExportThrowing ();
 			var m = JNIEnv.GetMethodID (e.Class.Handle, "ThrowingString", "()Ljava/lang/String;");
 			Assert.AreNotEqual (IntPtr.Zero, m, "JNI method id for ThrowingString not found");
@@ -211,8 +203,6 @@ public void Export_Method_Throws_ObjectReturn_SurfacesAsManagedException ()
 		[Test, Category ("Export")]
 		public void Export_Method_Throws_FollowedBySecondCall_DoesNotLeakPendingException ()
 		{
-			AssumeTrimmableExportExceptionRouting ();
-
 			using var e = new ExportThrowing ();
 			var throwing = JNIEnv.GetMethodID (e.Class.Handle, "Throwing", "()I");
 			Assert.AreNotEqual (IntPtr.Zero, throwing, "JNI method id for Throwing not found");
@@ -234,8 +224,6 @@ public void Export_Method_Throws_FollowedBySecondCall_DoesNotLeakPendingExceptio
 		[Test, Category ("Export")]
 		public void Export_Method_NestedJniCall_PreservesExceptionFromInnerExport ()
 		{
-			AssumeTrimmableExportExceptionRouting ();
-
 			// Outer [Export] method (ReentrantOuter) invokes Java reflection to call
 			// an inner [Export] method on the same peer (ReentrantInner) that throws.
 			// The inner throw is caught by the *inner* wrapper, set as a pending
@@ -252,13 +240,6 @@ public void Export_Method_NestedJniCall_PreservesExceptionFromInnerExport ()
 				"the original inner-export exception message must propagate through both [Export] wrappers");
 		}
 
-		static void AssumeTrimmableExportExceptionRouting ()
-		{
-			if (!RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("[Export] exception routing coverage is only relevant for the trimmable typemap path.");
-			}
-		}
-
 		// ---------------------------------------------------------------
 		// Group C — static [Export] dispatch
 		// ---------------------------------------------------------------
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/InvokerActivationTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/InvokerActivationTests.cs
index 997849b41fb..f1fc79b8c98 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/InvokerActivationTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/InvokerActivationTests.cs
@@ -5,8 +5,6 @@
 
 using Java.Interop;
 
-using Microsoft.Android.Runtime;
-
 using NUnit.Framework;
 
 namespace Java.InteropTests
@@ -38,7 +36,6 @@ public void XamarinAndroidInterfaceInvoker_ActivatesOnceAndPreservesIdentity ()
 		[Test]
 		public void JavaInteropInterfaceInvoker_ActivatesOnceAndPreservesIdentity ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			JavaInteropCollectionInvoker.ConstructorInvocations = 0;
 
 			var handle = CreateHashSetHandle ();
@@ -59,8 +56,6 @@ public void JavaInteropInterfaceInvoker_ActivatesOnceAndPreservesIdentity ()
 		[Test]
 		public void CompatibleInterfaceThenConcrete_PreservesIdentity ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var handle = CreateArrayListHandle ();
 			try {
 				var asInterface = GetValue<Java.Util.IList> (handle);
@@ -78,7 +73,6 @@ public void CompatibleInterfaceThenConcrete_PreservesIdentity ()
 		[Test]
 		public void InheritedJavaInteropInterface_UsesExplicitInvoker ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			InheritedJavaInteropListInvoker.ConstructorInvocations = 0;
 
 			var handle = CreateArrayListHandle ();
@@ -98,7 +92,6 @@ public void InheritedJavaInteropInterface_UsesExplicitInvoker ()
 		[Test]
 		public void AbstractJavaInteropType_UsesExplicitInvoker ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			JavaInteropAbstractListInvoker.ConstructorInvocations = 0;
 
 			var handle = CreateArrayListHandle ();
@@ -114,13 +107,6 @@ public void AbstractJavaInteropType_UsesExplicitInvoker ()
 			}
 		}
 
-		static void AssumeTrimmableTypeMapEnabled ()
-		{
-			if (!RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("TrimmableTypeMap feature switch is off; test only relevant for the trimmable typemap path.");
-			}
-		}
-
 		static IntPtr CreateArrayListHandle ()
 		{
 			using var list = new Java.Util.ArrayList ();
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JavaConvertTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JavaConvertTest.cs
index 9c8ab4f9740..18ec3fd1889 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JavaConvertTest.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JavaConvertTest.cs
@@ -600,10 +600,6 @@ public void FromJniHandle_IDictionaryNullableInt32String ()
 		[Category ("NativeAOTTrimmable")]
 		public void FromJniHandle_IDictionaryInt32Int64 ()
 		{
-			if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("This test validates value/value dictionary rooting on the trimmable typemap path.");
-			}
-
 			using (var source = new JavaDictionary ()) {
 				source.Add (1, 100L);
 				source.Add (2, 200L);
@@ -711,10 +707,6 @@ public void FromJniHandle_ReferenceArgumentsUseCanonicalTemplate (Type targetTyp
 		[Category ("NativeAOTTrimmable")]
 		public void FromJniHandle_UnsupportedValueTypeUsesRuntimeSpecificPath (Type targetType, bool dictionary)
 		{
-			if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("This test validates value-type containers on the trimmable typemap path.");
-			}
-
 			Java.Lang.Object source = dictionary ? new JavaDictionary () : new JavaList ();
 			using (source) {
 				var converted = InvokeJavaConvertFromJniHandle (targetType, source.Handle, JniHandleOwnership.DoNotTransfer);
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs
index 5a519fc0fea..afd48471bb3 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs
@@ -363,14 +363,8 @@ public void ActivatedDirectThrowableSubclassesShouldBeRegistered ()
 			}
 		}
 
-		// Locks in the legacy llvm-ir typemap behavior for parameterized ctor activation.
-		// Java instantiation forwards JNI args to the user-visible managed ctor; trimmable
-		// typemap codegen must match this contract for non-()V signatures.
-		//
-		// NOTE: Legacy mono.android.TypeManager.Activate routes args through
-		// JNIEnv.GetObjectArray, which only supports IJavaObject-derived element types.
-		// Tests deliberately use Java.Lang.Throwable args (not System.String) to stay
-		// inside the supported legacy contract.
+		// Java instantiation forwards JNI args to the user-visible managed ctor,
+		// including non-()V signatures with Java.Lang.Throwable parameters.
 		[Test]
 		public void ActivatedDirectThrowableSubclasses_ThrowableCtor_ShouldForwardArgs ()
 		{
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ManagedObjectProxyTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ManagedObjectProxyTests.cs
index b8648eb5796..9bf83bd7807 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ManagedObjectProxyTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ManagedObjectProxyTests.cs
@@ -214,21 +214,14 @@ public void ProxyObjectMethodsFollowConfiguredJavaSemantics ()
 						JniObjectReference.Dispose (ref actualStringReference);
 					}
 
-					if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-						Assert.IsFalse (JNIEnv.CallBooleanMethod (reference.Handle, equals, new JValue (equalReference.Handle)),
-							"Trimmable proxies intentionally use Java reference identity instead of managed Equals.");
-						Assert.AreEqual (GetJavaIdentityHashCode (reference), actualHashCode,
-							"Trimmable proxies intentionally use Java identity hash codes.");
-						string runtimeClassName = JNIEnv.GetClassNameFromInstance (reference.Handle).Replace ('/', '.');
-						string expectedString = $"{runtimeClassName}@{unchecked ((uint) actualHashCode).ToString ("x", CultureInfo.InvariantCulture)}";
-						Assert.AreEqual (expectedString, actualString,
-							"Trimmable proxies should use the exact default java.lang.Object.toString format.");
-					} else {
-						Assert.IsTrue (JNIEnv.CallBooleanMethod (reference.Handle, equals, new JValue (equalReference.Handle)),
-							"The llvm-ir proxy forwards Java equals to the managed override.");
-						Assert.AreEqual (value.GetHashCode (), actualHashCode);
-						Assert.AreEqual (value.ToString (), actualString);
-					}
+					Assert.IsFalse (JNIEnv.CallBooleanMethod (reference.Handle, equals, new JValue (equalReference.Handle)),
+						"Trimmable proxies intentionally use Java reference identity instead of managed Equals.");
+					Assert.AreEqual (GetJavaIdentityHashCode (reference), actualHashCode,
+						"Trimmable proxies intentionally use Java identity hash codes.");
+					string runtimeClassName = JNIEnv.GetClassNameFromInstance (reference.Handle).Replace ('/', '.');
+					string expectedString = $"{runtimeClassName}@{unchecked ((uint) actualHashCode).ToString ("x", CultureInfo.InvariantCulture)}";
+					Assert.AreEqual (expectedString, actualString,
+						"Trimmable proxies should use the exact default java.lang.Object.toString format.");
 				} finally {
 					JNIEnv.DeleteLocalRef (proxyClass);
 				}
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapRuntimeCoverageTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapRuntimeCoverageTests.cs
index 89888da243e..4652f007846 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapRuntimeCoverageTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapRuntimeCoverageTests.cs
@@ -21,7 +21,6 @@ public class TrimmableTypeMapRuntimeCoverageTests
 		[Test]
 		public void JavaToManagedTextWatcherCallback_MarshalsStringAndPrimitiveParameters ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			TrimmableRuntimeTextWatcher.Reset ();
 
 			using var watcher = new TrimmableRuntimeTextWatcher ();
@@ -46,7 +45,6 @@ public void JavaToManagedTextWatcherCallback_MarshalsStringAndPrimitiveParameter
 		[Test]
 		public void JavaToManagedClickCallback_MarshalsObjectParameter ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			TrimmableRuntimeClickListener.Reset ();
 
 			using var listener = new TrimmableRuntimeClickListener ();
@@ -62,7 +60,6 @@ public void JavaToManagedClickCallback_MarshalsObjectParameter ()
 		[Test]
 		public void JavaToManagedLongClickCallback_MarshalsBooleanReturn ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			TrimmableRuntimeClickListener.Reset ();
 
 			using var listener = new TrimmableRuntimeClickListener ();
@@ -79,7 +76,6 @@ public void JavaToManagedLongClickCallback_MarshalsBooleanReturn ()
 		[Test]
 		public void JavaToManagedInvocationHandlerCallback_MarshalsObjectArrayParameter ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			TrimmableRuntimeInvocationHandler.Reset ();
 
 			using var handler = new TrimmableRuntimeInvocationHandler ();
@@ -104,7 +100,6 @@ public void JavaToManagedInvocationHandlerCallback_MarshalsObjectArrayParameter
 		[Test]
 		public void JavaActivatedPeer_DisposeCanAccessThisAndInvokeVirtualMember ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			TrimmableRuntimeDisposePeer.Reset ();
 
 			using (var peer = CreateFromJava<TrimmableRuntimeDisposePeer> ()) {
@@ -120,8 +115,6 @@ public void JavaActivatedPeer_DisposeCanAccessThisAndInvokeVirtualMember ()
 		[Test]
 		public void JavaListAliasGroup_TargetHintSelectsGenericAndNonGenericManagedTypes ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var targetTypes = new List<Type> ();
 			foreach (var targetType in TrimmableTypeMap.Instance.GetTargetTypes ("java/util/ArrayList")) {
 				targetTypes.Add (targetType);
@@ -160,7 +153,6 @@ public void JavaListAliasGroup_TargetHintSelectsGenericAndNonGenericManagedTypes
 		[Test]
 		public void JavaCreatedHandle_UsesJavaInteropStyleActivationConstructor ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
 			TrimmableRuntimeJavaInteropPeer.Reset ();
 
 			var handle = JNIEnv.CreateInstance ("net/dot/android/test/TrimmableRuntimeJavaInteropPeer", "()V");
@@ -176,8 +168,6 @@ public void JavaCreatedHandle_UsesJavaInteropStyleActivationConstructor ()
 		[Test]
 		public void NonGenericCollection_CopyTo_ViewArray_UsesTrimmableTypeMapForArrayElementConversion ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using (var arrayList = new Java.Util.ArrayList ()) {
 				var viewClass = JniEnvironment.Types.FindClass ("android/view/View");
 				var viewHandle = IntPtr.Zero;
@@ -203,8 +193,6 @@ public void NonGenericCollection_CopyTo_ViewArray_UsesTrimmableTypeMapForArrayEl
 		[Test]
 		public void NonGenericCollection_CopyTo_ObjectArray_PreservesNullElement ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using (var arrayList = new Java.Util.ArrayList ()) {
 				arrayList.Add (42);
 				arrayList.Add (null);
@@ -224,8 +212,6 @@ public void NonGenericCollection_CopyTo_ObjectArray_PreservesNullElement ()
 		[Test]
 		public void NonGenericCollection_CopyTo_StringArray_ConvertsJavaString ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using (var arrayList = new Java.Util.ArrayList ()) {
 				arrayList.Add ("alpha");
 
@@ -268,13 +254,6 @@ static T CreateFromJava<T> ()
 			Assert.IsNotNull (result);
 			return result;
 		}
-
-		static void AssumeTrimmableTypeMapEnabled ()
-		{
-			if (!RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("TrimmableTypeMap feature switch is off; test only relevant for the trimmable typemap path.");
-			}
-		}
 	}
 
 	class TrimmableRuntimeTextWatcher : Java.Lang.Object, ITextWatcher
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs
index ca1053be459..d9510d58d75 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs
@@ -48,8 +48,6 @@ public void GetTypeSignature_NullableByteJaggedArray_ReturnsJavaLangByte (Type t
 		[Test]
 		public void GetType_RepeatedJavaToManagedLookup_DoesNotAllocate ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			const string jniName = "android/view/View";
 			const int iterationCount = 1_000;
 			var typeMap = TrimmableTypeMap.Instance;
@@ -79,8 +77,6 @@ public void GetType_RepeatedJavaToManagedLookup_DoesNotAllocate ()
 		[Test]
 		public void TryGetTargetType_MissingEntry_ReturnsFalse ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			Assert.IsFalse (TrimmableTypeMap.Instance.TryGetTargetType ("net/dot/android/test/MissingType", out var targetType));
 			Assert.IsNull (targetType);
 		}
@@ -88,8 +84,6 @@ public void TryGetTargetType_MissingEntry_ReturnsFalse ()
 		[Test]
 		public void JniProxyCache_SingleMappingStoresProxyDirectly ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			const string jniName = "android/view/View";
 			var instance = TrimmableTypeMap.Instance;
 			var cache = GetJniProxyCache (instance);
@@ -104,8 +98,6 @@ public void JniProxyCache_SingleMappingStoresProxyDirectly ()
 		[Test]
 		public void JniProxyCache_AliasMappingStoresProxyArray ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			const string jniName = "java/util/ArrayList";
 			var instance = TrimmableTypeMap.Instance;
 			var cache = GetJniProxyCache (instance);
@@ -123,8 +115,6 @@ public void JniProxyCache_AliasMappingStoresProxyArray ()
 		[Test]
 		public void JniProxyCache_MissingMappingStoresEmptyProxyArray ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			const string jniName = "net/dot/android/test/MissingProxyCacheEntry";
 			var instance = TrimmableTypeMap.Instance;
 			var cache = GetJniProxyCache (instance);
@@ -144,8 +134,6 @@ public void JniProxyCache_MissingMappingStoresEmptyProxyArray ()
 		[Test]
 		public void JniProxyCache_UnexpectedEntryTypeThrows ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			const string jniName = "net/dot/android/test/InvalidProxyCacheEntry";
 			var instance = TrimmableTypeMap.Instance;
 			var cache = GetJniProxyCache (instance);
@@ -177,8 +165,6 @@ public void RegisterNativeMethods_AliasGroupRegistersEveryCallableWrapper ()
 		[Test]
 		public void TryGetJniNameForManagedType_ClosedGeneric_ResolvesViaGenericTypeDefinition ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var instance = TrimmableTypeMap.Instance;
 
 			Assert.IsTrue (instance.TryGetJniNameForManagedType (typeof (JavaList<>), out var openJniName),
@@ -197,8 +183,6 @@ public void TryGetJniNameForManagedType_ClosedGeneric_ResolvesViaGenericTypeDefi
 		[Test]
 		public void TryGetJniNameForManagedType_NonGenericType_ResolvesDirectly ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			// Regression: the GTD fallback must not disturb the non-generic hot path.
 			Assert.IsTrue (TrimmableTypeMap.Instance.TryGetJniNameForManagedType (typeof (JavaList), out var jniName));
 			Assert.IsFalse (string.IsNullOrEmpty (jniName));
@@ -207,8 +191,6 @@ public void TryGetJniNameForManagedType_NonGenericType_ResolvesDirectly ()
 		[Test]
 		public void TryGetJniNameForManagedType_UnknownClosedGeneric_ReturnsFalse ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			// System.Collections.Generic.List<T> has no TypeMapAssociation — both the
 			// direct lookup AND the GTD fallback must miss, and the API must return false.
 			Assert.IsFalse (TrimmableTypeMap.Instance.TryGetJniNameForManagedType (
@@ -219,8 +201,6 @@ public void TryGetJniNameForManagedType_UnknownClosedGeneric_ReturnsFalse ()
 		[Test]
 		public void TryGetJniNameForManagedType_RepeatedClosedGenericLookup_IsCached ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			// Closed generic peers normalize to their open generic definition, so
 			// repeated lookups reuse the same cached proxy.
 			var instance = TrimmableTypeMap.Instance;
@@ -233,8 +213,6 @@ public void TryGetJniNameForManagedType_RepeatedClosedGenericLookup_IsCached ()
 		[Test]
 		public void TryGetJniNameForManagedType_DifferentClosedGenerics_UseGenericDefinitionCacheKey ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var instance = TrimmableTypeMap.Instance;
 			var cache = GetProxyCache (instance);
 
@@ -253,8 +231,6 @@ public void TryGetJniNameForManagedType_DifferentClosedGenerics_UseGenericDefini
 		[Test]
 		public void GetProxyForJavaObject_SealedTarget_ReturnsProxy ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using var value = new Java.Lang.String ("value");
 			var proxy = TrimmableTypeMap.Instance.GetProxyForJavaObject (value.Handle, typeof (Java.Lang.String));
 
@@ -268,8 +244,6 @@ public void GetProxyForJavaObject_SealedTarget_ReturnsProxy ()
 		[Test]
 		public void GetProxyForJavaObject_IncompatibleSealedTarget_ReturnsNull ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using var value = new Java.Lang.Integer (42);
 			var proxy = TrimmableTypeMap.Instance.GetProxyForJavaObject (value.Handle, typeof (Java.Lang.String));
 
@@ -279,8 +253,6 @@ public void GetProxyForJavaObject_IncompatibleSealedTarget_ReturnsNull ()
 		[Test]
 		public void CreateInstance_SealedClosedGenericTarget_ReturnsClosedPeer ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using var value = new Java.Util.ArrayList ();
 			var peer = TrimmableTypeMap.Instance.CreateInstance (value.Handle, typeof (JavaCollection<int>));
 			if (peer is not JavaCollection<int> collection) {
@@ -295,8 +267,6 @@ public void CreateInstance_SealedClosedGenericTarget_ReturnsClosedPeer ()
 		[Test]
 		public void RegisteredPeer_Dispose_InvokesDisposing ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			bool disposed = false;
 			bool finalized = false;
 			var value = new TrimmableRegisteredDisposedObject {
@@ -313,8 +283,6 @@ public void RegisteredPeer_Dispose_InvokesDisposing ()
 		[Test]
 		public async Task RegisteredPeer_Dispose_Finalized ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var disposed = new TaskCompletionSource<bool> (TaskCreationOptions.RunContinuationsAsynchronously);
 			var finalized = new TaskCompletionSource<bool> (TaskCreationOptions.RunContinuationsAsynchronously);
 
@@ -340,8 +308,6 @@ await WaitForGC (() => disposed.Task.IsCompleted || finalized.Task.IsCompleted,
 		[Test]
 		public void RegisteredPeer_NestedDisposeInvocations ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var value = new TrimmableRegisteredNestedDisposableObject ();
 			value.Dispose ();
 			value.Dispose ();
@@ -350,8 +316,6 @@ public void RegisteredPeer_NestedDisposeInvocations ()
 		[Test]
 		public void RegisteredPeer_CanCreateGenericHolder ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using var holder = new TrimmableRegisteredGenericHolder<int> ();
 			holder.Value = 42;
 
@@ -361,8 +325,6 @@ public void RegisteredPeer_CanCreateGenericHolder ()
 		[Test]
 		public void TrimmableJavaProxyObject_CreateLocalObjectReferenceArgumentUsesProxyType ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var value = new object ();
 			var reference = JniEnvironment.Runtime.ValueManager.CreateLocalObjectReferenceArgument (typeof (object), value);
 
@@ -376,8 +338,6 @@ public void TrimmableJavaProxyObject_CreateLocalObjectReferenceArgumentUsesProxy
 		[Test]
 		public void TrimmableJavaProxyObject_CanBeUsedInObjectArray ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			using var values = new JavaObjectArray<object> (1);
 			values [0] = new object ();
 
@@ -387,8 +347,6 @@ public void TrimmableJavaProxyObject_CanBeUsedInObjectArray ()
 		[Test]
 		public void TrimmableJavaProxyObject_ObjectMethodsUseJavaIdentitySemantics ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			var value = new object ();
 			var other = new object ();
 			var reference = JniEnvironment.Runtime.ValueManager.CreateLocalObjectReferenceArgument (typeof (object), value);
@@ -541,12 +499,6 @@ static IReadOnlyList<string> GetStaticMethodFallbackTypes (TestableTrimmableType
 			return fallbacks ?? throw new InvalidOperationException ("Expected fallback types.");
 		}
 
-		static void AssumeTrimmableTypeMapEnabled ()
-		{
-			if (!RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("TrimmableTypeMap feature switch is off; test only relevant for the trimmable typemap path.");
-			}
-		}
 
 		static async Task WaitForGC (Func<bool> predicate, string message, int timeoutMilliseconds = 2000)
 		{
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index 1aa71c64eda..e3215dc6dc9 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -134,7 +134,6 @@
     <Compile Include="Android.Views\LayoutInflaterTest.cs" />
     <Compile Include="Android.Widget\AdapterTests.cs" />
     <Compile Include="Android.Widget\CustomWidgetTests.cs" />
-    <Compile Include="Java.Interop\ActivationConstructorCacheTests.cs" />
     <Compile Include="Java.Interop\ConstructorActivationTests.cs" />
     <Compile Include="Java.Interop\ExportTests.cs" />
     <Compile Include="Java.Interop\InterfaceCollectionMarshallingTests.cs" />
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/TrustManagerMarshallingTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/TrustManagerMarshallingTests.cs
index 53d558fe61b..05107a52e6d 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/TrustManagerMarshallingTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/TrustManagerMarshallingTests.cs
@@ -2,7 +2,6 @@
 using Android.Runtime;
 using Java.Security;
 using Javax.Net.Ssl;
-using Microsoft.Android.Runtime;
 using NUnit.Framework;
 
 namespace Xamarin.Android.NetTests
@@ -35,8 +34,6 @@ public void TrustManagerFactory_GetTrustManagers_ReturnsIX509TrustManager ()
 		[Test]
 		public void JavaInterfaceLookup_BaseInterfaceReturnType_UsesDerivedInterfaceProxy ()
 		{
-			AssumeTrimmableTypeMapEnabled ();
-
 			// Mirrors API 21-23 TrustManagerImpl: the Java signature returns the
 			// base interface, but the concrete object advertises a derived interface.
 			using var provider = global::Net.Dot.Android.Test.InterfaceMarshalling.ExtendedValueProviderAsValueProvider;
@@ -50,12 +47,5 @@ public void JavaInterfaceLookup_BaseInterfaceReturnType_UsesDerivedInterfaceProx
 			Assert.AreEqual (42, provider.Value);
 			Assert.AreEqual (84, extendedProvider.OtherValue);
 		}
-
-		static void AssumeTrimmableTypeMapEnabled ()
-		{
-			if (!RuntimeFeature.TrimmableTypeMap) {
-				Assert.Ignore ("TrimmableTypeMap feature switch is off; test only relevant for the trimmable typemap path.");
-			}
-		}
 	}
 }
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
index b245625bc08..57e972cd18f 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
@@ -27,10 +27,8 @@ protected override IEnumerable<string>? ExcludedCategories {
 				categories.Add ("CoreCLRIgnore");
 				categories.Add ("NTLM");
 
-				if (Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-					categories.Add ("NativeTypeMap");
-					categories.Add ("TrimmableTypeMapUnsupported");
-				}
+				categories.Add ("NativeTypeMap");
+				categories.Add ("TrimmableTypeMapUnsupported");
 
 				// Build-time flags flow in via runtimeconfig.json properties
 				// (see <RuntimeHostConfigurationOption> entries in Mono.Android.NET-Tests.csproj).
@@ -40,9 +38,6 @@ protected override IEnumerable<string>? ExcludedCategories {
 					categories.Add ("SSL");
 					categories.Add ("NTLM");
 
-					if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap) {
-						categories.Add ("Export");
-					}
 				}
 
 				// Process-wide reference counts are only stable in the dedicated filtered run.
@@ -86,9 +81,6 @@ static bool HasAppContextSwitch (string key)
 
 		protected override IEnumerable<string>? ExcludedTestNames {
 			get {
-				if (!Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap)
-					return null;
-
 				// Tests from the external Java.Interop-Tests assembly that fail under the
 				// trimmable typemap. These cannot use [Category] because we don't control
 				// that assembly — they must be excluded by name here.
@@ -98,8 +90,7 @@ protected override IEnumerable<string>? ExcludedTestNames {
 					// fixture uses that attribute to register native callbacks on a hand-written
 					// Java peer (an obsolete code path whose primary consumer, jnimarshalmethod-gen,
 					// was removed in dotnet/java-interop#1405). The trimmable typemap generator
-					// emits XA4251 when it encounters the attribute and instructs users to either
-					// avoid it or switch off the trimmable typemap.
+					// emits XA4251 when it encounters the attribute.
 					// See https://github.com/dotnet/android/issues/11170.
 					"Java.InteropTests.InvokeVirtualFromConstructorTests",
 				};

From 5f836bbd98eb18a46165ef3578fb4a2b354ff445 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 08:57:57 +0200
Subject: [PATCH 20/58] Remove obsolete Java JNI interop guide

The legacy LLVM IR typemap and marshal-method walkthrough no longer describes the trimmable runtime and has no incoming links.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../guides/internals/JavaJNI_Interop.md       | 771 ------------------
 1 file changed, 771 deletions(-)
 delete mode 100644 Documentation/guides/internals/JavaJNI_Interop.md

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
deleted file mode 100644
index 5226edc2b1d..00000000000
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ /dev/null
@@ -1,771 +0,0 @@
-> **Historical reference:** This guide describes the removed legacy LLVM IR/native
-> typemap and marshal-method registration pipeline. Current CoreCLR and NativeAOT
-> applications use the generated managed trimmable typemap and its Java callable
-> wrappers instead.
-
-<!--toc:start-->
-- [Introduction](#introduction)
-- [Java <-> Managed interoperability overview](#java-managed-interoperability-overview)
-  - [Java Callable Wrappers (JCW)](#java-callable-wrappers-jcw)
-- [Registration](#registration)
-  - [Dynamic registration](#dynamic-registration)
-    - [Dynamic Java Callable Wrappers registration code](#dynamic-java-callable-wrappers-registration-code)
-    - [Dynamic Registration call sequence](#dynamic-registration-call-sequence)
-  - [Marshal methods](#marshal-methods)
-    - [Marshal Methods Java Callable Wrappers registration code](#marshal-methods-java-callable-wrappers-registration-code)
-    - [Marshal methods C# source code](#marshal-methods-c-source-code)
-    - [JNI requirements](#jni-requirements)
-    - [LLVM IR code generation](#llvm-ir-code-generation)
-    - [Assembly rewriting](#assembly-rewriting)
-      - [Wrappers for methods with non-blittable types](#wrappers-for-methods-with-non-blittable-types)
-      - [UnmanagedCallersOnly attribute](#unmanagedcallersonly-attribute)
-    - [Marshal Methods Registration call sequence](#marshal-methods-registration-call-sequence)
-<!--toc:end-->
-
-# Introduction
-
-At the core of `.NET for Android` is its ability to interoperate with
-the Java/Kotlin APIs implemented in the Android system.  To make it
-work, it is necessary to "bridge" the two separate worlds of Java VM
-(`ART` in the Android OS) and the Managed VM (`MonoVM`).  Application
-developers expect to be able to call native Android APIs and receive
-calls (or react to events) from the Android side using code written in
-one of the .NET managed languages.  To make it work, `.NET for Android`
-employs a number of techniques, both at build and at run time, which
-are described in the sections below.
-
-This guide is meant to explain the technical implementation in a way
-that is sufficient to understand the system without having to read the
-actual source code.
-
-# Java <-> Managed interoperability overview
-
-Java VM and Managed VM are two entirely separate entities which
-co-exist in the same process/application.  Despite sharing the same
-process resources, they don't "naturally" communicate with each other.
-There is no direct way to call Java/Kotlin from .NET a'la the
-`p/invoke` mechanism which allows calling native code APIs.  Nor there
-exists a way for Java/Kotlin code to invoke managed methods.  To make
-it possible, `.NET for Android` takes advantage of the Java's [JNI](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html)
-(`Java Native Interface`), a mechanism that allows native code
-(.NET managed code being "native" in this context) to register
-implementations of Java methods, written outside the Java VM and in
-languages other than Java/Kotlin (for instance in `C`, `C++` or
-`Rust`).
-
-Such methods need to be appropriately declared in the Java code, for
-instance:
-
-```java
-class MainActivity
-  extends androidx.appcompat.app.AppCompatActivity
-{
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-
-  private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Each native method is declared using the `native` keyword, and
-whenever it is invoked from other Java code, the Java VM will use the
-JNI to invoke the target method.
-
-Native methods can be registered either dynamically (by calling the
-[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
-JNI function) or "statically", by providing a native shared library
-which exports a symbol with appropriate name which points to the
-native function implementing the Java method.
-
-Both ways of registration are described in detail in the following
-sections.
-
-## Java Callable Wrappers (JCW)
-
-`.NET for Android` wraps the entire Android API by generating
-appropriate C# code which mirrors the Java/Kotlin code (classes,
-interfaces, methods, properties etc).  Each generated class that
-corresponds to a Java/Kotlin type, is derived from the
-`Java.Lang.Object` class (implemented in the `Mono.Android` assembly),
-which marks it as a "Java interoperable type", meaning that it can
-implement or override virtual Java methods.  To make registration and
-invoking of such methods possible, it is necessary to generate a Java
-class which mirrors the Managed one and provides an entry point to
-the Java <-> Managed transition.  The Java classes are generated
-during application (as well as `.NET for Android`) build and we call
-them **Java Callable Wrappers** (or **JCW** for short).  For instance,
-the following managed class:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  public override Android.Views.View? OnCreateView (Android.Views.View? parent, string name, Android.Content.Context context, Android.Util.IAttributeSet attrs)
-  {
-    return base.OnCreateView (parent, name, context, attrs);
-  }
-
-  protected override void OnCreate (Bundle savedInstanceState)
-  {
-     base.OnCreate(savedInstanceState);
-     DoSomething (savedInstanceState);
-  }
-
-  void DoSomething (Bundle bundle)
-  {
-     // do something with the bundle
-  }
-}
-```
-
-overrides two Java virtual methods found in the `AppCompatActivity`
-type: `OnCreateView` and `OnCreate`.  The `DoSomething` method does
-not correspond to any method found in the base Java type, and thus it
-won't be included in the JCW.
-
-The Java Callable Wrapper generated for the above class would look as
-follows (a few generated methods not relevant to the discussion have
-been omitted for brevity):
-
-```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-  {
-    return n_onCreateView (p0, p1, p2, p3);
-  }
-  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-  private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Understanding the connection between Managed methods and their Java
-counterparts is required in order to understand the registration
-mechanisms described in sections found later in this document.  The
-[Dynamic registration](#dynamic-registration) section will expand on
-this example in order to explain the details of how the Managed type
-and its methods are registered with the Java VM.
-
-# Registration
-
-Both mechanisms of method registration rely on generation of [Java
-Callable Wrappers](#java-callable-wrappers-jcw), with [Dynamic
-registration](#dynamic-registration) requiring more code to be
-generated so that the registration can be performed at the runtime.
-
-JCW are generated only for types that derive from
-the `Java.Lang.Object` type.  Finding such types is the task of the
-Java.Interop's [`JavaTypeScanner`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs),
-which uses `Mono.Cecil` to read all the assemblies referenced by the
-application and its libraries.  The returned list of assemblies is
-then used by a variety of tasks, JCW being only one
-of them.
-
-After all types are found,
-[`JavaCallableWrapperGenerator`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
-is invoked in order to analyze each method in each type, looking for
-those which override a virtual Java method and, thus, need to be
-included in the wrapper class code. The generator optionally (if
-[marshal methods](#marshal-methods) are enabled) passes each method to
-an implementation of the
-[`Java.Interop.Tools.JavaCallableWrappers.JavaCallableMethodClassifier`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
-abstract class (which is
-[`MarshalMethodsClassifier`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs)
-in our case), to check whether the given method can be registered
-statically.
-
-`JavaCallableWrapperGenerator` looks for methods decorated with the
-`[Register]` attribute, which most frequently is created by invoking
-its constructor with three parameters:
-
-  1. Java method name
-  2. JNI method signature
-  3. "Connector" method name
-
-The "connector" is a static method which creates a delegate that
-subsequently allows calling of the native callback method:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Connector backing field
-  static Delegate? cb_onCreate_Landroid_os_Bundle_;
-
-  // Connector method
-  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
-  {
-    if (cb_onCreate_Landroid_os_Bundle_ == null)
-      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
-    return cb_onCreate_Landroid_os_Bundle_;
-  }
-
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-The above code is actually generated in the `Android.App.Activity`
-class while .NET for Android is built, from which our example
-`MainActivity` eventually derives.
-
-What happens with the above code depends on the registration mechanism
-and is described in the sections below.
-
-## Dynamic registration
-
-This registration mechanism has been used by `.NET for Android` since
-the beginning and it will remain in use for the foreseeable future
-when the application is built in the `Debug` configuration or when
-[Marshal Methods](#marshal-methods) are turned off.
-
-### Dynamic Java Callable Wrappers registration code
-
-Building on the C# example shown in the [Java Callable
-Wrappers](#java-callable-wrappers-jcw) section, the following Java
-code is generated (only the parts relevant to registration are shown):
-
-```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-/** @hide */
-        public static final String __md_methods;
-        static {
-                __md_methods = 
-                        "n_onCreateView:(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;:GetOnCreateView_Landroid_view_View_Ljava_lang_String_Landroid_content_Context_Landroid_util_AttributeSet_Handler\n" +
-                        "n_onCreate:(Landroid/os/Bundle;)V:GetOnCreate_Landroid_os_Bundle_Handler\n" +
-                        "";
-                mono.android.Runtime.register ("HelloAndroid.MainActivity, HelloAndroid", MainActivity.class, __md_methods);
-        }
-
-        public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-        {
-                return n_onCreateView (p0, p1, p2, p3);
-        }
-
-        private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-        public void onCreate (android.os.Bundle p0)
-        {
-                n_onCreate (p0);
-        }
-
-        private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Code fragment which takes part in registration is the class's static
-constructor.  For each method registered for the type (that is,
-implemented or overridden in the managed code), the JCW generator
-outputs a single string which contains full information about the type
-and method to register.  Each such registration string is terminated
-with the newline character and the entire sequence ends with an empty
-string.  Together, all the lines are concatenated and placed in the
-`__md_methods` static variable.  The `mono.android.Runtime.register`
-method (see below for more details) is then invoked to register all
-the methods.
-
-### Dynamic Registration call sequence
-
-All the "native" methods declared in the generated Java type are
-registered when the type is constructed or accessed for the first
-time.  This is when the Java VM invokes the type's static constructor,
-kicking off a sequence of calls that eventually ends with all the type
-methods registered with JNI:
-
-  1. `mono.android.Runtime.register` is itself a native method,
-     declared in the
-     [`Runtime`](../../src/java-runtime/java/mono/android/Runtime.java)
-     class of .NET for Android's Java runtime code, and implemented in
-     the native .NET for Android
-     [runtime](../../src/monodroid/jni/monodroid-glue.cc) (the
-     `MonodroidRuntime::Java_mono_android_Runtime_register` method).
-	 Purpose of this method is to prepare a call into the
-     .NET for Android managed runtime code, the
-     [`Android.Runtime.JNIEnv::RegisterJniNatives`](../../src/Mono.Android/Android.Runtime/JNIEnv.cs)
-     method.
-  2. `Android.Runtime.JNIEnv::RegisterJniNatives` is passed name of
-     the managed type for which to register Java methods and uses .NET
-     reflection to load that type, followed by a call to cache the
-     type (via `RegisterType` method in the
-     [`TypeManager`](../../src/Mono.Android/Java.Interop/TypeManager.cs)
-     class) to end with a call to the
-     `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
-     method.
-  3. `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
-     eventually calls the
-     `Java.Interop.JniEnvironment.Types::RegisterNatives` method which
-	 first generates a delegate to the native callback method, using
-     `System.Reflection.Emit` (via the
-     [`Android.Runtime.JNINativeWrapper::CreateDelegate`](../../src/Mono.Android/Android.Runtime/JNINativeWrapper.cs)
-     method) and, eventually, invokes Java JNI's `RegisterNatives`
-     function, finally registering the native methods for a managed
-     type.
-  
-The `System.Reflection.Emit` sequence mentioned in 3. above is among
-the most costly operations, repeated for each registered method.
-
-Some more information about Java type registration can be found
-[here](https://github.com/dotnet/android/wiki/Blueprint#java-type-registration).
-
-## Marshal methods
-
-The goal of marshal methods is to completely bypass the [dynamic
-registration sequence](#dynamic-registration-call-sequence), replacing
-it with native code generated and compiled during application build,
-thus saving on the startup time of the application.
-
-Marshal methods registration mechanism takes advantage of the JNI
-ability to look up implementations of `native` Java methods in actual
-native (shared) libraries.  Such symbols must have names that follow a
-set of rules, so that JNI is able to properly locate them (details are
-explained in the [JNI Requirements](#jni-requirements) section below).
-
-To achieve that, the marshal methods mechanism uses a number of
-classes which [generate native](#llvm-ir-code-generation) code and 
-[modify assemblies](#assembly-rewriting) that contain the registered
-methods.
-
-Current implementation of the marshal methods classifier recognizes
-the "standard" method registration pattern, using the example of the
-`OnCreate` method shown in [Registration](#registration) above.
-
-The standard pattern consists of:
-
-  * the "connector" method, `GetOnCreate_Landroid_os_Bundle_Handler`
-    above
-  * the delegate backing field, `cb_onCreate_Landroid_os_Bundle_`
-    above
-  * the native callback method, `n_OnCreate_Landroid_os_Bundle_` above
-  * and the virtual target method which dispatches the call to the
-    actual object, `OnCreate` above.
-
-Whenever the classifier's `ShouldBeDynamicallyRegistered` method is
-called, it is passed not only the method's declaring type, but also
-the `Register` attribute instance which it then uses to check whether
-the method being registered conforms to the "standard" registration
-pattern shown above.  The connector, native callback methods as well
-as the backing field must be private and static in order for the
-registered method to be considered as a candidate for static
-registration.
-
-Registered methods which don't follow the "standard" pattern will be
-registered dynamically.
-
-### Marshal Methods Java Callable Wrappers registration code
-
-Building on the C# example show in the [Java Callable
-Wrappers](#java-callable-wrappers-jcw) section, the following Java
-code is generated (only the parts relevant to registration are shown):
-
-```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-  {
-    return n_onCreateView (p0, p1, p2, p3);
-  }
-
-  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-
-  private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Note that, compared to the code generated for the [dynamic
-registration](#dynamic-java-callable-wrappers-registration-code)
-mechanism, there is no static constructor while the rest 
-of the code remains exactly the same.
-
-### Marshal methods C# source code
-
-The marshal methods sections below will all refer to this code
-fragment:
-
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Connector backing field
-  static Delegate? cb_onCreate_Landroid_os_Bundle_;
-
-  // Connector method
-  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
-  {
-    if (cb_onCreate_Landroid_os_Bundle_ == null)
-      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
-    return cb_onCreate_Landroid_os_Bundle_;
-  }
-
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-### JNI requirements
-
-JNI
-[specifies](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names)
-a number of rules which govern how the native symbol name is
-constructed, so that a mapping of object-oriented Java code (with its
-package names/namespaces, class names and overloadable methods) into the essentially
-"flat" procedural "namespace" of the lowest common denominator C code.
-
-The precise rules are outlined in the URL above, and their short
-version is as follows:
-
-  * Each symbol starts with the `Java_` prefix
-  * Next follows the mangled (see below) **fully qualified class
-    name**
-  * Next the `_` character serves as a separator before
-  * A mangled **method** name, which is optionally followed by
-  * Double underscore `__` and the mangled method argument signature
-
-"Mangling" is a way of encoding certain characters that are not
-directly representable both in the source code and in the native
-symbol name.  The JNI specification allows for direct use of ASCII
-letters (capital and lowercase) and digits, while all the other
-characters are either represented by placeholders or encoded as 16-bit
-hexadecimal Unicode character code (table copied from the JNI
-specification for easier reference):
-
-| Escape sequence | Denotes                                  |
-|-----------------|------------------------------------------|
-| _0XXXX          | a Unicode character XXXX, all lower case |
-| _1              | The `_` character                        |
-| _2              | The `;` character in signatures          |
-| _3              | The `[` character in signatures          |
-| _               | The `.` or `/` characters                |
-
-Generation of JNI symbol names is performed by the
-[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
-class while generating the native function source code.
-
-JNI supports two forms of the native symbol name, as signalled in the
-bullet list above - a short and a long one.  The former is looked up
-first by the Java VM, followed by the latter.  The latter needs to be
-used only for overloaded methods, which is what our generator does.
-
-### LLVM IR code generation
-
-[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
-uses the LLVM IR generator infrastructure to output both data and
-executable code for all the marshal methods wrappers.  It is not
-necessary to understand the generated code unless one needs to modify
-it, so this document only shows the equivalent C++ code which can
-serve as a guide to understanding how the marshal method runtime
-invocation works:
-
-```C++
-using get_function_pointer_fn = void(*)(uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr);
-
-static get_function_pointer_fn get_function_pointer;
-
-void xamarin_app_init (get_function_pointer_fn fn) noexcept
-{
-  get_function_pointer = fn;
-}
-
-using android_app_activity_on_create_bundle_fn = void (*) (JNIEnv *env, jclass klass, jobject savedInstanceState);
-static android_app_activity_on_create_bundle_fn android_app_activity_on_create_bundle = nullptr;
-
-extern "C" JNIEXPORT void
-JNICALL Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2 (JNIEnv *env, jclass klass, jobject savedInstanceState) noexcept
-{
-  if (android_app_activity_on_create_bundle == nullptr) {
-    get_function_pointer (
-      16, // mono image index
-      0,  // class index
-      0x0600055B, // method token
-      reinterpret_cast<void*&>(android_app_activity_on_create_bundle) // target pointer
-    );
-  }
-
-  android_app_activity_on_create_bundle (env, klass, savedInstanceState);
-}
-```
-
-The `xamarin_app_init` function is output only once and is called by
-the `.NET for Android` runtime twice during application startup - once
-to pass `get_function_pointer_fn` which does **not** use any locks (as
-we know that until a certain point during startup we are in a single
-lock, so no data access races can happen) and the other time just
-before handing control over to the MonoVM, to pass pointer to
-`get_function_pointer_fn` which **does** employ locking (since during
-runtime it may very well happen that our generated Java native
-functions will be called from different threads simultaneously).
-
-The `Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2`
-function is a template which is repeated for each Java native
-function, with each function having its own set of arguments and its
-own callback backing field (`android_app_activity_on_create_bundle`
-here).
-
-The `get_function_pointer` function takes as parameters indexes into a
-couple of tables, one for `MonoImage*` pointers and the other for
-`MonoClass*` pointers - both of which are generated by the
-`MarshalMethodsNativeAssemblyGenerator` class at application build
-time and allow for very fast lookup during run time.  Target methods
-are retrieved by their token value, within the specified `MonoImage*`
-(essentially a pointer to managed assembly image in memory) and class.
-
-The method identified in such manner, **must** be decorated in the
-managed code with the
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute (see [below](#unmanagedcallersonly-attribute) for more
-details) so that it can be invoked directly, as if it was a native
-method itself, with minimal managed marshaling overhead.
-
-### Assembly rewriting
-
-Please refer to the [C# code fragment](#marshal-methods-c-source-code)
-above in order to understand this section.
-
-Managed assemblies (including `Mono.Android.dll`) which contain Java
-types need to be usable in two contexts: with the "traditional"
-dynamic registration and with marshal methods.  Both of these
-mechanisms, however, have different requirements.  We cannot assume
-that any assembly (either from .NET for Android or a third party nuget)
-will have "marshal methods friendly" code and thus we need to make
-sure that the code meets our requirements.
-
-We do it by reading each relevant assembly and modifying it by
-altering the definition of the native callbacks and removing the
-code that's no longer used by marshal methods.  This task is performed
-by the
-[`MarshalMethodsAssemblyRewriter`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs)
-invoked during application build after all the assemblies are linked
-but **before** type maps are generated (as rewriting **will** alter
-the method and potentially type tokens)
-
-The exact modifications we apply are:
-
-  * Removal of the **connector backing field**
-  * Removal of the **connector method**
-  * Generation of a **native callback wrapper** method, which catches
-    and propagates unhandled exceptions thrown by the native callback
-    or the target method.  This method is decorated with the
-    `[UnmanagedCallersOnly]` attribute and called directly from the
-    native code.
-  * Optionally, generate code in the **native callback wrapper** to handle
-    [non-blittable types](#wrappers-for-methods-with-non-blittable-types).
-
-All the modifications are performed with `Mono.Cecil`.
-
-After modifications, the assembly contains equivalent of the following
-C# code for each marshal method:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Native callback exception wrapper
-  [UnmanagedCallersOnly]
-  static void n_OnCreate_Landroid_os_Bundle__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    try {
-      n_OnCreate_Landroid_os_Bundle_ (jnienv, native__this, native_savedInstanceState)
-    } catch (Exception ex) {
-      Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
-    }
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-#### Wrappers for methods with non-blittable types
-
-The
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute requires that all the argument types as well as the method
-return type are
-[blittable](https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types).
-
-Among these types is one that's commonly used by the managed classes
-implementing Java methods: `bool`.  Currently this is the **only**
-non-blittable type we've encountered in bindings, so at this point it
-is the only one supported by the assembly rewriter.
-
-Whenever we encounter a method with a non-blittable type, we must
-generate a wrapper for it, so that we can decorate it with the
-`[UnmanagedCallersOnly]` attribute.  This is easier and less error
-prone than modifying the native callback method's IL stream to
-implement the necessary conversion.
-
-An example of such method is
-`Android.Views.View.IOnTouchListener::OnTouch`:
-
-```csharp
-static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
-  bool __ret = __this.OnTouch (v, e);
-  return __ret;
-}
-```
-
-As it returns a `bool` value, it needs a wrapper to cast the return
-value properly. Each wrapper method retains the native callback method
-name, but appends the `_mm_wrapper` suffix to it:
-
-```csharp
-static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
-  bool __ret = __this.OnTouch (v, e);
-  return __ret;
-}
-
-[UnmanagedCallersOnly]
-static byte n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  try {
-    return n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_(jnienv, native__this, native_v, native_e) ? 1 : 0;
-  } catch (Exception ex) {
-    Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
-    return default;
-  }
-}
-```
-
-The wrapper's return statement uses the ternary operator to "cast" the
-boolean value to `1` (for `true`) or `0` (for `false`) because the
-value of `bool` across the managed runtime can take a range of values:
-
-  * `0` for `false`
-  * `-1` or `1` for `true`
-  * `!= 0` for true
-
-Since the `bool` type in C# can be 1, 2 or 4 bytes long, we need to
-cast it to some type of a known and static size.  The managed type
-`byte` was chosen as it corresponds to the Java/JNI `jboolean` type,
-defined as an unsigned 8-bit type.
-
-Whenever an **argument** value needs to be converted between `byte` and
-`bool`, we generate code that is equivalent of the `argument != 0`
-comparison, for instance for the
-`Android.Views.View.IOnFocusChangeListener::OnFocusChange` method:
-
-```csharp
-[UnmanagedCallersOnly]
-static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, byte hasFocus)
-{
-  n_OnFocusChange_Landroid_view_View_Z (jnienv, native__this, native_v, hasFocus != 0);
-}
-
-static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, bool hasFocus)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnFocusChangeListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  __this.OnFocusChange (v, hasFocus);
-}
-```
-
-#### UnmanagedCallersOnly attribute
-
-Each marshal methods native callback method is decorated with the
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute, in order for us to be able to invoke the callback directly
-from native code with minimal overhead compared to traditional
-managed-from-native method calls (`mono_runtime_invoke`)
-
-### Marshal Methods Registration call sequence
-
-The sequence described in the [dynamic
-registration sequence](#dynamic-registration-call-sequence) section
-above is completely removed for the marshal methods.  What remains
-common for both dynamic and marshal methods registration, is the
-resolution of the native function target done by the Java VM runtime.
-In both cases the method declared in a Java class as `native` is
-looked up by the Java VM when first JIT-ing the code.  The difference
-lies in the way this lookup is performed.
-
-Dynamic registration uses the
-[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
-JNI function at the runtime, which stores a pointer to the registered
-method inside the structure which describes a Java class in the Java
-VM.
-
-Marshal methods, however, don't register anything with the JNI,
-instead they rely on the symbol lookup mechanism of the Java VM.
-Whenever a call to `native` Java method is JIT-ed and it is not
-registered previously using the `RegisterNatives` JNI function, Java
-VM will proceed to look for symbols in the process runtime image (e.g.
-using `dlopen` + `dlsym` calls on Unix) and, having found a matching
-symbol, use pointer to it as the target of the `native` Java method
-call.

From d11bf2cebb4f98186a182111025bd3af97b35691 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:12:11 +0200
Subject: [PATCH 21/58] Restore Java JNI interop guide for replacement PR

Preserve the original guide bytes here so the dependent documentation PR can present its trimmable-runtime rewrite as a side-by-side diff.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../guides/internals/JavaJNI_Interop.md       | 771 ++++++++++++++++++
 1 file changed, 771 insertions(+)
 create mode 100644 Documentation/guides/internals/JavaJNI_Interop.md

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
new file mode 100644
index 00000000000..5226edc2b1d
--- /dev/null
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -0,0 +1,771 @@
+> **Historical reference:** This guide describes the removed legacy LLVM IR/native
+> typemap and marshal-method registration pipeline. Current CoreCLR and NativeAOT
+> applications use the generated managed trimmable typemap and its Java callable
+> wrappers instead.
+
+<!--toc:start-->
+- [Introduction](#introduction)
+- [Java <-> Managed interoperability overview](#java-managed-interoperability-overview)
+  - [Java Callable Wrappers (JCW)](#java-callable-wrappers-jcw)
+- [Registration](#registration)
+  - [Dynamic registration](#dynamic-registration)
+    - [Dynamic Java Callable Wrappers registration code](#dynamic-java-callable-wrappers-registration-code)
+    - [Dynamic Registration call sequence](#dynamic-registration-call-sequence)
+  - [Marshal methods](#marshal-methods)
+    - [Marshal Methods Java Callable Wrappers registration code](#marshal-methods-java-callable-wrappers-registration-code)
+    - [Marshal methods C# source code](#marshal-methods-c-source-code)
+    - [JNI requirements](#jni-requirements)
+    - [LLVM IR code generation](#llvm-ir-code-generation)
+    - [Assembly rewriting](#assembly-rewriting)
+      - [Wrappers for methods with non-blittable types](#wrappers-for-methods-with-non-blittable-types)
+      - [UnmanagedCallersOnly attribute](#unmanagedcallersonly-attribute)
+    - [Marshal Methods Registration call sequence](#marshal-methods-registration-call-sequence)
+<!--toc:end-->
+
+# Introduction
+
+At the core of `.NET for Android` is its ability to interoperate with
+the Java/Kotlin APIs implemented in the Android system.  To make it
+work, it is necessary to "bridge" the two separate worlds of Java VM
+(`ART` in the Android OS) and the Managed VM (`MonoVM`).  Application
+developers expect to be able to call native Android APIs and receive
+calls (or react to events) from the Android side using code written in
+one of the .NET managed languages.  To make it work, `.NET for Android`
+employs a number of techniques, both at build and at run time, which
+are described in the sections below.
+
+This guide is meant to explain the technical implementation in a way
+that is sufficient to understand the system without having to read the
+actual source code.
+
+# Java <-> Managed interoperability overview
+
+Java VM and Managed VM are two entirely separate entities which
+co-exist in the same process/application.  Despite sharing the same
+process resources, they don't "naturally" communicate with each other.
+There is no direct way to call Java/Kotlin from .NET a'la the
+`p/invoke` mechanism which allows calling native code APIs.  Nor there
+exists a way for Java/Kotlin code to invoke managed methods.  To make
+it possible, `.NET for Android` takes advantage of the Java's [JNI](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html)
+(`Java Native Interface`), a mechanism that allows native code
+(.NET managed code being "native" in this context) to register
+implementations of Java methods, written outside the Java VM and in
+languages other than Java/Kotlin (for instance in `C`, `C++` or
+`Rust`).
+
+Such methods need to be appropriately declared in the Java code, for
+instance:
+
+```java
+class MainActivity
+  extends androidx.appcompat.app.AppCompatActivity
+{
+  public void onCreate (android.os.Bundle p0)
+  {
+    n_onCreate (p0);
+  }
+
+  private native void n_onCreate (android.os.Bundle p0);
+}
+```
+
+Each native method is declared using the `native` keyword, and
+whenever it is invoked from other Java code, the Java VM will use the
+JNI to invoke the target method.
+
+Native methods can be registered either dynamically (by calling the
+[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
+JNI function) or "statically", by providing a native shared library
+which exports a symbol with appropriate name which points to the
+native function implementing the Java method.
+
+Both ways of registration are described in detail in the following
+sections.
+
+## Java Callable Wrappers (JCW)
+
+`.NET for Android` wraps the entire Android API by generating
+appropriate C# code which mirrors the Java/Kotlin code (classes,
+interfaces, methods, properties etc).  Each generated class that
+corresponds to a Java/Kotlin type, is derived from the
+`Java.Lang.Object` class (implemented in the `Mono.Android` assembly),
+which marks it as a "Java interoperable type", meaning that it can
+implement or override virtual Java methods.  To make registration and
+invoking of such methods possible, it is necessary to generate a Java
+class which mirrors the Managed one and provides an entry point to
+the Java <-> Managed transition.  The Java classes are generated
+during application (as well as `.NET for Android`) build and we call
+them **Java Callable Wrappers** (or **JCW** for short).  For instance,
+the following managed class:
+
+```csharp
+public class MainActivity : AppCompatActivity
+{
+  public override Android.Views.View? OnCreateView (Android.Views.View? parent, string name, Android.Content.Context context, Android.Util.IAttributeSet attrs)
+  {
+    return base.OnCreateView (parent, name, context, attrs);
+  }
+
+  protected override void OnCreate (Bundle savedInstanceState)
+  {
+     base.OnCreate(savedInstanceState);
+     DoSomething (savedInstanceState);
+  }
+
+  void DoSomething (Bundle bundle)
+  {
+     // do something with the bundle
+  }
+}
+```
+
+overrides two Java virtual methods found in the `AppCompatActivity`
+type: `OnCreateView` and `OnCreate`.  The `DoSomething` method does
+not correspond to any method found in the base Java type, and thus it
+won't be included in the JCW.
+
+The Java Callable Wrapper generated for the above class would look as
+follows (a few generated methods not relevant to the discussion have
+been omitted for brevity):
+
+```java
+public class MainActivity
+        extends androidx.appcompat.app.AppCompatActivity
+{
+  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
+  {
+    return n_onCreateView (p0, p1, p2, p3);
+  }
+  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
+
+  public void onCreate (android.os.Bundle p0)
+  {
+    n_onCreate (p0);
+  }
+  private native void n_onCreate (android.os.Bundle p0);
+}
+```
+
+Understanding the connection between Managed methods and their Java
+counterparts is required in order to understand the registration
+mechanisms described in sections found later in this document.  The
+[Dynamic registration](#dynamic-registration) section will expand on
+this example in order to explain the details of how the Managed type
+and its methods are registered with the Java VM.
+
+# Registration
+
+Both mechanisms of method registration rely on generation of [Java
+Callable Wrappers](#java-callable-wrappers-jcw), with [Dynamic
+registration](#dynamic-registration) requiring more code to be
+generated so that the registration can be performed at the runtime.
+
+JCW are generated only for types that derive from
+the `Java.Lang.Object` type.  Finding such types is the task of the
+Java.Interop's [`JavaTypeScanner`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs),
+which uses `Mono.Cecil` to read all the assemblies referenced by the
+application and its libraries.  The returned list of assemblies is
+then used by a variety of tasks, JCW being only one
+of them.
+
+After all types are found,
+[`JavaCallableWrapperGenerator`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
+is invoked in order to analyze each method in each type, looking for
+those which override a virtual Java method and, thus, need to be
+included in the wrapper class code. The generator optionally (if
+[marshal methods](#marshal-methods) are enabled) passes each method to
+an implementation of the
+[`Java.Interop.Tools.JavaCallableWrappers.JavaCallableMethodClassifier`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
+abstract class (which is
+[`MarshalMethodsClassifier`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs)
+in our case), to check whether the given method can be registered
+statically.
+
+`JavaCallableWrapperGenerator` looks for methods decorated with the
+`[Register]` attribute, which most frequently is created by invoking
+its constructor with three parameters:
+
+  1. Java method name
+  2. JNI method signature
+  3. "Connector" method name
+
+The "connector" is a static method which creates a delegate that
+subsequently allows calling of the native callback method:
+
+```csharp
+public class MainActivity : AppCompatActivity
+{
+  // Connector backing field
+  static Delegate? cb_onCreate_Landroid_os_Bundle_;
+
+  // Connector method
+  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
+  {
+    if (cb_onCreate_Landroid_os_Bundle_ == null)
+      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
+    return cb_onCreate_Landroid_os_Bundle_;
+  }
+
+  // Native callback
+  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
+  {
+    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
+    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
+    __this.OnCreate (savedInstanceState);
+  }
+
+  // Target method
+  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
+  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
+  {
+    const string __id = "onCreate.(Landroid/os/Bundle;)V";
+    try {
+      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
+      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
+      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
+    } finally {
+      global::System.GC.KeepAlive (savedInstanceState);
+    }
+  }
+}
+```
+
+The above code is actually generated in the `Android.App.Activity`
+class while .NET for Android is built, from which our example
+`MainActivity` eventually derives.
+
+What happens with the above code depends on the registration mechanism
+and is described in the sections below.
+
+## Dynamic registration
+
+This registration mechanism has been used by `.NET for Android` since
+the beginning and it will remain in use for the foreseeable future
+when the application is built in the `Debug` configuration or when
+[Marshal Methods](#marshal-methods) are turned off.
+
+### Dynamic Java Callable Wrappers registration code
+
+Building on the C# example shown in the [Java Callable
+Wrappers](#java-callable-wrappers-jcw) section, the following Java
+code is generated (only the parts relevant to registration are shown):
+
+```java
+public class MainActivity
+        extends androidx.appcompat.app.AppCompatActivity
+{
+/** @hide */
+        public static final String __md_methods;
+        static {
+                __md_methods = 
+                        "n_onCreateView:(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;:GetOnCreateView_Landroid_view_View_Ljava_lang_String_Landroid_content_Context_Landroid_util_AttributeSet_Handler\n" +
+                        "n_onCreate:(Landroid/os/Bundle;)V:GetOnCreate_Landroid_os_Bundle_Handler\n" +
+                        "";
+                mono.android.Runtime.register ("HelloAndroid.MainActivity, HelloAndroid", MainActivity.class, __md_methods);
+        }
+
+        public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
+        {
+                return n_onCreateView (p0, p1, p2, p3);
+        }
+
+        private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
+
+        public void onCreate (android.os.Bundle p0)
+        {
+                n_onCreate (p0);
+        }
+
+        private native void n_onCreate (android.os.Bundle p0);
+}
+```
+
+Code fragment which takes part in registration is the class's static
+constructor.  For each method registered for the type (that is,
+implemented or overridden in the managed code), the JCW generator
+outputs a single string which contains full information about the type
+and method to register.  Each such registration string is terminated
+with the newline character and the entire sequence ends with an empty
+string.  Together, all the lines are concatenated and placed in the
+`__md_methods` static variable.  The `mono.android.Runtime.register`
+method (see below for more details) is then invoked to register all
+the methods.
+
+### Dynamic Registration call sequence
+
+All the "native" methods declared in the generated Java type are
+registered when the type is constructed or accessed for the first
+time.  This is when the Java VM invokes the type's static constructor,
+kicking off a sequence of calls that eventually ends with all the type
+methods registered with JNI:
+
+  1. `mono.android.Runtime.register` is itself a native method,
+     declared in the
+     [`Runtime`](../../src/java-runtime/java/mono/android/Runtime.java)
+     class of .NET for Android's Java runtime code, and implemented in
+     the native .NET for Android
+     [runtime](../../src/monodroid/jni/monodroid-glue.cc) (the
+     `MonodroidRuntime::Java_mono_android_Runtime_register` method).
+	 Purpose of this method is to prepare a call into the
+     .NET for Android managed runtime code, the
+     [`Android.Runtime.JNIEnv::RegisterJniNatives`](../../src/Mono.Android/Android.Runtime/JNIEnv.cs)
+     method.
+  2. `Android.Runtime.JNIEnv::RegisterJniNatives` is passed name of
+     the managed type for which to register Java methods and uses .NET
+     reflection to load that type, followed by a call to cache the
+     type (via `RegisterType` method in the
+     [`TypeManager`](../../src/Mono.Android/Java.Interop/TypeManager.cs)
+     class) to end with a call to the
+     `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
+     method.
+  3. `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
+     eventually calls the
+     `Java.Interop.JniEnvironment.Types::RegisterNatives` method which
+	 first generates a delegate to the native callback method, using
+     `System.Reflection.Emit` (via the
+     [`Android.Runtime.JNINativeWrapper::CreateDelegate`](../../src/Mono.Android/Android.Runtime/JNINativeWrapper.cs)
+     method) and, eventually, invokes Java JNI's `RegisterNatives`
+     function, finally registering the native methods for a managed
+     type.
+  
+The `System.Reflection.Emit` sequence mentioned in 3. above is among
+the most costly operations, repeated for each registered method.
+
+Some more information about Java type registration can be found
+[here](https://github.com/dotnet/android/wiki/Blueprint#java-type-registration).
+
+## Marshal methods
+
+The goal of marshal methods is to completely bypass the [dynamic
+registration sequence](#dynamic-registration-call-sequence), replacing
+it with native code generated and compiled during application build,
+thus saving on the startup time of the application.
+
+Marshal methods registration mechanism takes advantage of the JNI
+ability to look up implementations of `native` Java methods in actual
+native (shared) libraries.  Such symbols must have names that follow a
+set of rules, so that JNI is able to properly locate them (details are
+explained in the [JNI Requirements](#jni-requirements) section below).
+
+To achieve that, the marshal methods mechanism uses a number of
+classes which [generate native](#llvm-ir-code-generation) code and 
+[modify assemblies](#assembly-rewriting) that contain the registered
+methods.
+
+Current implementation of the marshal methods classifier recognizes
+the "standard" method registration pattern, using the example of the
+`OnCreate` method shown in [Registration](#registration) above.
+
+The standard pattern consists of:
+
+  * the "connector" method, `GetOnCreate_Landroid_os_Bundle_Handler`
+    above
+  * the delegate backing field, `cb_onCreate_Landroid_os_Bundle_`
+    above
+  * the native callback method, `n_OnCreate_Landroid_os_Bundle_` above
+  * and the virtual target method which dispatches the call to the
+    actual object, `OnCreate` above.
+
+Whenever the classifier's `ShouldBeDynamicallyRegistered` method is
+called, it is passed not only the method's declaring type, but also
+the `Register` attribute instance which it then uses to check whether
+the method being registered conforms to the "standard" registration
+pattern shown above.  The connector, native callback methods as well
+as the backing field must be private and static in order for the
+registered method to be considered as a candidate for static
+registration.
+
+Registered methods which don't follow the "standard" pattern will be
+registered dynamically.
+
+### Marshal Methods Java Callable Wrappers registration code
+
+Building on the C# example show in the [Java Callable
+Wrappers](#java-callable-wrappers-jcw) section, the following Java
+code is generated (only the parts relevant to registration are shown):
+
+```java
+public class MainActivity
+        extends androidx.appcompat.app.AppCompatActivity
+{
+  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
+  {
+    return n_onCreateView (p0, p1, p2, p3);
+  }
+
+  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
+
+  public void onCreate (android.os.Bundle p0)
+  {
+    n_onCreate (p0);
+  }
+
+  private native void n_onCreate (android.os.Bundle p0);
+}
+```
+
+Note that, compared to the code generated for the [dynamic
+registration](#dynamic-java-callable-wrappers-registration-code)
+mechanism, there is no static constructor while the rest 
+of the code remains exactly the same.
+
+### Marshal methods C# source code
+
+The marshal methods sections below will all refer to this code
+fragment:
+
+
+```csharp
+public class MainActivity : AppCompatActivity
+{
+  // Connector backing field
+  static Delegate? cb_onCreate_Landroid_os_Bundle_;
+
+  // Connector method
+  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
+  {
+    if (cb_onCreate_Landroid_os_Bundle_ == null)
+      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
+    return cb_onCreate_Landroid_os_Bundle_;
+  }
+
+  // Native callback
+  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
+  {
+    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
+    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
+    __this.OnCreate (savedInstanceState);
+  }
+
+  // Target method
+  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
+  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
+  {
+    const string __id = "onCreate.(Landroid/os/Bundle;)V";
+    try {
+      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
+      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
+      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
+    } finally {
+      global::System.GC.KeepAlive (savedInstanceState);
+    }
+  }
+}
+```
+
+### JNI requirements
+
+JNI
+[specifies](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names)
+a number of rules which govern how the native symbol name is
+constructed, so that a mapping of object-oriented Java code (with its
+package names/namespaces, class names and overloadable methods) into the essentially
+"flat" procedural "namespace" of the lowest common denominator C code.
+
+The precise rules are outlined in the URL above, and their short
+version is as follows:
+
+  * Each symbol starts with the `Java_` prefix
+  * Next follows the mangled (see below) **fully qualified class
+    name**
+  * Next the `_` character serves as a separator before
+  * A mangled **method** name, which is optionally followed by
+  * Double underscore `__` and the mangled method argument signature
+
+"Mangling" is a way of encoding certain characters that are not
+directly representable both in the source code and in the native
+symbol name.  The JNI specification allows for direct use of ASCII
+letters (capital and lowercase) and digits, while all the other
+characters are either represented by placeholders or encoded as 16-bit
+hexadecimal Unicode character code (table copied from the JNI
+specification for easier reference):
+
+| Escape sequence | Denotes                                  |
+|-----------------|------------------------------------------|
+| _0XXXX          | a Unicode character XXXX, all lower case |
+| _1              | The `_` character                        |
+| _2              | The `;` character in signatures          |
+| _3              | The `[` character in signatures          |
+| _               | The `.` or `/` characters                |
+
+Generation of JNI symbol names is performed by the
+[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
+class while generating the native function source code.
+
+JNI supports two forms of the native symbol name, as signalled in the
+bullet list above - a short and a long one.  The former is looked up
+first by the Java VM, followed by the latter.  The latter needs to be
+used only for overloaded methods, which is what our generator does.
+
+### LLVM IR code generation
+
+[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
+uses the LLVM IR generator infrastructure to output both data and
+executable code for all the marshal methods wrappers.  It is not
+necessary to understand the generated code unless one needs to modify
+it, so this document only shows the equivalent C++ code which can
+serve as a guide to understanding how the marshal method runtime
+invocation works:
+
+```C++
+using get_function_pointer_fn = void(*)(uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr);
+
+static get_function_pointer_fn get_function_pointer;
+
+void xamarin_app_init (get_function_pointer_fn fn) noexcept
+{
+  get_function_pointer = fn;
+}
+
+using android_app_activity_on_create_bundle_fn = void (*) (JNIEnv *env, jclass klass, jobject savedInstanceState);
+static android_app_activity_on_create_bundle_fn android_app_activity_on_create_bundle = nullptr;
+
+extern "C" JNIEXPORT void
+JNICALL Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2 (JNIEnv *env, jclass klass, jobject savedInstanceState) noexcept
+{
+  if (android_app_activity_on_create_bundle == nullptr) {
+    get_function_pointer (
+      16, // mono image index
+      0,  // class index
+      0x0600055B, // method token
+      reinterpret_cast<void*&>(android_app_activity_on_create_bundle) // target pointer
+    );
+  }
+
+  android_app_activity_on_create_bundle (env, klass, savedInstanceState);
+}
+```
+
+The `xamarin_app_init` function is output only once and is called by
+the `.NET for Android` runtime twice during application startup - once
+to pass `get_function_pointer_fn` which does **not** use any locks (as
+we know that until a certain point during startup we are in a single
+lock, so no data access races can happen) and the other time just
+before handing control over to the MonoVM, to pass pointer to
+`get_function_pointer_fn` which **does** employ locking (since during
+runtime it may very well happen that our generated Java native
+functions will be called from different threads simultaneously).
+
+The `Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2`
+function is a template which is repeated for each Java native
+function, with each function having its own set of arguments and its
+own callback backing field (`android_app_activity_on_create_bundle`
+here).
+
+The `get_function_pointer` function takes as parameters indexes into a
+couple of tables, one for `MonoImage*` pointers and the other for
+`MonoClass*` pointers - both of which are generated by the
+`MarshalMethodsNativeAssemblyGenerator` class at application build
+time and allow for very fast lookup during run time.  Target methods
+are retrieved by their token value, within the specified `MonoImage*`
+(essentially a pointer to managed assembly image in memory) and class.
+
+The method identified in such manner, **must** be decorated in the
+managed code with the
+[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
+attribute (see [below](#unmanagedcallersonly-attribute) for more
+details) so that it can be invoked directly, as if it was a native
+method itself, with minimal managed marshaling overhead.
+
+### Assembly rewriting
+
+Please refer to the [C# code fragment](#marshal-methods-c-source-code)
+above in order to understand this section.
+
+Managed assemblies (including `Mono.Android.dll`) which contain Java
+types need to be usable in two contexts: with the "traditional"
+dynamic registration and with marshal methods.  Both of these
+mechanisms, however, have different requirements.  We cannot assume
+that any assembly (either from .NET for Android or a third party nuget)
+will have "marshal methods friendly" code and thus we need to make
+sure that the code meets our requirements.
+
+We do it by reading each relevant assembly and modifying it by
+altering the definition of the native callbacks and removing the
+code that's no longer used by marshal methods.  This task is performed
+by the
+[`MarshalMethodsAssemblyRewriter`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs)
+invoked during application build after all the assemblies are linked
+but **before** type maps are generated (as rewriting **will** alter
+the method and potentially type tokens)
+
+The exact modifications we apply are:
+
+  * Removal of the **connector backing field**
+  * Removal of the **connector method**
+  * Generation of a **native callback wrapper** method, which catches
+    and propagates unhandled exceptions thrown by the native callback
+    or the target method.  This method is decorated with the
+    `[UnmanagedCallersOnly]` attribute and called directly from the
+    native code.
+  * Optionally, generate code in the **native callback wrapper** to handle
+    [non-blittable types](#wrappers-for-methods-with-non-blittable-types).
+
+All the modifications are performed with `Mono.Cecil`.
+
+After modifications, the assembly contains equivalent of the following
+C# code for each marshal method:
+
+```csharp
+public class MainActivity : AppCompatActivity
+{
+  // Native callback
+  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
+  {
+    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
+    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
+    __this.OnCreate (savedInstanceState);
+  }
+
+  // Native callback exception wrapper
+  [UnmanagedCallersOnly]
+  static void n_OnCreate_Landroid_os_Bundle__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
+  {
+    try {
+      n_OnCreate_Landroid_os_Bundle_ (jnienv, native__this, native_savedInstanceState)
+    } catch (Exception ex) {
+      Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
+    }
+  }
+
+  // Target method
+  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
+  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
+  {
+    const string __id = "onCreate.(Landroid/os/Bundle;)V";
+    try {
+      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
+      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
+      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
+    } finally {
+      global::System.GC.KeepAlive (savedInstanceState);
+    }
+  }
+}
+```
+
+#### Wrappers for methods with non-blittable types
+
+The
+[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
+attribute requires that all the argument types as well as the method
+return type are
+[blittable](https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types).
+
+Among these types is one that's commonly used by the managed classes
+implementing Java methods: `bool`.  Currently this is the **only**
+non-blittable type we've encountered in bindings, so at this point it
+is the only one supported by the assembly rewriter.
+
+Whenever we encounter a method with a non-blittable type, we must
+generate a wrapper for it, so that we can decorate it with the
+`[UnmanagedCallersOnly]` attribute.  This is easier and less error
+prone than modifying the native callback method's IL stream to
+implement the necessary conversion.
+
+An example of such method is
+`Android.Views.View.IOnTouchListener::OnTouch`:
+
+```csharp
+static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
+{
+  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
+  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
+  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
+  bool __ret = __this.OnTouch (v, e);
+  return __ret;
+}
+```
+
+As it returns a `bool` value, it needs a wrapper to cast the return
+value properly. Each wrapper method retains the native callback method
+name, but appends the `_mm_wrapper` suffix to it:
+
+```csharp
+static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
+{
+  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
+  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
+  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
+  bool __ret = __this.OnTouch (v, e);
+  return __ret;
+}
+
+[UnmanagedCallersOnly]
+static byte n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
+{
+  try {
+    return n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_(jnienv, native__this, native_v, native_e) ? 1 : 0;
+  } catch (Exception ex) {
+    Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
+    return default;
+  }
+}
+```
+
+The wrapper's return statement uses the ternary operator to "cast" the
+boolean value to `1` (for `true`) or `0` (for `false`) because the
+value of `bool` across the managed runtime can take a range of values:
+
+  * `0` for `false`
+  * `-1` or `1` for `true`
+  * `!= 0` for true
+
+Since the `bool` type in C# can be 1, 2 or 4 bytes long, we need to
+cast it to some type of a known and static size.  The managed type
+`byte` was chosen as it corresponds to the Java/JNI `jboolean` type,
+defined as an unsigned 8-bit type.
+
+Whenever an **argument** value needs to be converted between `byte` and
+`bool`, we generate code that is equivalent of the `argument != 0`
+comparison, for instance for the
+`Android.Views.View.IOnFocusChangeListener::OnFocusChange` method:
+
+```csharp
+[UnmanagedCallersOnly]
+static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, byte hasFocus)
+{
+  n_OnFocusChange_Landroid_view_View_Z (jnienv, native__this, native_v, hasFocus != 0);
+}
+
+static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, bool hasFocus)
+{
+  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnFocusChangeListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
+  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
+  __this.OnFocusChange (v, hasFocus);
+}
+```
+
+#### UnmanagedCallersOnly attribute
+
+Each marshal methods native callback method is decorated with the
+[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
+attribute, in order for us to be able to invoke the callback directly
+from native code with minimal overhead compared to traditional
+managed-from-native method calls (`mono_runtime_invoke`)
+
+### Marshal Methods Registration call sequence
+
+The sequence described in the [dynamic
+registration sequence](#dynamic-registration-call-sequence) section
+above is completely removed for the marshal methods.  What remains
+common for both dynamic and marshal methods registration, is the
+resolution of the native function target done by the Java VM runtime.
+In both cases the method declared in a Java class as `native` is
+looked up by the Java VM when first JIT-ing the code.  The difference
+lies in the way this lookup is performed.
+
+Dynamic registration uses the
+[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
+JNI function at the runtime, which stores a pointer to the registered
+method inside the structure which describes a Java class in the Java
+VM.
+
+Marshal methods, however, don't register anything with the JNI,
+instead they rely on the symbol lookup mechanism of the Java VM.
+Whenever a call to `native` Java method is JIT-ed and it is not
+registered previously using the `RegisterNatives` JNI function, Java
+VM will proceed to look for symbols in the process runtime image (e.g.
+using `dlopen` + `dlsym` calls on Unix) and, having found a matching
+symbol, use pointer to it as the target of the `native` Java method
+call.

From 5954a0dcc1a04c5b8eff7c63a62d564abb76268d Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:35:06 +0200
Subject: [PATCH 22/58] Leave JNI interoperability guide for documentation PR

Keep this runtime PR byte-identical to its updated parent for the guide so the dependent documentation PR shows the complete replacement.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 5226edc2b1d..2d6e8c82d72 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,8 +1,3 @@
-> **Historical reference:** This guide describes the removed legacy LLVM IR/native
-> typemap and marshal-method registration pipeline. Current CoreCLR and NativeAOT
-> applications use the generated managed trimmable typemap and its Java callable
-> wrappers instead.
-
 <!--toc:start-->
 - [Introduction](#introduction)
 - [Java <-> Managed interoperability overview](#java-managed-interoperability-overview)

From 6f948cd25593f421b4bd503c8e2d3952f23a8cae Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:45:56 +0200
Subject: [PATCH 23/58] Instantiate the trimmable type and value managers
 directly

Both CoreCLR and NativeAOT now have a single supported manager pair, so remove the redundant JNIEnvInit factory methods.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../JavaInteropRuntime.cs                        |  4 ++--
 src/Mono.Android/Android.Runtime/JNIEnvInit.cs   | 16 ++--------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs b/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs
index 4f9d6269ffb..b4daa017595 100644
--- a/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs
+++ b/src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs
@@ -56,8 +56,8 @@ static void init (IntPtr jnienv, IntPtr klass, IntPtr classLoader, IntPtr langua
 			var options = new NativeAotRuntimeOptions {
 				EnvironmentPointer = jnienv,
 				ClassLoader        = new JniObjectReference (classLoader, JniObjectReferenceType.Global),
-				TypeManager        = JNIEnvInit.CreateTypeManager (),
-				ValueManager       = JNIEnvInit.CreateValueManager (),
+				TypeManager                 = new TrimmableTypeMapTypeManager (),
+				ValueManager                = new TrimmableTypeMapValueManager (),
 			};
 			runtime = options.CreateJreVM ();
 
diff --git a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs
index 5ccf90f51ad..69adaef15f8 100644
--- a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs
+++ b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs
@@ -116,14 +116,12 @@ internal static unsafe void Initialize (JnienvInitializeArgs* args)
 
 			InitializeBeforeRuntimeCreation (*args);
 
-			JniRuntime.JniTypeManager typeManager = CreateTypeManager ();
-			JniRuntime.JniValueManager valueManager = CreateValueManager ();
 			androidRuntime = new AndroidRuntime (
 					args->env,
 					args->javaVm,
 					args->grefLoader,
-					typeManager,
-					valueManager
+					new TrimmableTypeMapTypeManager (),
+					new TrimmableTypeMapValueManager ()
 			);
 			JniRuntime.SetCurrent (androidRuntime);
 			TrimmableTypeMap.RegisterNativeMethods ();
@@ -134,16 +132,6 @@ internal static unsafe void Initialize (JnienvInitializeArgs* args)
 			SetSynchronizationContext ();
 		}
 
-		internal static JniRuntime.JniTypeManager CreateTypeManager ()
-		{
-			return new TrimmableTypeMapTypeManager ();
-		}
-
-		internal static JniRuntime.JniValueManager CreateValueManager ()
-		{
-			return new TrimmableTypeMapValueManager ();
-		}
-
 		static void InitializeCommonState (JnienvInitializeArgs args)
 		{
 			Logger.SetLogCategories ((LogCategories)args.logCategories);

From e656e6ee2fa34f772aaa95546f37d45e5c782cd4 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:48:25 +0200
Subject: [PATCH 24/58] Remove obsolete explicit Java type registration cache

Keep the public registration API binary-compatible but report that runtime registration is unsupported by the trimmable typemap; retain attribute-based JNI class lookup.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 src/Mono.Android/Android.Runtime/JNIEnv.cs    | 12 +----
 src/Mono.Android/Java.Interop/TypeManager.cs  | 50 +------------------
 .../TrimmableTypeMapTypeManagerTests.cs       |  8 +++
 3 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/src/Mono.Android/Android.Runtime/JNIEnv.cs b/src/Mono.Android/Android.Runtime/JNIEnv.cs
index 841e0c96f8e..1661dedf1f5 100644
--- a/src/Mono.Android/Android.Runtime/JNIEnv.cs
+++ b/src/Mono.Android/Android.Runtime/JNIEnv.cs
@@ -265,17 +265,7 @@ public static IntPtr FindClass (System.Type type)
 				if (!((e is Java.Lang.NoClassDefFoundError) || (e is Java.Lang.ClassNotFoundException)))
 					throw;
 				RuntimeNativeMethods.monodroid_log (LogLevel.Warn, LogCategories.Default, $"JNIEnv.FindClass(Type) caught unexpected exception: {e}");
-				var jni = Java.Interop.TypeManager.GetJniTypeName (type);
-				if (jni != null) {
-					e.Dispose ();
-					return FindClass (JavaNativeTypeManager.ToJniName (jni, rank));
-				}
-
-				// Though it's tempting to call TypeManager.RegisterType() to avoid
-				// calling GetCustomAttributes() again, this isn't necessary as
-				// JNIEnv.FindClass() will invoke the static constructor for the type,
-				// which will (indirectly) call TypeManager.RegisterType().
-				jni = JavaNativeTypeManager.ToJniNameFromAttributes (type);
+				var jni = JavaNativeTypeManager.ToJniNameFromAttributes (type);
 				if (jni != null) {
 					e.Dispose ();
 					return FindClass (JavaNativeTypeManager.ToJniName (jni, rank));
diff --git a/src/Mono.Android/Java.Interop/TypeManager.cs b/src/Mono.Android/Java.Interop/TypeManager.cs
index ce6f6950492..d500160935c 100644
--- a/src/Mono.Android/Java.Interop/TypeManager.cs
+++ b/src/Mono.Android/Java.Interop/TypeManager.cs
@@ -6,33 +6,6 @@
 
 namespace Java.Interop {
 
-	static class TypeManagerMapDictionaries
-	{
-		static Dictionary<string, Type>? _jniToManaged;
-		static Dictionary<Type, string>? _managedToJni;
-
-		public static readonly object AccessLock = new object ();
-
-		//
-		// Access to both properties MUST be done after taking lock on accessLock!
-		//
-		public static Dictionary<string, Type> JniToManaged {
-			get {
-				if (_jniToManaged == null)
-					_jniToManaged = new Dictionary<string, Type> (StringComparer.Ordinal);
-				return _jniToManaged;
-			}
-		}
-
-		public static Dictionary<Type, string> ManagedToJni {
-			get {
-				if (_managedToJni == null)
-					_managedToJni = new Dictionary<Type, string> ();
-				return _managedToJni;
-			}
-		}
-	}
-
 	public static partial class TypeManager {
 		internal static string GetClassName (IntPtr class_ptr)
 		{
@@ -43,15 +16,6 @@ internal static string GetClassName (IntPtr class_ptr)
 			return ret;
 		}
 
-		internal static string? GetJniTypeName (Type type)
-		{
-			lock (TypeManagerMapDictionaries.AccessLock) {
-				if (TypeManagerMapDictionaries.ManagedToJni.TryGetValue (type, out var jni))
-					return jni;
-			}
-			return null;
-		}
-
 		class TypeNameComparer : IComparer<string> {
 			public int Compare (string? x, string? y)
 			{
@@ -92,19 +56,7 @@ public int Compare (string? x, string? y)
 
 		public static void RegisterType (string java_class, Type t)
 		{
-			string jniFromType = JNIEnv.GetJniName (t);
-			lock (TypeManagerMapDictionaries.AccessLock) {
-				if (!TypeManagerMapDictionaries.JniToManaged.TryGetValue (java_class, out var lookup)) {
-					TypeManagerMapDictionaries.JniToManaged.Add (java_class, t);
-					if (String.Compare (jniFromType, java_class, StringComparison.OrdinalIgnoreCase) != 0) {
-						TypeManagerMapDictionaries.ManagedToJni.Add (t, java_class);
-					}
-				} else if (t != typeof (Java.Interop.TypeManager)) {
-					// skip the registration and output a warning
-					Logger.Log (LogLevel.Warn, "monodroid", FormattableString.Invariant ($"Type Registration Skipped for {java_class} to {t} "));
-				}
-
-			}
+			throw new NotSupportedException ("Explicit Java type registration is not supported with the trimmable type map. Use [Register] on Java peer types instead.");
 		}
 
 		const string TypeRegistrationNotSupported =
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs
index d9510d58d75..b212037982e 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs
@@ -21,6 +21,14 @@ sealed class TestableTrimmableTypeMapTypeManager : TrimmableTypeMapTypeManager
 		{
 		}
 
+		[Test]
+		public void ExplicitTypeRegistrationIsNotSupported ()
+		{
+			var exception = Assert.Throws<NotSupportedException> (() =>
+				Java.Interop.TypeManager.RegisterType ("example/CustomPeer", typeof (Java.Lang.Object)));
+			Assert.That (exception?.Message, Does.Contain ("trimmable type map"));
+		}
+
 		[TestCase ("android/app/Activity", "android/app/DesugarActivity$_CC", "android/app/Activity$-CC")]
 		[TestCase ("Activity", "DesugarActivity$_CC", "Activity$-CC")]
 		[TestCase ("com/example/package/MyInterface", "com/example/package/DesugarMyInterface$_CC", "com/example/package/MyInterface$-CC")]

From 073df7fb75483e1a45830b55e350589a6d68593f Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 12:11:06 +0200
Subject: [PATCH 25/58] Remove residual JVM test exclusions from runtime
 cleanup

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../TestInstrumentation.cs                    | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
index 57e972cd18f..ff419f4d48d 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
@@ -27,9 +27,6 @@ protected override IEnumerable<string>? ExcludedCategories {
 				categories.Add ("CoreCLRIgnore");
 				categories.Add ("NTLM");
 
-				categories.Add ("NativeTypeMap");
-				categories.Add ("TrimmableTypeMapUnsupported");
-
 				// Build-time flags flow in via runtimeconfig.json properties
 				// (see <RuntimeHostConfigurationOption> entries in Mono.Android.NET-Tests.csproj).
 				if (HasAppContextSwitch ("PublishAot")) {
@@ -37,7 +34,6 @@ protected override IEnumerable<string>? ExcludedCategories {
 					categories.Add ("NativeAOTIgnore");
 					categories.Add ("SSL");
 					categories.Add ("NTLM");
-
 				}
 
 				// Process-wide reference counts are only stable in the dedicated filtered run.
@@ -79,24 +75,6 @@ static string [] GetIncludedCategories ()
 		static bool HasAppContextSwitch (string key)
 			=> AppContext.TryGetSwitch (key, out var value) && value;
 
-		protected override IEnumerable<string>? ExcludedTestNames {
-			get {
-				// Tests from the external Java.Interop-Tests assembly that fail under the
-				// trimmable typemap. These cannot use [Category] because we don't control
-				// that assembly — they must be excluded by name here.
-				return new [] {
-					// Known limitation: [JniAddNativeMethodRegistrationAttribute] is not
-					// supported by design under the trimmable typemap. This Java.Interop-Tests
-					// fixture uses that attribute to register native callbacks on a hand-written
-					// Java peer (an obsolete code path whose primary consumer, jnimarshalmethod-gen,
-					// was removed in dotnet/java-interop#1405). The trimmable typemap generator
-					// emits XA4251 when it encounters the attribute.
-					// See https://github.com/dotnet/android/issues/11170.
-					"Java.InteropTests.InvokeVirtualFromConstructorTests",
-				};
-			}
-		}
-
 		public override void OnCreate (Bundle? arguments)
 		{
 			Java.Lang.JavaSystem.LoadLibrary ("reuse-threads");

From 9c09248a6ec736f19106b6d8da6a8f0d77887475 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 07:58:07 +0200
Subject: [PATCH 26/58] Drop removed native app init override after rebase

The updated parent no longer declares xamarin_app_init. Do not register its removed symbol in the CoreCLR p/invoke override.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 src/native/clr/pinvoke-override/precompiled.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/native/clr/pinvoke-override/precompiled.cc b/src/native/clr/pinvoke-override/precompiled.cc
index 1f7042b189a..e17640bf02e 100644
--- a/src/native/clr/pinvoke-override/precompiled.cc
+++ b/src/native/clr/pinvoke-override/precompiled.cc
@@ -58,10 +58,6 @@ namespace {
 		if (entrypoint_name == "clr_initialize_gc_bridge"sv) {
 			return reinterpret_cast<void*> (&clr_initialize_gc_bridge);
 		}
-		if (entrypoint_name == "xamarin_app_init"sv) {
-			return reinterpret_cast<void*> (&xamarin_app_init);
-		}
-
 		abort_missing_internal_symbol ("xa-internal-api"sv, entrypoint_name);
 	}
 

From e03abb7d428755947e34e13d6c83be4e350c9784 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 14:24:47 +0200
Subject: [PATCH 27/58] Remove legacy platform Java callable wrapper jar

Generate framework peers only in application typemaps, and use the trimmable runtime jar for binding and app Java compilation. Do not package the obsolete platform jar or DEX in reference packs.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Configuration.props                           |  7 --
 Documentation/docs-mobile/messages/xa0002.md  |  5 +-
 .../create-packs/Microsoft.Android.Ref.proj   |  2 -
 .../scripts/JavaCallableWrappers.targets      | 71 -------------------
 src/Mono.Android/Mono.Android.csproj          |  7 --
 src/Mono.Android/Mono.Android.targets         |  4 --
 .../Android/Xamarin.Android.Javac.targets     | 18 ++---
 .../Tasks/Javac.cs                            |  7 --
 .../TrimmableTypeMapBuildTests.cs             | 15 ++++
 .../Xamarin.Android.Common.targets            |  2 +-
 .../TrimmableTypeMapGeneratorTests.cs         | 10 +++
 11 files changed, 39 insertions(+), 109 deletions(-)
 delete mode 100644 build-tools/scripts/JavaCallableWrappers.targets

diff --git a/Configuration.props b/Configuration.props
index 28646bc673c..f1b677bb010 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -215,13 +215,6 @@
     <AndroidSupportedTargetJitAbisSplit>$(AndroidSupportedTargetJitAbis.Split(':'))</AndroidSupportedTargetJitAbisSplit>
   </PropertyGroup>
 
-  <!-- Noise generators -->
-  <PropertyGroup>
-    <!-- Setting this to `true` makes the GenerateJavaCallableWrappers target to output list of everything that's found
-         in android.jar; Enabled by default only on CI  -->
-    <AndroidNoisyJCW Condition=" '$(AndroidNoisyJCW)' == '' and '$(RunningOnCI)' == 'true' ">true</AndroidNoisyJCW>
-  </PropertyGroup>
-
   <!-- Unit Test Properties -->
   <PropertyGroup>
     <!-- When changing the version below, please also update the 'build-tools/scripts/nunit3-console*' scripts -->
diff --git a/Documentation/docs-mobile/messages/xa0002.md b/Documentation/docs-mobile/messages/xa0002.md
index 2e82f96a701..acc2e98425d 100644
--- a/Documentation/docs-mobile/messages/xa0002.md
+++ b/Documentation/docs-mobile/messages/xa0002.md
@@ -1,7 +1,7 @@
 ---
 title: .NET for Android error XA0002
 description: XA0002 error code
-ms.date: 04/11/2024
+ms.date: 09/24/2026
 f1_keywords:
   - "XA0002"
 ---
@@ -12,7 +12,8 @@ f1_keywords:
 
 This error means the build system could not locate the
 *mono.android.jar* file. This probably means your installation
-is corrupt in some way.
+is corrupt in some way. This error applies to older SDK versions;
+the .NET 11 SDK no longer includes *mono.android.jar*.
 
 ## Solution
 
diff --git a/build-tools/create-packs/Microsoft.Android.Ref.proj b/build-tools/create-packs/Microsoft.Android.Ref.proj
index 37ee75035b6..fc92623d104 100644
--- a/build-tools/create-packs/Microsoft.Android.Ref.proj
+++ b/build-tools/create-packs/Microsoft.Android.Ref.proj
@@ -47,8 +47,6 @@ by projects that use the Microsoft.Android framework in .NET 6+.
       <FilesToPackage Include="@(_AndroidRefPackAnalyzers)" TargetPath="$(_AndroidRefPackAnalyzersPath)" />
       <FilesToPackage Include="$(_MonoAndroidNETDefaultOutDir)Java.Interop.xml" TargetPath="$(_AndroidRefPackAssemblyPath)" />
       <FilesToPackage Include="$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml" TargetPath="$(_AndroidRefPackAssemblyPath)" />
-      <FilesToPackage Include="$(_MonoAndroidNETDefaultOutDir)mono.android.jar" TargetPath="$(_AndroidRefPackAssemblyPath)" />
-      <FilesToPackage Include="$(_MonoAndroidNETDefaultOutDir)mono.android.dex" TargetPath="$(_AndroidRefPackAssemblyPath)" />
     </ItemGroup>
   </Target>
 
diff --git a/build-tools/scripts/JavaCallableWrappers.targets b/build-tools/scripts/JavaCallableWrappers.targets
deleted file mode 100644
index 4ee26c823d4..00000000000
--- a/build-tools/scripts/JavaCallableWrappers.targets
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="GenerateJavaCallableWrappers"
-      AfterTargets="$(JavaCallableWrapperAfterTargets)"
-      Inputs="$(JavaCallableWrapperAbsAssembly);@(JavaCallableWrapperSource)"
-      Outputs="$(OutputPath)mono.android.jar">
-    <MakeDir Directories="$(IntermediateOutputPath)jcw;$(IntermediateOutputPath)jcw/bin" />
-    <ItemGroup>
-      <_CorlibPath Include="@(ReferencePath->'%(RootDir)%(Directory)')" Condition=" '%(FileName)%(Extension)' == 'mscorlib.dll' " />
-    </ItemGroup>
-    <PropertyGroup>
-      <_CorlibDir>@(_CorlibPath)</_CorlibDir>
-      <OutputPathAbs Condition="$([System.IO.Path]::IsPathRooted($(OutputPath)))">$(OutputPath)</OutputPathAbs>
-      <OutputPathAbs Condition=" '$(OutputPathAbs)' == '' ">$(MSBuildProjectDirectory)/$(OutputPath)</OutputPathAbs>
-      <JcwGen>"$(MicrosoftAndroidSdkOutDir)jcw-gen.dll" -v10</JcwGen>
-      <_LibDirs>-L "$(OutputPathAbs.TrimEnd('\'))"</_LibDirs>
-      <_LibDirs>$(_LibDirs) -L "$(_CorlibDir.TrimEnd('\'))"</_LibDirs>
-      <_Out>-o "$(MSBuildProjectDirectory)/$(IntermediateOutputPath)jcw/src"</_Out>
-    </PropertyGroup>
-    <Exec
-        Command="&quot;$(DotNetPreviewTool)&quot; $(JcwGen) $(_Out) $(_LibDirs) &quot;$(JavaCallableWrapperAbsAssembly)&quot;"
-    />
-    <ItemGroup>
-      <_JavaSources Include="$(IntermediateOutputPath)jcw\src\**\*.java" />
-    </ItemGroup>
-    <WriteLinesToFile
-        File="$(IntermediateOutputPath)jcw/classes.txt"
-        Lines="@(JavaCallableWrapperSource);@(_JavaSources)"
-        Overwrite="True"
-    />
-    <PropertyGroup>
-      <_Target>-source $(JavacSourceVersion) -target $(JavacTargetVersion)</_Target>
-      <_D>-d "$(IntermediateOutputPath)jcw/bin"</_D>
-      <_AndroidJar>"$(AndroidSdkDirectory)\platforms\android-$(AndroidPlatformId)\android.jar"</_AndroidJar>
-      <_MonoAndroidJar>$(OutputPath)mono.android.jar</_MonoAndroidJar>
-      <_MonoAndroidRuntimeJar>$(MicrosoftAndroidSdkOutDir)java_runtime.jar</_MonoAndroidRuntimeJar>
-    </PropertyGroup>
-    <Message Condition=" '$(AndroidNoisyJCW)' == 'true' " Text="# jonp: what's *in* _AndroidJar=`$(_AndroidJar)`?" />
-    <Exec
-        Condition=" '$(AndroidNoisyJCW)' == 'true' "
-        Command="&quot;$(JarPath)&quot; tf $(_AndroidJar)"
-    />
-    <Exec
-        Command="&quot;$(JavaCPath)&quot; $(_Target) $(_D) -classpath $(_AndroidJar)$(PathSeparator)&quot;$(_MonoAndroidJar)&quot;$(PathSeparator)&quot;$(_MonoAndroidRuntimeJar)&quot; @$(IntermediateOutputPath)jcw/classes.txt"
-    />
-    <Exec
-        Condition="Exists('$(_MonoAndroidJar)')"
-        Command="&quot;$(JarPath)&quot; uf &quot;$(_MonoAndroidJar)&quot; -C &quot;$(IntermediateOutputPath)jcw/bin&quot; ."
-    />
-    <Exec
-        Condition="!Exists('$(_MonoAndroidJar)')"
-        Command="&quot;$(JarPath)&quot; cf &quot;$(_MonoAndroidJar)&quot; -C &quot;$(IntermediateOutputPath)jcw/bin&quot; ."
-    />
-  </Target>
-  <Target Name="_GenerateMonoAndroidDex16"
-      AfterTargets="GenerateJavaCallableWrappers"
-      Inputs="$(OutputPath)mono.android.jar"
-      Outputs="$(OutputPath)mono.android.dex">
-    <PropertyGroup>
-      <R8JarPath>$(MicrosoftAndroidSdkOutDir)r8.jar</R8JarPath>
-    </PropertyGroup>
-    <Exec
-        Command="&quot;$(JavaPath)&quot; -classpath &quot;$(R8JarPath)&quot; com.android.tools.r8.D8 --release --no-desugaring --output &quot;$(IntermediateOutputPath.TrimEnd('\'))&quot; &quot;$(OutputPath)mono.android.jar&quot;"
-        EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory)"
-    />
-    <Move
-        SourceFiles="$(IntermediateOutputPath)classes.dex"
-        DestinationFiles="$(OutputPath)mono.android.dex"
-    />
-  </Target>
-</Project>
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index 183aaa6d818..16fc2abb69e 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -16,7 +16,6 @@
     <DefineConstants>$(DefineConstants);JAVA_INTEROP</DefineConstants>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework)\android-$(AndroidPlatformId)\</IntermediateOutputPath>
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
-    <JavaCallableWrapperAfterTargets>CoreBuild</JavaCallableWrapperAfterTargets>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <!-- @(Compile) ordering matters! See https://github.com/dotnet/java-interop/commit/d7dfa0bb7b03261d5eceb51ac22cd33aa15fa865 -->
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -52,10 +51,6 @@
     <AdditionalFiles Include="PublicAPI\API-$(AndroidApiLevel)\PublicAPI.Unshipped.txt" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <JavaCallableWrapperAbsAssembly>$([System.IO.Path]::GetFullPath ('$(OutputPath)$(AssemblyName).dll'))</JavaCallableWrapperAbsAssembly>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(_EnableMarshalMethods)' == 'YesPlease' ">
     <DefineConstants>$(DefineConstants);ENABLE_MARSHAL_METHODS</DefineConstants>
   </PropertyGroup>
@@ -122,7 +117,6 @@
 
   <Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
   <Import Project="Mono.Android.targets" />
-  <Import Project="..\..\build-tools\scripts\JavaCallableWrappers.targets" />
   <Import Project="$(IntermediateOutputPath)mcw\Mono.Android.projitems" Condition="Exists('$(IntermediateOutputPath)mcw\Mono.Android.projitems')" />
 
 <ItemGroup>
@@ -406,7 +400,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\build-tools\create-android-api\create-android-api.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\external\Java.Interop\tools\generator\generator.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\external\Java.Interop\tools\jcw-gen\jcw-gen.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\external\Java.Interop\tools\java-source-utils\java-source-utils.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\src\java-runtime\java-runtime.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\r8\r8.csproj" ReferenceOutputAssembly="False" />
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index 85ccc77a52f..078cb42bf23 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -161,10 +161,6 @@
       <DefineConstants>$(DefineConstants);$([System.String]::Copy('$(_GeneratedDefineConstants)').Replace ('%24(DefineConstants);', ''))</DefineConstants>
     </PropertyGroup>
   </Target>
-  <ItemGroup>
-    <JavaCallableWrapperSource Include="java\**\*.java" />
-  </ItemGroup>
-  
   <!-- Generates 'AndroidApiInfo.xml' file -->
   <Target Name="_GenerateAndroidApiInfo"
       BeforeTargets="GetTargetFrameworkProperties;GetReferenceAssemblyPaths;ResolveReferences"
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets
index f6de54356a0..f1bdd656dfc 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets
@@ -38,9 +38,11 @@ It is shared between "legacy" binding projects and .NET 7+ projects.
     </AdjustJavacVersionArguments>
   </Target>
 
-  <Target Name="_DetermineBindingJavaLibrariesToCompile" Condition=" '@(_JavaBindingSource->Count())' != '0' ">
+  <Target Name="_DetermineBindingJavaLibrariesToCompile"
+      Condition=" '@(_JavaBindingSource->Count())' != '0' "
+      DependsOnTargets="_CollectRuntimeJarFilenames">
     <DetermineJavaLibrariesToCompile
-        MonoPlatformJarPaths="$(MonoPlatformJarPath);$(_RuntimeJar)"
+        MonoPlatformJarPaths="$(_RuntimeJar)"
         JavaSourceFiles="@(_JavaBindingSource)"
         JavaLibraries="@(AndroidJavaLibrary);@(EmbeddedJar)"
         ExternalJavaLibraries="@(AndroidExternalJavaLibrary)"
@@ -52,10 +54,10 @@ It is shared between "legacy" binding projects and .NET 7+ projects.
   </Target>
 
   <Target Name="_DetermineJavaLibrariesToCompile"
-      DependsOnTargets="_CategorizeAndroidLibraries;_CollectJavaSourceForBinding;_CompileBindingJava">
+      DependsOnTargets="_CollectRuntimeJarFilenames;_CategorizeAndroidLibraries;_CollectJavaSourceForBinding;_CompileBindingJava">
 
     <DetermineJavaLibrariesToCompile
-        MonoPlatformJarPaths="$(MonoPlatformJarPath);$(_RuntimeJar)"
+        MonoPlatformJarPaths="$(_RuntimeJar)"
         JavaSourceFiles="@(AndroidJavaSource)"
         JavaLibraries="@(AndroidJavaLibrary)"
         ExternalJavaLibraries="@(AndroidExternalJavaLibrary)"
@@ -102,8 +104,8 @@ It is shared between "legacy" binding projects and .NET 7+ projects.
 
   <Target Name="_CompileBindingJava"
       Condition=" '@(_JavaBindingSource->Count())' != '0' "
-      DependsOnTargets="$(_CompileBindingJavaDependsOnTargets)"
-      Inputs="@(_AndroidMSBuildAllProjects);$(_AndroidCompileBindingJavaFileList);$(MonoPlatformJarPath);@(_JavaBindingSource)"
+      DependsOnTargets="_CollectRuntimeJarFilenames;$(_CompileBindingJavaDependsOnTargets)"
+      Inputs="@(_AndroidMSBuildAllProjects);$(_AndroidCompileBindingJavaFileList);$(_RuntimeJar);@(_JavaBindingSource)"
       Outputs="$(_AndroidCompileBindingJavaStampFile)">
 
     <!-- remove existing <Javac /> outputs, since *.class files and classes.zip could contain old files -->
@@ -150,8 +152,8 @@ It is shared between "legacy" binding projects and .NET 7+ projects.
   </Target>
 
   <Target Name="_CompileJava"
-    DependsOnTargets="$(_CompileJavaDependsOnTargets);_CollectJavaSource"
-    Inputs="@(_AndroidMSBuildAllProjects);$(_AndroidCompileJavaFileList);$(MonoPlatformJarPath);@(_JavaStubFiles);@(_JavaSource)"
+    DependsOnTargets="_CollectRuntimeJarFilenames;$(_CompileJavaDependsOnTargets);_CollectJavaSource"
+    Inputs="@(_AndroidMSBuildAllProjects);$(_AndroidCompileJavaFileList);$(_RuntimeJar);@(_JavaStubFiles);@(_JavaSource)"
     Outputs="$(_AndroidCompileJavaStampFile)">
 
     <!-- remove existing <Javac /> outputs, since *.class files could contain old files -->
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs
index f01c6edb6d1..b2966d72095 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs
@@ -50,13 +50,6 @@ public override bool RunTask ()
 
 		protected override string GenerateCommandLineCommands ()
 		{
-			//   Running command: C:\Program Files (x86)\Java\jdk1.6.0_20\bin\javac.exe
-			//     "-J-Dfile.encoding=UTF8"
-			//     "-d" "bin\classes"
-			//     "-classpath" "C:\Users\Jonathan\Documents\Visual Studio 2010\Projects\AndroidMSBuildTest\AndroidMSBuildTest\obj\Debug\android\bin\mono.android.jar";"C:\Program Files (x86)\Android\android-sdk-windows\platforms\android-8\android.jar"
-			//     "-encoding" "UTF-8"
-			//     "@C:\Users\Jonathan\AppData\Local\Temp\tmp79c4ac38.tmp"
-
 			var cmd = new CommandLineBuilder ();
 
 			cmd.AppendSwitchIfNotNull ("-J-Dfile.encoding=", "UTF8");
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 d610504fdbd..f7467a983e1 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,13 @@ public void Build_WithTrimmableTypeMap_Succeeds ([Values] bool isRelease, [Value
 
 			var intermediateDir = builder.Output.GetIntermediaryPath ("typemap");
 			AssertTrimmableTypeMapOutputs (intermediateDir);
+			if (!isRelease) {
+				var frameworkJcw = Path.Combine (intermediateDir, "java", "android", "app", "ActivityTracker.java");
+				FileAssert.Exists (frameworkJcw);
+				var source = File.ReadAllText (frameworkJcw);
+				StringAssert.Contains ("mono.android.Runtime.registerNatives (ActivityTracker.class)", source);
+				StringAssert.DoesNotContain ("mono.android.TypeManager.Activate", source);
+			}
 		}
 
 		[TestCase (AndroidRuntime.CoreCLR)]
@@ -2220,6 +2227,14 @@ public void TrimmableTypeMap_PreserveLists_ArePackagedInSdk ()
 			}
 		}
 
+		[Test]
+		public void TrimmableTypeMap_ReferencePack_DoesNotShipLegacyPlatformJcws ()
+		{
+			var referenceDirectory = TestEnvironment.MonoAndroidFrameworkDirectory;
+			FileAssert.DoesNotExist (Path.Combine (referenceDirectory, "mono.android.jar"));
+			FileAssert.DoesNotExist (Path.Combine (referenceDirectory, "mono.android.dex"));
+		}
+
 		[Test]
 		public void TrimmableTypeMap_RuntimeArtifacts_ArePackagedInSdk ()
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 543fd08ed66..5a54c3d1c1e 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1354,7 +1354,7 @@ because xbuild doesn't support framework reference assemblies.
 </Target>
 
 <Target Name="_AddStaticResources"
-		Inputs="$(MonoPlatformJarPath);$(_AndroidBuildPropertiesCache)"
+		Inputs="$(_RuntimeJar);$(_AndroidBuildPropertiesCache)"
 		Outputs="$(_AndroidStaticResourcesFlag)"
 		DependsOnTargets="_CollectRuntimeJarFilenames;$(_BeforeAddStaticResources)">
   <CopyResource
diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs
index 9a1a90346f8..1b9f427947a 100644
--- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs
+++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs
@@ -959,6 +959,16 @@ public void Execute_FrameworkAssembly_GeneratesFrameworkJcwTypes ()
 		Assert.Contains (result.GeneratedJavaSources, s => s.RelativePath == "xamarin/android/net/ServerCertificateCustomValidator_TrustManager_FakeSSLSession.java");
 		Assert.Contains (result.GeneratedJavaSources, s => s.RelativePath == "xamarin/android/net/ServerCertificateCustomValidator_AlwaysAcceptingHostnameVerifier.java");
 		Assert.Contains (result.GeneratedJavaSources, s => s.RelativePath == "xamarin/android/net/ServerCertificateCustomValidator_NonRequiredFrameworkAcw.java");
+		var frameworkJcw = Assert.Single (result.GeneratedJavaSources,
+			s => s.RelativePath == "xamarin/android/net/ServerCertificateCustomValidator_TrustManager.java");
+		Assert.Contains ("mono.android.Runtime.registerNatives (ServerCertificateCustomValidator_TrustManager.class)", frameworkJcw.Content);
+		Assert.DoesNotContain ("mono.android.TypeManager.Activate", frameworkJcw.Content);
+		var frameworkConstructorJcw = Assert.Single (result.GeneratedJavaSources,
+			s => s.RelativePath == "myapp/PlainActivitySubclass.java");
+		Assert.Contains ("mono.android.Runtime.registerNatives (PlainActivitySubclass.class)", frameworkConstructorJcw.Content);
+		Assert.Contains ("private native void nctor_0 ()", frameworkConstructorJcw.Content);
+		Assert.DoesNotContain ("mono.android.TypeManager.Activate", frameworkConstructorJcw.Content);
+		Assert.Contains (result.GeneratedAssemblies, assembly => assembly.Name == "_Mono.Android.TypeMap");
 	}
 
 	[Fact]

From 64c1ea508e5cbd57f9e419b16647646e09f6331c Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:08:40 +0200
Subject: [PATCH 28/58] Document trimmable JNI interoperability

Describe generated Java wrappers, managed TypeMaps, JNI registration, peer lifetime, and CoreCLR/NativeAOT interop. Link the guide from the documentation index.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/README.md                       |   1 +
 .../guides/internals/JavaJNI_Interop.md       | 923 +++---------------
 2 files changed, 163 insertions(+), 761 deletions(-)

diff --git a/Documentation/README.md b/Documentation/README.md
index 826dff3e082..14e2a93b9fa 100644
--- a/Documentation/README.md
+++ b/Documentation/README.md
@@ -23,6 +23,7 @@
   * [`.axml` CodeBehind Support](docs-mobile/features/layout-code-behind/index.md)
   * [MSBuild Best Practices](guides/MSBuildBestPractices.md)
   * [D8 and R8 Integration](guides/D8andR8.md)
+  * [Java and managed interoperability](guides/internals/JavaJNI_Interop.md)
   * [Profiling Startup](guides/profiling.md)
 
 
diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 2d6e8c82d72..7d06fa1f544 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,766 +1,167 @@
-<!--toc:start-->
-- [Introduction](#introduction)
-- [Java <-> Managed interoperability overview](#java-managed-interoperability-overview)
-  - [Java Callable Wrappers (JCW)](#java-callable-wrappers-jcw)
-- [Registration](#registration)
-  - [Dynamic registration](#dynamic-registration)
-    - [Dynamic Java Callable Wrappers registration code](#dynamic-java-callable-wrappers-registration-code)
-    - [Dynamic Registration call sequence](#dynamic-registration-call-sequence)
-  - [Marshal methods](#marshal-methods)
-    - [Marshal Methods Java Callable Wrappers registration code](#marshal-methods-java-callable-wrappers-registration-code)
-    - [Marshal methods C# source code](#marshal-methods-c-source-code)
-    - [JNI requirements](#jni-requirements)
-    - [LLVM IR code generation](#llvm-ir-code-generation)
-    - [Assembly rewriting](#assembly-rewriting)
-      - [Wrappers for methods with non-blittable types](#wrappers-for-methods-with-non-blittable-types)
-      - [UnmanagedCallersOnly attribute](#unmanagedcallersonly-attribute)
-    - [Marshal Methods Registration call sequence](#marshal-methods-registration-call-sequence)
-<!--toc:end-->
-
-# Introduction
-
-At the core of `.NET for Android` is its ability to interoperate with
-the Java/Kotlin APIs implemented in the Android system.  To make it
-work, it is necessary to "bridge" the two separate worlds of Java VM
-(`ART` in the Android OS) and the Managed VM (`MonoVM`).  Application
-developers expect to be able to call native Android APIs and receive
-calls (or react to events) from the Android side using code written in
-one of the .NET managed languages.  To make it work, `.NET for Android`
-employs a number of techniques, both at build and at run time, which
-are described in the sections below.
-
-This guide is meant to explain the technical implementation in a way
-that is sufficient to understand the system without having to read the
-actual source code.
-
-# Java <-> Managed interoperability overview
-
-Java VM and Managed VM are two entirely separate entities which
-co-exist in the same process/application.  Despite sharing the same
-process resources, they don't "naturally" communicate with each other.
-There is no direct way to call Java/Kotlin from .NET a'la the
-`p/invoke` mechanism which allows calling native code APIs.  Nor there
-exists a way for Java/Kotlin code to invoke managed methods.  To make
-it possible, `.NET for Android` takes advantage of the Java's [JNI](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html)
-(`Java Native Interface`), a mechanism that allows native code
-(.NET managed code being "native" in this context) to register
-implementations of Java methods, written outside the Java VM and in
-languages other than Java/Kotlin (for instance in `C`, `C++` or
-`Rust`).
-
-Such methods need to be appropriately declared in the Java code, for
-instance:
-
-```java
-class MainActivity
-  extends androidx.appcompat.app.AppCompatActivity
-{
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-
-  private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Each native method is declared using the `native` keyword, and
-whenever it is invoked from other Java code, the Java VM will use the
-JNI to invoke the target method.
-
-Native methods can be registered either dynamically (by calling the
-[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
-JNI function) or "statically", by providing a native shared library
-which exports a symbol with appropriate name which points to the
-native function implementing the Java method.
-
-Both ways of registration are described in detail in the following
-sections.
-
-## Java Callable Wrappers (JCW)
-
-`.NET for Android` wraps the entire Android API by generating
-appropriate C# code which mirrors the Java/Kotlin code (classes,
-interfaces, methods, properties etc).  Each generated class that
-corresponds to a Java/Kotlin type, is derived from the
-`Java.Lang.Object` class (implemented in the `Mono.Android` assembly),
-which marks it as a "Java interoperable type", meaning that it can
-implement or override virtual Java methods.  To make registration and
-invoking of such methods possible, it is necessary to generate a Java
-class which mirrors the Managed one and provides an entry point to
-the Java <-> Managed transition.  The Java classes are generated
-during application (as well as `.NET for Android`) build and we call
-them **Java Callable Wrappers** (or **JCW** for short).  For instance,
-the following managed class:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  public override Android.Views.View? OnCreateView (Android.Views.View? parent, string name, Android.Content.Context context, Android.Util.IAttributeSet attrs)
-  {
-    return base.OnCreateView (parent, name, context, attrs);
-  }
-
-  protected override void OnCreate (Bundle savedInstanceState)
-  {
-     base.OnCreate(savedInstanceState);
-     DoSomething (savedInstanceState);
-  }
-
-  void DoSomething (Bundle bundle)
-  {
-     // do something with the bundle
-  }
-}
-```
-
-overrides two Java virtual methods found in the `AppCompatActivity`
-type: `OnCreateView` and `OnCreate`.  The `DoSomething` method does
-not correspond to any method found in the base Java type, and thus it
-won't be included in the JCW.
-
-The Java Callable Wrapper generated for the above class would look as
-follows (a few generated methods not relevant to the discussion have
-been omitted for brevity):
+# Java and managed interoperability (trimmable TypeMap)
+
+This guide describes the **current** .NET for Android application interop
+path for CoreCLR and NativeAOT. `AndroidTypeMapImplementation=trimmable` is the
+only supported application TypeMap implementation. The Java VM (ART) and the
+managed runtime communicate through JNI; the build supplies generated Java
+callable wrappers (JCWs) and managed TypeMap assemblies, while handwritten
+Java and managed runtime code connects those generated pieces. This is not a
+description of the former MonoVM/native LLVM TypeMap or assembly-rewriting
+pipeline.
+
+## What is generated
+
+| Piece | Purpose and source |
+| --- | --- |
+| Bound managed API types | Managed callable wrappers for Android/Java APIs use `JniPeerMembers` to invoke Java methods. These are distinct from the app's Java callable wrappers; see [`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs) for an invocation. |
+| JCW `.java` files | Java classes for managed Java peers, with constructors and `n_*` native callbacks for Java-to-managed calls. [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) produces them from the scanned peer model. |
+| TypeMap DLLs | `_{AssemblyName}.TypeMap.dll` files hold mappings, proxy types, and native registration methods; `_Microsoft.Android.TypeMaps.dll` is the root that connects them. [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and [`RootTypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/RootTypeMapAssemblyGenerator.cs) emit these managed assemblies. |
+| Registration and manifest | The task generates `ApplicationRegistration.java` from the scanned peers (not from a Java template); it also writes the ACW map (`acw-map.txt`) and merged `AndroidManifest.xml`. |
+
+The [scanner](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
+reads assembly metadata to discover Java peers and their Java-visible
+constructors and methods. The
+[`GenerateTrimmableTypeMap` task](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
+drives the scan, validates it, emits the managed and Java outputs, and removes
+stale JCW sources. The
+[shared MSBuild targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
+run `_GenerateTrimmableTypeMap` after `CoreCompile`; their output lives under
+`obj/.../typemap/` (not in handwritten source). Inspect
+`typemap/typemap-assemblies.txt` and `typemap/java-files.txt` to see what
+that build actually generated. The
+[TypeMap build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
+documents target ordering, output stamps, and incremental regeneration.
+
+The root TypeMap assembly anchors the per-assembly TypeMaps and initializes
+the lookup dictionaries. Mapping attributes in those per-assembly DLLs
+associate Java names, managed types, and generated proxy types. ACW proxies
+implement `IAndroidCallableWrapper` for native registration; other proxies
+do not need that interface. These are **managed metadata**, not a lookup
+table in a native binary. The runtime
+[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+uses the mappings to resolve Java objects and managed peer types.
+
+## Managed calls Java
+
+A bound C# method uses its `JniPeerMembers` and a JNI member signature to
+call Java through Java.Interop. For example,
+`Android.App.Activity.ReportFullyDrawn()` invokes
+`_members.InstanceMethods.InvokeVirtualVoidMethod(...)` with
+`"reportFullyDrawn.()V"` and the current peer. Static calls use the
+corresponding `StaticMethods` APIs. Arguments and return values cross JNI
+with the appropriate Java object references and value conversions. This
+direction does **not** call a JCW's `n_*` callback: the bound managed API
+is the caller, and the Java implementation is the callee.
+
+When a JNI object arrives in managed code,
+[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
+resolves its Java type to a managed target/proxy using the generated map;
+[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
+reuses or constructs a managed peer for its JNI reference. Conversely, the
+type manager resolves managed Java-peer types to JNI type signatures when
+needed. The map is about **type and peer resolution**; it does not replace
+normal Java.Interop method invocation.
+
+## Java calls managed code
+
+The JCW is a real Java class generated for a managed peer. Its Java-visible
+methods forward to `native n_*` methods, and its constructors use generated
+`nctor_*` callbacks. The generator normally emits a per-class static
+initializer like:
 
 ```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-  {
-    return n_onCreateView (p0, p1, p2, p3);
-  }
-  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-  private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Understanding the connection between Managed methods and their Java
-counterparts is required in order to understand the registration
-mechanisms described in sections found later in this document.  The
-[Dynamic registration](#dynamic-registration) section will expand on
-this example in order to explain the details of how the Managed type
-and its methods are registered with the Java VM.
-
-# Registration
-
-Both mechanisms of method registration rely on generation of [Java
-Callable Wrappers](#java-callable-wrappers-jcw), with [Dynamic
-registration](#dynamic-registration) requiring more code to be
-generated so that the registration can be performed at the runtime.
-
-JCW are generated only for types that derive from
-the `Java.Lang.Object` type.  Finding such types is the task of the
-Java.Interop's [`JavaTypeScanner`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs),
-which uses `Mono.Cecil` to read all the assemblies referenced by the
-application and its libraries.  The returned list of assemblies is
-then used by a variety of tasks, JCW being only one
-of them.
-
-After all types are found,
-[`JavaCallableWrapperGenerator`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
-is invoked in order to analyze each method in each type, looking for
-those which override a virtual Java method and, thus, need to be
-included in the wrapper class code. The generator optionally (if
-[marshal methods](#marshal-methods) are enabled) passes each method to
-an implementation of the
-[`Java.Interop.Tools.JavaCallableWrappers.JavaCallableMethodClassifier`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
-abstract class (which is
-[`MarshalMethodsClassifier`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs)
-in our case), to check whether the given method can be registered
-statically.
-
-`JavaCallableWrapperGenerator` looks for methods decorated with the
-`[Register]` attribute, which most frequently is created by invoking
-its constructor with three parameters:
-
-  1. Java method name
-  2. JNI method signature
-  3. "Connector" method name
-
-The "connector" is a static method which creates a delegate that
-subsequently allows calling of the native callback method:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Connector backing field
-  static Delegate? cb_onCreate_Landroid_os_Bundle_;
-
-  // Connector method
-  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
-  {
-    if (cb_onCreate_Landroid_os_Bundle_ == null)
-      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
-    return cb_onCreate_Landroid_os_Bundle_;
-  }
-
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-The above code is actually generated in the `Android.App.Activity`
-class while .NET for Android is built, from which our example
-`MainActivity` eventually derives.
-
-What happens with the above code depends on the registration mechanism
-and is described in the sections below.
-
-## Dynamic registration
-
-This registration mechanism has been used by `.NET for Android` since
-the beginning and it will remain in use for the foreseeable future
-when the application is built in the `Debug` configuration or when
-[Marshal Methods](#marshal-methods) are turned off.
-
-### Dynamic Java Callable Wrappers registration code
-
-Building on the C# example shown in the [Java Callable
-Wrappers](#java-callable-wrappers-jcw) section, the following Java
-code is generated (only the parts relevant to registration are shown):
-
-```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-/** @hide */
-        public static final String __md_methods;
-        static {
-                __md_methods = 
-                        "n_onCreateView:(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;:GetOnCreateView_Landroid_view_View_Ljava_lang_String_Landroid_content_Context_Landroid_util_AttributeSet_Handler\n" +
-                        "n_onCreate:(Landroid/os/Bundle;)V:GetOnCreate_Landroid_os_Bundle_Handler\n" +
-                        "";
-                mono.android.Runtime.register ("HelloAndroid.MainActivity, HelloAndroid", MainActivity.class, __md_methods);
-        }
-
-        public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-        {
-                return n_onCreateView (p0, p1, p2, p3);
-        }
-
-        private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-        public void onCreate (android.os.Bundle p0)
-        {
-                n_onCreate (p0);
-        }
-
-        private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Code fragment which takes part in registration is the class's static
-constructor.  For each method registered for the type (that is,
-implemented or overridden in the managed code), the JCW generator
-outputs a single string which contains full information about the type
-and method to register.  Each such registration string is terminated
-with the newline character and the entire sequence ends with an empty
-string.  Together, all the lines are concatenated and placed in the
-`__md_methods` static variable.  The `mono.android.Runtime.register`
-method (see below for more details) is then invoked to register all
-the methods.
-
-### Dynamic Registration call sequence
-
-All the "native" methods declared in the generated Java type are
-registered when the type is constructed or accessed for the first
-time.  This is when the Java VM invokes the type's static constructor,
-kicking off a sequence of calls that eventually ends with all the type
-methods registered with JNI:
-
-  1. `mono.android.Runtime.register` is itself a native method,
-     declared in the
-     [`Runtime`](../../src/java-runtime/java/mono/android/Runtime.java)
-     class of .NET for Android's Java runtime code, and implemented in
-     the native .NET for Android
-     [runtime](../../src/monodroid/jni/monodroid-glue.cc) (the
-     `MonodroidRuntime::Java_mono_android_Runtime_register` method).
-	 Purpose of this method is to prepare a call into the
-     .NET for Android managed runtime code, the
-     [`Android.Runtime.JNIEnv::RegisterJniNatives`](../../src/Mono.Android/Android.Runtime/JNIEnv.cs)
-     method.
-  2. `Android.Runtime.JNIEnv::RegisterJniNatives` is passed name of
-     the managed type for which to register Java methods and uses .NET
-     reflection to load that type, followed by a call to cache the
-     type (via `RegisterType` method in the
-     [`TypeManager`](../../src/Mono.Android/Java.Interop/TypeManager.cs)
-     class) to end with a call to the
-     `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
-     method.
-  3. `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
-     eventually calls the
-     `Java.Interop.JniEnvironment.Types::RegisterNatives` method which
-	 first generates a delegate to the native callback method, using
-     `System.Reflection.Emit` (via the
-     [`Android.Runtime.JNINativeWrapper::CreateDelegate`](../../src/Mono.Android/Android.Runtime/JNINativeWrapper.cs)
-     method) and, eventually, invokes Java JNI's `RegisterNatives`
-     function, finally registering the native methods for a managed
-     type.
-  
-The `System.Reflection.Emit` sequence mentioned in 3. above is among
-the most costly operations, repeated for each registered method.
-
-Some more information about Java type registration can be found
-[here](https://github.com/dotnet/android/wiki/Blueprint#java-type-registration).
-
-## Marshal methods
-
-The goal of marshal methods is to completely bypass the [dynamic
-registration sequence](#dynamic-registration-call-sequence), replacing
-it with native code generated and compiled during application build,
-thus saving on the startup time of the application.
-
-Marshal methods registration mechanism takes advantage of the JNI
-ability to look up implementations of `native` Java methods in actual
-native (shared) libraries.  Such symbols must have names that follow a
-set of rules, so that JNI is able to properly locate them (details are
-explained in the [JNI Requirements](#jni-requirements) section below).
-
-To achieve that, the marshal methods mechanism uses a number of
-classes which [generate native](#llvm-ir-code-generation) code and 
-[modify assemblies](#assembly-rewriting) that contain the registered
-methods.
-
-Current implementation of the marshal methods classifier recognizes
-the "standard" method registration pattern, using the example of the
-`OnCreate` method shown in [Registration](#registration) above.
-
-The standard pattern consists of:
-
-  * the "connector" method, `GetOnCreate_Landroid_os_Bundle_Handler`
-    above
-  * the delegate backing field, `cb_onCreate_Landroid_os_Bundle_`
-    above
-  * the native callback method, `n_OnCreate_Landroid_os_Bundle_` above
-  * and the virtual target method which dispatches the call to the
-    actual object, `OnCreate` above.
-
-Whenever the classifier's `ShouldBeDynamicallyRegistered` method is
-called, it is passed not only the method's declaring type, but also
-the `Register` attribute instance which it then uses to check whether
-the method being registered conforms to the "standard" registration
-pattern shown above.  The connector, native callback methods as well
-as the backing field must be private and static in order for the
-registered method to be considered as a candidate for static
-registration.
-
-Registered methods which don't follow the "standard" pattern will be
-registered dynamically.
-
-### Marshal Methods Java Callable Wrappers registration code
-
-Building on the C# example show in the [Java Callable
-Wrappers](#java-callable-wrappers-jcw) section, the following Java
-code is generated (only the parts relevant to registration are shown):
-
-```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-  {
-    return n_onCreateView (p0, p1, p2, p3);
-  }
-
-  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-
-  private native void n_onCreate (android.os.Bundle p0);
+static {
+    mono.android.Runtime.registerNatives (MyActivity.class);
 }
 ```
 
-Note that, compared to the code generated for the [dynamic
-registration](#dynamic-java-callable-wrappers-registration-code)
-mechanism, there is no static constructor while the rest 
-of the code remains exactly the same.
-
-### Marshal methods C# source code
-
-The marshal methods sections below will all refer to this code
-fragment:
-
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Connector backing field
-  static Delegate? cb_onCreate_Landroid_os_Bundle_;
-
-  // Connector method
-  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
-  {
-    if (cb_onCreate_Landroid_os_Bundle_ == null)
-      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
-    return cb_onCreate_Landroid_os_Bundle_;
-  }
-
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-### JNI requirements
-
-JNI
-[specifies](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names)
-a number of rules which govern how the native symbol name is
-constructed, so that a mapping of object-oriented Java code (with its
-package names/namespaces, class names and overloadable methods) into the essentially
-"flat" procedural "namespace" of the lowest common denominator C code.
-
-The precise rules are outlined in the URL above, and their short
-version is as follows:
-
-  * Each symbol starts with the `Java_` prefix
-  * Next follows the mangled (see below) **fully qualified class
-    name**
-  * Next the `_` character serves as a separator before
-  * A mangled **method** name, which is optionally followed by
-  * Double underscore `__` and the mangled method argument signature
-
-"Mangling" is a way of encoding certain characters that are not
-directly representable both in the source code and in the native
-symbol name.  The JNI specification allows for direct use of ASCII
-letters (capital and lowercase) and digits, while all the other
-characters are either represented by placeholders or encoded as 16-bit
-hexadecimal Unicode character code (table copied from the JNI
-specification for easier reference):
-
-| Escape sequence | Denotes                                  |
-|-----------------|------------------------------------------|
-| _0XXXX          | a Unicode character XXXX, all lower case |
-| _1              | The `_` character                        |
-| _2              | The `;` character in signatures          |
-| _3              | The `[` character in signatures          |
-| _               | The `.` or `/` characters                |
-
-Generation of JNI symbol names is performed by the
-[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
-class while generating the native function source code.
-
-JNI supports two forms of the native symbol name, as signalled in the
-bullet list above - a short and a long one.  The former is looked up
-first by the Java VM, followed by the latter.  The latter needs to be
-used only for overloaded methods, which is what our generator does.
-
-### LLVM IR code generation
-
-[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
-uses the LLVM IR generator infrastructure to output both data and
-executable code for all the marshal methods wrappers.  It is not
-necessary to understand the generated code unless one needs to modify
-it, so this document only shows the equivalent C++ code which can
-serve as a guide to understanding how the marshal method runtime
-invocation works:
-
-```C++
-using get_function_pointer_fn = void(*)(uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr);
-
-static get_function_pointer_fn get_function_pointer;
-
-void xamarin_app_init (get_function_pointer_fn fn) noexcept
-{
-  get_function_pointer = fn;
-}
-
-using android_app_activity_on_create_bundle_fn = void (*) (JNIEnv *env, jclass klass, jobject savedInstanceState);
-static android_app_activity_on_create_bundle_fn android_app_activity_on_create_bundle = nullptr;
-
-extern "C" JNIEXPORT void
-JNICALL Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2 (JNIEnv *env, jclass klass, jobject savedInstanceState) noexcept
-{
-  if (android_app_activity_on_create_bundle == nullptr) {
-    get_function_pointer (
-      16, // mono image index
-      0,  // class index
-      0x0600055B, // method token
-      reinterpret_cast<void*&>(android_app_activity_on_create_bundle) // target pointer
-    );
-  }
-
-  android_app_activity_on_create_bundle (env, klass, savedInstanceState);
-}
-```
-
-The `xamarin_app_init` function is output only once and is called by
-the `.NET for Android` runtime twice during application startup - once
-to pass `get_function_pointer_fn` which does **not** use any locks (as
-we know that until a certain point during startup we are in a single
-lock, so no data access races can happen) and the other time just
-before handing control over to the MonoVM, to pass pointer to
-`get_function_pointer_fn` which **does** employ locking (since during
-runtime it may very well happen that our generated Java native
-functions will be called from different threads simultaneously).
-
-The `Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2`
-function is a template which is repeated for each Java native
-function, with each function having its own set of arguments and its
-own callback backing field (`android_app_activity_on_create_bundle`
-here).
-
-The `get_function_pointer` function takes as parameters indexes into a
-couple of tables, one for `MonoImage*` pointers and the other for
-`MonoClass*` pointers - both of which are generated by the
-`MarshalMethodsNativeAssemblyGenerator` class at application build
-time and allow for very fast lookup during run time.  Target methods
-are retrieved by their token value, within the specified `MonoImage*`
-(essentially a pointer to managed assembly image in memory) and class.
-
-The method identified in such manner, **must** be decorated in the
-managed code with the
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute (see [below](#unmanagedcallersonly-attribute) for more
-details) so that it can be invoked directly, as if it was a native
-method itself, with minimal managed marshaling overhead.
-
-### Assembly rewriting
-
-Please refer to the [C# code fragment](#marshal-methods-c-source-code)
-above in order to understand this section.
-
-Managed assemblies (including `Mono.Android.dll`) which contain Java
-types need to be usable in two contexts: with the "traditional"
-dynamic registration and with marshal methods.  Both of these
-mechanisms, however, have different requirements.  We cannot assume
-that any assembly (either from .NET for Android or a third party nuget)
-will have "marshal methods friendly" code and thus we need to make
-sure that the code meets our requirements.
-
-We do it by reading each relevant assembly and modifying it by
-altering the definition of the native callbacks and removing the
-code that's no longer used by marshal methods.  This task is performed
-by the
-[`MarshalMethodsAssemblyRewriter`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs)
-invoked during application build after all the assemblies are linked
-but **before** type maps are generated (as rewriting **will** alter
-the method and potentially type tokens)
-
-The exact modifications we apply are:
-
-  * Removal of the **connector backing field**
-  * Removal of the **connector method**
-  * Generation of a **native callback wrapper** method, which catches
-    and propagates unhandled exceptions thrown by the native callback
-    or the target method.  This method is decorated with the
-    `[UnmanagedCallersOnly]` attribute and called directly from the
-    native code.
-  * Optionally, generate code in the **native callback wrapper** to handle
-    [non-blittable types](#wrappers-for-methods-with-non-blittable-types).
-
-All the modifications are performed with `Mono.Cecil`.
-
-After modifications, the assembly contains equivalent of the following
-C# code for each marshal method:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Native callback exception wrapper
-  [UnmanagedCallersOnly]
-  static void n_OnCreate_Landroid_os_Bundle__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    try {
-      n_OnCreate_Landroid_os_Bundle_ (jnienv, native__this, native_savedInstanceState)
-    } catch (Exception ex) {
-      Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
-    }
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-#### Wrappers for methods with non-blittable types
-
-The
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute requires that all the argument types as well as the method
-return type are
-[blittable](https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types).
-
-Among these types is one that's commonly used by the managed classes
-implementing Java methods: `bool`.  Currently this is the **only**
-non-blittable type we've encountered in bindings, so at this point it
-is the only one supported by the assembly rewriter.
-
-Whenever we encounter a method with a non-blittable type, we must
-generate a wrapper for it, so that we can decorate it with the
-`[UnmanagedCallersOnly]` attribute.  This is easier and less error
-prone than modifying the native callback method's IL stream to
-implement the necessary conversion.
-
-An example of such method is
-`Android.Views.View.IOnTouchListener::OnTouch`:
-
-```csharp
-static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
-  bool __ret = __this.OnTouch (v, e);
-  return __ret;
-}
-```
-
-As it returns a `bool` value, it needs a wrapper to cast the return
-value properly. Each wrapper method retains the native callback method
-name, but appends the `_mm_wrapper` suffix to it:
-
-```csharp
-static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
-  bool __ret = __this.OnTouch (v, e);
-  return __ret;
-}
-
-[UnmanagedCallersOnly]
-static byte n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  try {
-    return n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_(jnienv, native__this, native_v, native_e) ? 1 : 0;
-  } catch (Exception ex) {
-    Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
-    return default;
-  }
-}
-```
-
-The wrapper's return statement uses the ternary operator to "cast" the
-boolean value to `1` (for `true`) or `0` (for `false`) because the
-value of `bool` across the managed runtime can take a range of values:
-
-  * `0` for `false`
-  * `-1` or `1` for `true`
-  * `!= 0` for true
-
-Since the `bool` type in C# can be 1, 2 or 4 bytes long, we need to
-cast it to some type of a known and static size.  The managed type
-`byte` was chosen as it corresponds to the Java/JNI `jboolean` type,
-defined as an unsigned 8-bit type.
-
-Whenever an **argument** value needs to be converted between `byte` and
-`bool`, we generate code that is equivalent of the `argument != 0`
-comparison, for instance for the
-`Android.Views.View.IOnFocusChangeListener::OnFocusChange` method:
-
-```csharp
-[UnmanagedCallersOnly]
-static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, byte hasFocus)
-{
-  n_OnFocusChange_Landroid_view_View_Z (jnienv, native__this, native_v, hasFocus != 0);
-}
-
-static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, bool hasFocus)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnFocusChangeListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  __this.OnFocusChange (v, hasFocus);
-}
-```
-
-#### UnmanagedCallersOnly attribute
-
-Each marshal methods native callback method is decorated with the
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute, in order for us to be able to invoke the callback directly
-from native code with minimal overhead compared to traditional
-managed-from-native method calls (`mono_runtime_invoke`)
-
-### Marshal Methods Registration call sequence
-
-The sequence described in the [dynamic
-registration sequence](#dynamic-registration-call-sequence) section
-above is completely removed for the marshal methods.  What remains
-common for both dynamic and marshal methods registration, is the
-resolution of the native function target done by the Java VM runtime.
-In both cases the method declared in a Java class as `native` is
-looked up by the Java VM when first JIT-ing the code.  The difference
-lies in the way this lookup is performed.
-
-Dynamic registration uses the
-[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
-JNI function at the runtime, which stores a pointer to the registered
-method inside the structure which describes a Java class in the Java
-VM.
-
-Marshal methods, however, don't register anything with the JNI,
-instead they rely on the symbol lookup mechanism of the Java VM.
-Whenever a call to `native` Java method is JIT-ed and it is not
-registered previously using the `RegisterNatives` JNI function, Java
-VM will proceed to look for symbols in the process runtime image (e.g.
-using `dlopen` + `dlsym` calls on Unix) and, having found a matching
-symbol, use pointer to it as the target of the `native` Java method
-call.
+This is a representative *generated* shape, not a source file to edit.
+Application and instrumentation wrappers defer registration through a
+generated guarded `__md_registerNatives()` method where static initialization
+would be too early. The `registerNatives` declaration itself is **handwritten**
+in [`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java).
+
+At startup,
+[`JNIEnvInit`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs)
+installs the trimmable type and value managers and calls
+`TrimmableTypeMap.RegisterNativeMethods()`. That binds
+`mono/android/Runtime.registerNatives` to a managed callback using JNI
+`RegisterNatives`. When a generated JCW requests registration for its
+class, `TrimmableTypeMap.OnRegisterNatives` looks up that Java class in the
+generated map and asks its generated `IAndroidCallableWrapper` registration
+code to bind the class's `n_*` methods. ART can then call those registered
+methods, which transition through generated managed JNI-ABI entrypoints to
+the managed implementation.
+
+The [generator model](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
+records method name, JNI signature, and callback target for each native
+registration. For exported or directly callable managed methods,
+[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
+emits an `UnmanagedCallersOnly` entrypoint that converts JNI arguments, calls
+the managed method, converts its result, and handles exceptions. Other
+callbacks use the generated registration's corresponding marshal target.
+Do not confuse these **generated managed** entrypoints with the handwritten
+Java declarations or the old native registration table.
+
+## Startup and peer lifetime
+
+CoreCLR's [native host](../../../src/native/clr/host/host.cc) captures the
+Java VM at `JNI_OnLoad`, starts the managed runtime from
+`Runtime.initInternal`, and enters `JNIEnvInit.Initialize`. The native
+`Runtime.register` entrypoint remains a compatibility stub; TypeMap-based
+native registration is handled on the managed side.
+
+NativeAOT instead enters
+[`JavaInteropRuntime.JNI_OnLoad` / `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs),
+constructs a
+[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
+and calls `JNIEnvInit.InitializeNativeAotRuntime`. Both runtime paths
+register the same `TrimmableTypeMap` JNI callback, but NativeAOT cannot
+depend on CoreCLR's reflection-based fallback for missing mappings.
+[`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
+provides the generated proxy's AOT-safe peer creation hook.
+
+A managed `Java.Lang.Object` and its Java object are peers, not one object
+shared by two garbage collectors. Generated JCWs implement the Java-side
+[`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java)
+reference hooks; the runtime's
+[`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs)
+and `TrimmableTypeMapValueManager` register, find, replace, and finalize
+managed peers while respecting JNI reference ownership. Disposing a managed
+peer or letting collection retire a pair can remove the association; keeping
+a raw JNI handle after that does not keep the old managed instance alive.
+
+## Trimming, AOT, and diagnosing failures
+
+The [CoreCLR targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
+feed the generated TypeMap assemblies to ILLink as trimmable inputs. With
+`PublishTrimmed=true`, they regenerate JCWs into `typemap/linked-java/` from
+the **linked** assemblies, so compiled Java matches the surviving managed
+callbacks. Check `typemap/linked-java-files.txt` rather than only the
+pre-trim `java-files.txt` in such a build. The
+[NativeAOT targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
+feed TypeMaps to ILC and use its output plus the ACW map for Java shrinker
+configuration. Both pipelines depend on reachable managed types and their
+generated registrations; a method or type missing after trimming is not
+fixed by restoring a historical native TypeMap path.
+
+When investigating:
+
+1. Check the build's generated TypeMap DLL list, JCW list, `acw-map.txt`,
+   and compiled Java sources (post-trim `linked-java/` if applicable).
+   Compare the actual Java class/name/signature with the generated native
+   registration and its managed target.
+2. Check `adb logcat` for a Java `UnsatisfiedLinkError`, JNI registration
+   failure, or managed exception during activation; distinguish a missing
+   callback from a missing managed peer mapping. Inspect the runtime's
+   `TrimmableTypeMap` and generated proxy paths for the latter.
+3. For invalid or prematurely disposed JNI object references, use
+   [Debugging JNI Object Reference Crashes](debug-jni-objrefs.md). For build
+   errors about unsupported `AndroidTypeMapImplementation` values, see
+   [the build property](../../docs-mobile/building-apps/build-properties.md);
+   duplicate Java-visible constructor signatures are reported as
+   [XA4259](../../docs-mobile/messages/xa4259.md).
+
+The [trimmable TypeMap build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
+cover generation, trimming, NativeAOT and CoreCLR packaging, and incremental
+Java output. Start there when changing generated interop behavior.

From 68a715bf9ca159f72996045951a8e53d7fcfdd93 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:25:04 +0200
Subject: [PATCH 29/58] Expand trimmable JNI interop guide with generated code
 paths

Explain the former registration concepts using current TypeMap and JCW examples, managed UTF-8 JNI registration, ABI marshalling, startup, peer lifecycle, and trimming.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../guides/internals/JavaJNI_Interop.md       | 607 +++++++++++++-----
 1 file changed, 461 insertions(+), 146 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 7d06fa1f544..542a9c09078 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,167 +1,482 @@
-# Java and managed interoperability (trimmable TypeMap)
+# Java and managed interoperability with the trimmable TypeMap
 
-This guide describes the **current** .NET for Android application interop
-path for CoreCLR and NativeAOT. `AndroidTypeMapImplementation=trimmable` is the
-only supported application TypeMap implementation. The Java VM (ART) and the
-managed runtime communicate through JNI; the build supplies generated Java
-callable wrappers (JCWs) and managed TypeMap assemblies, while handwritten
-Java and managed runtime code connects those generated pieces. This is not a
-description of the former MonoVM/native LLVM TypeMap or assembly-rewriting
-pipeline.
+This is an internal guide to the interop path used by **CoreCLR and NativeAOT
+Android applications**. The Java VM (ART) and the managed runtime are separate
+environments in one process. JNI is the boundary in both directions: bound C#
+types call Java methods through Java.Interop, and Java calls managed methods
+through generated Java callable wrappers (JCWs) with registered JNI entrypoints.
 
-## What is generated
+`AndroidTypeMapImplementation=trimmable` is the only supported application
+TypeMap implementation. Earlier versions of this guide described a choice
+between reflection/delegate-based "dynamic" registration and native
+LLVM-generated marshal methods. Neither describes this path. Here, the build
+generates **managed** TypeMap assemblies (including proxy and marshal code)
+and Java sources; the managed runtime registers their native callbacks with
+ART. There is no application-level native TypeMap lookup table, generated
+`Java_...` symbol for each callback, or marshal-method callback rewriting.
 
-| Piece | Purpose and source |
+| Earlier guide | Trimmable TypeMap path |
 | --- | --- |
-| Bound managed API types | Managed callable wrappers for Android/Java APIs use `JniPeerMembers` to invoke Java methods. These are distinct from the app's Java callable wrappers; see [`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs) for an invocation. |
-| JCW `.java` files | Java classes for managed Java peers, with constructors and `n_*` native callbacks for Java-to-managed calls. [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) produces them from the scanned peer model. |
-| TypeMap DLLs | `_{AssemblyName}.TypeMap.dll` files hold mappings, proxy types, and native registration methods; `_Microsoft.Android.TypeMaps.dll` is the root that connects them. [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and [`RootTypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/RootTypeMapAssemblyGenerator.cs) emit these managed assemblies. |
-| Registration and manifest | The task generates `ApplicationRegistration.java` from the scanned peers (not from a Java template); it also writes the ACW map (`acw-map.txt`) and merged `AndroidManifest.xml`. |
-
-The [scanner](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
-reads assembly metadata to discover Java peers and their Java-visible
-constructors and methods. The
-[`GenerateTrimmableTypeMap` task](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
-drives the scan, validates it, emits the managed and Java outputs, and removes
-stale JCW sources. The
-[shared MSBuild targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
-run `_GenerateTrimmableTypeMap` after `CoreCompile`; their output lives under
-`obj/.../typemap/` (not in handwritten source). Inspect
-`typemap/typemap-assemblies.txt` and `typemap/java-files.txt` to see what
-that build actually generated. The
-[TypeMap build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
-documents target ordering, output stamps, and incremental regeneration.
-
-The root TypeMap assembly anchors the per-assembly TypeMaps and initializes
-the lookup dictionaries. Mapping attributes in those per-assembly DLLs
-associate Java names, managed types, and generated proxy types. ACW proxies
-implement `IAndroidCallableWrapper` for native registration; other proxies
-do not need that interface. These are **managed metadata**, not a lookup
-table in a native binary. The runtime
-[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-uses the mappings to resolve Java objects and managed peer types.
+| JCW static initializer built `__md_methods` and called `Runtime.register` with an assembly-qualified type name. | A generated JCW calls `Runtime.registerNatives(Class)`; the generated managed proxy supplies the registrations for that Java class. |
+| "Dynamic" registration used connector delegates and reflection/`Reflection.Emit` at runtime. | The scanner reads connector metadata to locate existing callbacks, but generated `UnmanagedCallersOnly` forwarders register their function pointers without making per-method delegates. |
+| "Marshal methods" relied on JNI `Java_...` native exports, native LLVM code, and a callback assembly rewriter. | The TypeMap emitter writes managed proxy/entrypoint IL; `RegisterNatives` binds method name/signature pairs to those entrypoints. |
+| JNI symbol mangling selected the native implementation; `_mm_wrapper` adapted booleans and exceptions. | The generated registration table uses NUL-terminated UTF-8 names/signatures; generated managed entrypoints perform JNI ABI conversion and exception handoff. |
 
-## Managed calls Java
+## Terms and a running example
 
-A bound C# method uses its `JniPeerMembers` and a JNI member signature to
-call Java through Java.Interop. For example,
-`Android.App.Activity.ReportFullyDrawn()` invokes
-`_members.InstanceMethods.InvokeVirtualVoidMethod(...)` with
-`"reportFullyDrawn.()V"` and the current peer. Static calls use the
-corresponding `StaticMethods` APIs. Arguments and return values cross JNI
-with the appropriate Java object references and value conversions. This
-direction does **not** call a JCW's `n_*` callback: the bound managed API
-is the caller, and the Java implementation is the callee.
+| Term | Meaning |
+| --- | --- |
+| Bound managed type (MCW) | A C# binding for an existing Java class, such as `Android.App.Activity`. Its `JniPeerMembers` invokes Java methods. |
+| Java callable wrapper (JCW, or ACW) | A *generated Java class* for a managed subclass or Java-visible implementation. Java overrides call `native n_*` methods, which lead back to managed code. |
+| TypeMap assembly | A *generated managed DLL* containing Java-name/managed-type associations, proxy types, and (for JCWs) registration and JNI entrypoint code. |
+| Java peer / managed peer | Two objects representing one interop instance, with separate runtimes and garbage collectors. JNI references and peer bookkeeping link their lifetimes. |
 
-When a JNI object arrives in managed code,
-[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
-resolves its Java type to a managed target/proxy using the generated map;
-[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
-reuses or constructs a managed peer for its JNI reference. Conversely, the
-type manager resolves managed Java-peer types to JNI type signatures when
-needed. The map is about **type and peer resolution**; it does not replace
-normal Java.Interop method invocation.
+For example, an application can subclass a bound `Activity`:
+
+```csharp
+using Android.App;
+using Android.OS;
 
-## Java calls managed code
+namespace MyApp
+{
+	[Activity (Name = "my.app.MainActivity", MainLauncher = true)]
+	public class MainActivity : Activity
+	{
+		protected override void OnCreate (Bundle? savedInstanceState)
+		{
+			base.OnCreate (savedInstanceState);
+			// Application work here.
+		}
+	}
+}
+```
+
+The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI
+signature `(Landroid/os/Bundle;)V`. The app override need not repeat
+`[Register]`: the scanner follows the registered base method through the
+override. The [scanner test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs)
+include both an explicitly registered `MainActivity` and an unannotated
+`UserActivity` override.
 
-The JCW is a real Java class generated for a managed peer. Its Java-visible
-methods forward to `native n_*` methods, and its constructors use generated
-`nctor_*` callbacks. The generator normally emits a per-class static
-initializer like:
+The corresponding JCW is roughly the following Java. This excerpt omits
+constructor and peer-reference code; its class name, registration call,
+override, and native callback name match the
+[JCW generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs):
 
 ```java
-static {
-    mono.android.Runtime.registerNatives (MyActivity.class);
+package my.app;
+
+public class MainActivity extends android.app.Activity
+        implements mono.android.IGCUserPeer
+{
+    static {
+        mono.android.Runtime.registerNatives (MainActivity.class);
+    }
+
+    @Override
+    public void onCreate (android.os.Bundle p0)
+    {
+        n_OnCreate_Landroid_os_Bundle_ (p0);
+    }
+
+    public native void n_OnCreate_Landroid_os_Bundle_ (android.os.Bundle p0);
 }
 ```
 
-This is a representative *generated* shape, not a source file to edit.
-Application and instrumentation wrappers defer registration through a
-generated guarded `__md_registerNatives()` method where static initialization
-would be too early. The `registerNatives` declaration itself is **handwritten**
-in [`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java).
-
-At startup,
-[`JNIEnvInit`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs)
-installs the trimmable type and value managers and calls
-`TrimmableTypeMap.RegisterNativeMethods()`. That binds
-`mono/android/Runtime.registerNatives` to a managed callback using JNI
-`RegisterNatives`. When a generated JCW requests registration for its
-class, `TrimmableTypeMap.OnRegisterNatives` looks up that Java class in the
-generated map and asks its generated `IAndroidCallableWrapper` registration
-code to bind the class's `n_*` methods. ART can then call those registered
-methods, which transition through generated managed JNI-ABI entrypoints to
-the managed implementation.
-
-The [generator model](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
-records method name, JNI signature, and callback target for each native
-registration. For exported or directly callable managed methods,
-[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
-emits an `UnmanagedCallersOnly` entrypoint that converts JNI arguments, calls
-the managed method, converts its result, and handles exceptions. Other
-callbacks use the generated registration's corresponding marshal target.
-Do not confuse these **generated managed** entrypoints with the handwritten
-Java declarations or the old native registration table.
-
-## Startup and peer lifetime
-
-CoreCLR's [native host](../../../src/native/clr/host/host.cc) captures the
-Java VM at `JNI_OnLoad`, starts the managed runtime from
-`Runtime.initInternal`, and enters `JNIEnvInit.Initialize`. The native
-`Runtime.register` entrypoint remains a compatibility stub; TypeMap-based
-native registration is handled on the managed side.
-
-NativeAOT instead enters
-[`JavaInteropRuntime.JNI_OnLoad` / `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs),
-constructs a
-[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
-and calls `JNIEnvInit.InitializeNativeAotRuntime`. Both runtime paths
-register the same `TrimmableTypeMap` JNI callback, but NativeAOT cannot
-depend on CoreCLR's reflection-based fallback for missing mappings.
+The Java name is `my/app/MainActivity`, not the assembly-qualified C# type
+name. The method descriptor means one `android.os.Bundle` argument and a
+`void` return; the `L...;` denotes an object reference. The generated
+callback name is derived from binding metadata. `OnCreate` can call
+`base.OnCreate` back into Java: that is a **new managed-to-Java invocation**,
+not a second JCW registration.
+
+## Build-time representation
+
+[`GenerateTrimmableTypeMap`](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
+invokes the
+[`JavaPeerScanner`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
+on the application, references, and SDK/framework inputs. The scanner reads
+managed assembly metadata, including Java type names, `[Register]` methods,
+overrides of registered base/interface methods, constructors, `[Export]`
+members, and manifest components. The
+[`TrimmableTypeMapGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs)
+validates the resulting model and feeds both the Java and managed emitters.
+The app's generated JCWs do not come from the old
+`JavaCallableWrapperGenerator` / `MarshalMethodsClassifier` pipeline.
+
+The main outputs are:
+
+| Output | Role |
+| --- | --- |
+| `typemap/java/**/*.java` | Generated JCWs; [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) emits class declarations, constructors, overrides, native declarations, registration, and `IGCUserPeer` hooks. |
+| `typemap/_*.TypeMap.dll` | Per-input-assembly managed mapping attributes, proxy types, and JNI registration methods emitted by [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs). |
+| `typemap/_Microsoft.Android.TypeMaps.dll` | Root assembly anchoring the per-assembly TypeMaps; its generated `TypeMapLoader.Initialize()` wires the mapping dictionaries ([`RootTypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/RootTypeMapAssemblyGenerator.cs)). |
+| `typemap/typemap-assemblies.txt`, `java-files.txt`, `acw-map.txt` | Lists of actual generated assemblies/Java sources and Java-to-managed class mappings for the build. |
+| `android/src/net/dot/android/ApplicationRegistration.java`, merged `AndroidManifest.xml` | Generated application/instrumentation registration and manifest output. The former is built from scan results, **not** copied from a handwritten template. |
+
+Each per-assembly TypeMap contains assembly-level mapping attributes: a key
+such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the
+managed target type. The root references the per-assembly maps via
+`TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**,
+not `.cs` files; the C# in the sections below is an explanatory translation
+of emitted code, not a file that a developer should edit. See
+[`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs),
+[`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs),
+and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
+
+For the example Activity, think of a mapping like this **conceptual C#**:
+
+```csharp
+// Assembly metadata, emitted as IL rather than source:
+[assembly: TypeMapAttribute ("my/app/MainActivity",
+			     typeof (MainActivityProxy), typeof (MyApp.MainActivity))]
+
+// The emitted ACW proxy derives from JavaPeerProxy<T> and implements
+// IAndroidCallableWrapper. Proxy names are chosen by the emitter.
+```
+
+There is no source-level `TypeMap` attribute for application code to write.
+The real emitted `TypeMapAttribute` takes the Java key and proxy reference;
+its trimmable three-argument form also takes the target reference. An
+unconditional mapping has just the key and proxy reference, whereas the
+target reference on a conditional mapping lets the trimming pipeline
+discard entries for unused managed types. ACW proxies implement
+`IAndroidCallableWrapper` to register callbacks; other proxies need not.
 [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
-provides the generated proxy's AOT-safe peer creation hook.
+provides peer creation without `Activator.CreateInstance`.
+
+The
+[shared TypeMap targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
+run `_GenerateTrimmableTypeMap` after `CoreCompile`, compile the generated Java,
+and feed TypeMap DLLs to later steps. They track generated files and remove
+stale JCWs when the managed model changes. The target's stamp and output lists
+matter on incremental builds: a stale compiled Java class can otherwise
+outlive its managed callback.
+
+CoreCLR's [runtime-specific targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
+give the TypeMap DLLs to ILLink as trimmable inputs, with
+`_Microsoft.Android.TypeMaps` as the entry assembly. For
+`PublishTrimmed=true`, a **second scan of linked assemblies** regenerates
+JCWs in `typemap/linked-java/` and records `linked-java-files.txt`; the
+pre-trim Java set is not necessarily the packaged set. NativeAOT's
+[targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
+feed the generated DLLs to ILC and use its graph plus the ACW map when
+producing Java shrinker configuration. Both modes need reachable managed
+mapping/proxy/entrypoint code; they do not resurrect the native LLVM TypeMap.
+
+## Managed code calls Java
+
+Android bindings are managed wrappers for *existing* Java APIs. For example,
+[`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs)
+uses its bound member descriptor `"reportFullyDrawn.()V"` and calls
+`_members.InstanceMethods.InvokeVirtualVoidMethod (...)` on `this`. The
+essential C# shape (simplified) is:
+
+```csharp
+const string id = "reportFullyDrawn.()V";
+_members.InstanceMethods.InvokeVirtualVoidMethod (id, this, null);
+```
+
+Java.Interop resolves the class and method, invokes JNI with the peer's
+reference, and converts values/references according to the binding. Other
+bound methods use `JniArgumentValue` arrays and the appropriate virtual,
+nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a
+per-call method dispatch table: it is involved when Java classes and managed
+peers must be mapped or created, not in place of this invocation.
+
+When JNI returns an object or Java passes one into managed code,
+[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
+uses the Java name and generated mappings to select a managed target and
+proxy. [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
+looks for an existing managed peer or constructs one from the JNI handle.
+In the reverse direction, the type manager can obtain a JNI type signature
+for a managed peer type. Do not confuse a bound `Activity` MCW with the
+`MainActivity` JCW that implements Java-to-managed overrides.
+
+## Java code calls managed code
+
+### JCW declarations and per-class registration
+
+The generated Java `onCreate` calls its native
+`n_OnCreate_Landroid_os_Bundle_`; constructors similarly declare generated
+`nctor_*` native callbacks, and instantiate/activate the managed peer when
+appropriate. The class's static block calls
+`mono.android.Runtime.registerNatives (MainActivity.class)` when the class
+is first initialized. This is **per Java class**. Application and
+instrumentation JCWs instead use a guarded `__md_registerNatives()` helper
+called from their generated wrappers: registration in their static
+initializer can be too early in startup. The declaration of
+`registerNatives(Class)` in
+[`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java)
+is handwritten Java; individual JCWs and their registration calls are
+generated.
+
+There is no concatenated `__md_methods` string and no
+`Runtime.register("managed.Type, Assembly", ...)` registration in this path.
+The old JNI native-symbol mangling rules (`Java_package_Class_method...`)
+matter for symbol-lookup-based JNI code, but generated app JCW callbacks
+here are associated with their Java declarations through
+[`RegisterNatives`](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#registernatives):
+the Java method **name** and **signature** must match; no `Java_...` export
+is required for each method.
+
+### Runtime startup and registration handshake
 
-A managed `Java.Lang.Object` and its Java object are peers, not one object
-shared by two garbage collectors. Generated JCWs implement the Java-side
+On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures
+the VM at `JNI_OnLoad`, initializes the managed runtime from
+`Runtime.initInternal`, and enters
+[`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs).
+That installs `TrimmableTypeMapTypeManager` and
+`TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls
+`TrimmableTypeMap.RegisterNativeMethods()`. The old native
+`Runtime.register` entrypoint remains a compatibility stub, **not** the
+mechanism that registers every JCW.
+
+NativeAOT has its own entry:
+[`JavaInteropRuntime.JNI_OnLoad` and `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs)
+initialize the native host and a
+[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
+then call `JNIEnvInit.InitializeNativeAotRuntime()`. That path also registers
+the `TrimmableTypeMap` callback. NativeAOT cannot rely on CoreCLR's optional
+reflection-based peer construction path when a generated mapping is absent.
+Its generated `ApplicationRegistration.registerApplications()` calls
+`Runtime.registerNatives` for deferred startup types; the
+[`NativeAotRuntimeProvider`](../../../src/Xamarin.Android.Build.Tasks/Resources/NativeAotRuntimeProvider.java)
+invokes it after `JavaInteropRuntime.init(...)`.
+
+The first native binding is for `mono.android.Runtime.registerNatives`
+itself. [`TrimmableTypeMap.RegisterNativeMethods()`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+uses actual C# UTF-8 string literals for its JNI name and signature:
+
+```csharp
+fixed (byte* name = "registerNatives"u8,
+	     sig = "(Ljava/lang/Class;)V"u8) {
+	var method = new JniNativeMethod (name, sig, onRegisterNatives);
+	JniEnvironment.Types.RegisterNatives (runtimeClass.PeerReference, [method]);
+}
+```
+
+When a JCW's static block (or deferred helper) calls this Java native
+method, `TrimmableTypeMap.OnRegisterNatives` obtains the class's JNI
+name, finds its mapping/proxy, and calls the proxy's
+`IAndroidCallableWrapper.RegisterNatives(JniType)`. This registers the
+class's `n_*` and `nctor_*` methods with ART. The handwritten
+[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+does the lookup and handoff; the *per-class* method table is in a
+**generated managed TypeMap proxy**. The CoreCLR host does not supply a
+table of exported native functions for these app methods.
+
+### Generated registration in C# terms, including UTF-8
+
+The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
+emits sealed `JavaPeerProxy<T>` types for peers that need proxies. A JCW proxy also
+implements `IAndroidCallableWrapper`. For each native method it emits a
+`JniNativeMethod` containing a **pointer to a name**, a **pointer to a JNI
+signature**, and a **callable entrypoint pointer**. Its `RegisterNatives`
+method stack-allocates the entries and passes a `ReadOnlySpan<JniNativeMethod>`
+to `JniEnvironment.Types.RegisterNatives`. In **conceptual C#** (field and
+callback identifiers are illustrative, and the emitter writes IL):
+
+```csharp
+public unsafe void RegisterNatives (JniType jniType)
+{
+	JniNativeMethod* entries = stackalloc JniNativeMethod [1];
+	delegate* unmanaged<IntPtr, IntPtr, IntPtr, void> callback = &OnCreateEntry;
+	entries [0] = new JniNativeMethod (
+		&MethodNameUtf8, &MethodSignatureUtf8, (IntPtr) callback);
+	JniEnvironment.Types.RegisterNatives (
+		jniType.PeerReference,
+		new ReadOnlySpan<JniNativeMethod> (entries, 1));
+}
+```
+
+The [`PEAssemblyBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/PEAssemblyBuilder.cs)
+emits the actual name/signature fields as **NUL-terminated UTF-8 bytes in
+RVA data**. It can reuse identical signature data. A representative
+registration pair for the Activity example is
+`n_OnCreate_Landroid_os_Bundle_` and `(Landroid/os/Bundle;)V`; these
+identify the *native* Java declaration, not the C# method's
+`GetOnCreate...Handler` connector. There is no runtime decoding of
+`__md_methods` or per-callback `Java_...` export lookup. The handwritten
+`registerNatives` binding above likewise supplies `byte*` name/signature
+data, via C# `u8` literals.
+
+These name/signature bytes are not Java `String` argument marshalling. JNI's
+`GetStringUTFChars`/`NewStringUTF` APIs use
+[modified UTF-8](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/types.html#modified-utf-8-strings);
+the emitter stores the registration identifiers/descriptors as UTF-8
+with explicit NUL terminators (the ASCII names/signatures above have
+the same bytes in either encoding). For example, the CoreCLR
+[class-name lookup](../../../src/native/clr/host/host-shared.cc)
+obtains a Java class name via `GetStringUTFChars`, then converts its dots to
+slashes for a TypeMap key. Separately,
+[`JniRemappingLookup`](../../../src/Mono.Android/Microsoft.Android.Runtime/JniRemappingLookup.cs)
+encodes method names/signatures as UTF-8 with an explicit trailing NUL
+for native remapping lookup. Neither path is a substitute for marshalling
+Java `String` values across JNI.
+
+### From JNI ABI to a C# method
+
+JNI passes a `JNIEnv*`, the instance (`jobject`) or class (`jclass`), then
+the declared arguments. Java object handles appear as pointer-sized
+parameters; the generated managed entrypoints have JNI-ABI-compatible
+signatures and are marked `UnmanagedCallersOnly`. For the example callback,
+the ABI parameters correspond to `IntPtr env`, `IntPtr self`, and
+`IntPtr savedInstanceState`. This does **not** mean the app override accepts
+`IntPtr`: its bound callback/proxy converts the `Bundle` reference and
+dispatches the virtual C# `OnCreate(Bundle?)`.
+
+The scanner reads `[Register ("onCreate",
+"(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]`
+on the bound method (or its base). The third string is **connector metadata**,
+not the Java name of the native callback. For a normal registered binding,
+the scanner uses it to find the callback's declaring type and name (such as
+`n_OnCreate_Landroid_os_Bundle_`) and, when available, its *real* CLR
+signature. The
+[`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
+emits an `UnmanagedCallersOnly` forwarder to that existing callback, which
+then calls the virtual managed method. The old path made a delegate using
+`GetOnCreate...Handler` and `JNINativeWrapper.CreateDelegate`; the
+trimmable path derives callback metadata from the connector without
+creating a delegate per registration.
+
+`[Export]` (and methods classified as directly callable) take a different
+branch. The
+[`ModelBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
+marks them for a generated direct dispatcher. The
+[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
+emits the JNI entrypoint and argument conversions, calls the managed target,
+converts the return value, and copies back applicable array outputs; it
+does not invoke a connector callback. For example, a Java-visible C#
+method can be written as:
+
+```csharp
+[Java.Interop.Export ("handleClick")]
+public bool HandleClick (Android.Views.View view, int action)
+{
+	return action != 0;
+}
+```
+
+This is the shape exercised by the
+[export fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
+The Java wrapper has a `native` declaration with its calculated JNI
+signature; the generated managed dispatcher, not the developer's C#
+method directly, is the unmanaged entrypoint.
+
+JNI signatures are **not** CLR method signatures. JNI `Z` is an
+eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and
+`Landroid/os/Bundle;` a Java object reference. The emitted entrypoint
+uses JNI ABI types (a `byte` for a boolean); conversions such as
+`jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C#
+`bool`. For normal registered callbacks the generator uses the
+captured original callback signature where available: older bindings
+may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`.
+It must not assume that the callback signature is identical to the
+Java descriptor; see the scanner's
+[callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
+and [test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
+No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
+
+Both generated forwarders and direct dispatchers use a marshal-method
+frame: `BeginMarshalMethod`, a `try` around the managed call, exception
+handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in
+`finally`. An arbitrary managed exception is not simply allowed to
+escape across an unmanaged JNI boundary. Compare
+[`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
+with the
+[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
+
+The call sequence for a Java `onCreate(Bundle)` is therefore:
+
+1. ART enters the generated `MainActivity.onCreate`.
+2. That method calls its registered `n_OnCreate_Landroid_os_Bundle_`.
+3. JNI invokes the generated `UnmanagedCallersOnly` entrypoint for the
+   registered name/signature. For a bound override, it forwards to the
+   connector-derived bound callback; for a direct export it marshals and
+   invokes the target itself.
+4. Peer lookup/activation and argument conversion supply the managed
+   `MainActivity` and `Bundle`; virtual dispatch runs the app override.
+   A call to `base.OnCreate` then goes **managed-to-Java** through
+   `JniPeerMembers`.
+
+## Peer activation and lifetime
+
+A Java-side constructor and a managed-side constructor do not allocate
+one shared object. Generated JCW constructors call `super(...)` and,
+when the actual Java class matches the wrapper, a generated
+`nctor_*` callback to activate the matching managed peer. This class
+check matters when a JCW is further subclassed. For some startup
+types registration is deferred as described above. The generator
+produces the appropriate constructor shape from its scan; compare
+[`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs)
+and its [constructor tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs).
+
+On the managed side,
+[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+uses generated mapping attributes to resolve a Java class and target
+type. Its [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
+can create the managed object from a handle without late-bound
+`Activator.CreateInstance`; activation also accounts for an existing
+replaceable peer. [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
+resolves names/types, while
+[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
+checks for registered peers and handles construction/ownership.
+
+Every generated JCW implements the Java
 [`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java)
-reference hooks; the runtime's
+hooks `monodroidAddReference` and `monodroidClearReferences`. Managed
 [`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs)
-and `TrimmableTypeMapValueManager` register, find, replace, and finalize
-managed peers while respecting JNI reference ownership. Disposing a managed
-peer or letting collection retire a pair can remove the association; keeping
-a raw JNI handle after that does not keep the old managed instance alive.
-
-## Trimming, AOT, and diagnosing failures
-
-The [CoreCLR targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
-feed the generated TypeMap assemblies to ILLink as trimmable inputs. With
-`PublishTrimmed=true`, they regenerate JCWs into `typemap/linked-java/` from
-the **linked** assemblies, so compiled Java matches the surviving managed
-callbacks. Check `typemap/linked-java-files.txt` rather than only the
-pre-trim `java-files.txt` in such a build. The
-[NativeAOT targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
-feed TypeMaps to ILC and use its output plus the ACW map for Java shrinker
-configuration. Both pipelines depend on reachable managed types and their
-generated registrations; a method or type missing after trimming is not
-fixed by restoring a historical native TypeMap path.
-
-When investigating:
-
-1. Check the build's generated TypeMap DLL list, JCW list, `acw-map.txt`,
-   and compiled Java sources (post-trim `linked-java/` if applicable).
-   Compare the actual Java class/name/signature with the generated native
-   registration and its managed target.
-2. Check `adb logcat` for a Java `UnsatisfiedLinkError`, JNI registration
-   failure, or managed exception during activation; distinguish a missing
-   callback from a missing managed peer mapping. Inspect the runtime's
-   `TrimmableTypeMap` and generated proxy paths for the latter.
-3. For invalid or prematurely disposed JNI object references, use
-   [Debugging JNI Object Reference Crashes](debug-jni-objrefs.md). For build
-   errors about unsupported `AndroidTypeMapImplementation` values, see
+tracks add/peek/remove/finalize operations, and the GC bridge coordinates
+the two collectors. Local and global JNI references have different
+lifetimes: a managed wrapper may need a global reference to keep its
+peer accessible after a JNI call returns. `JniHandleOwnership` records
+whether an incoming reference is transferred. Calling `Dispose()` can
+remove the association; a raw `IntPtr` retained afterward is not a
+safe substitute for a live managed peer. For invalid reference
+diagnostics, see
+[Debugging JNI Object Reference Crashes](debug-jni-objrefs.md).
+
+## Diagnosing a broken interop path
+
+Start at the boundary where the failure occurs; these files distinguish
+build output, registration, and peer activation:
+
+1. **Missing or wrong Java class:** inspect the merged manifest,
+   `typemap/java/` (or CoreCLR's `typemap/linked-java/` after
+   trimming), `java-files.txt` / `linked-java-files.txt`, and
+   `acw-map.txt`. Confirm the expected Java name and base/override
+   signatures. A stale `.class` is not proof that a corresponding
+   TypeMap entry survived.
+2. **Unbound native method / `UnsatisfiedLinkError`:** compare the
+   generated JCW's `native` method **name and JNI descriptor** with
+   its generated proxy registration. Check whether
+   `mono.android.Runtime.registerNatives` ran for the class (or its
+   deferred helper did), and inspect `adb logcat` for the registration
+   exception. Do not search for a missing `Java_...` export in this
+   pipeline.
+3. **Wrong managed type or activation failure:** check
+   `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps`
+   assembly, `TrimmableTypeMap` lookup, proxy construction, and
+   `JavaMarshalRegisteredPeers`. Verify whether a Java callback came
+   from a managed-created peer or needs activation from a Java-created
+   peer. On NativeAOT a missing generated mapping cannot be rescued
+   by CoreCLR-only reflection.
+4. **Release/trim-only failure:** inspect the *linked* managed
+   assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and
+   shrinker rules. The pre-trim generated Java is not necessarily
+   packaged Java. The
+   [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
+   explains target stamps and stale-file handling.
+5. **JNI reference or marshal failure:** use `adb logcat` and
+   [the JNI reference guide](debug-jni-objrefs.md) for ownership and
+   collection problems. For unsupported TypeMap settings see
    [the build property](../../docs-mobile/building-apps/build-properties.md);
-   duplicate Java-visible constructor signatures are reported as
+   duplicate Java-visible constructor signatures produce
    [XA4259](../../docs-mobile/messages/xa4259.md).
 
-The [trimmable TypeMap build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
-cover generation, trimming, NativeAOT and CoreCLR packaging, and incremental
-Java output. Start there when changing generated interop behavior.
+The [TypeMap generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs),
+[JCW tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs),
+and [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
+exercise these paths. Compare their expected names/signatures against
+the generated DLL and Java files before changing runtime registration.

From 6fdc914884c254272771cdc8dfcd9bb4b55c3da9 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:29:37 +0200
Subject: [PATCH 30/58] Let editors wrap JNI interop guide prose

Keep Markdown paragraphs on one source line while preserving list, table, heading, and fenced code structure.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../guides/internals/JavaJNI_Interop.md       | 385 +++---------------
 1 file changed, 56 insertions(+), 329 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 542a9c09078..10d9b25ef4d 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,19 +1,8 @@
 # Java and managed interoperability with the trimmable TypeMap
 
-This is an internal guide to the interop path used by **CoreCLR and NativeAOT
-Android applications**. The Java VM (ART) and the managed runtime are separate
-environments in one process. JNI is the boundary in both directions: bound C#
-types call Java methods through Java.Interop, and Java calls managed methods
-through generated Java callable wrappers (JCWs) with registered JNI entrypoints.
-
-`AndroidTypeMapImplementation=trimmable` is the only supported application
-TypeMap implementation. Earlier versions of this guide described a choice
-between reflection/delegate-based "dynamic" registration and native
-LLVM-generated marshal methods. Neither describes this path. Here, the build
-generates **managed** TypeMap assemblies (including proxy and marshal code)
-and Java sources; the managed runtime registers their native callbacks with
-ART. There is no application-level native TypeMap lookup table, generated
-`Java_...` symbol for each callback, or marshal-method callback rewriting.
+This is an internal guide to the interop path used by **CoreCLR and NativeAOT Android applications**. The Java VM (ART) and the managed runtime are separate environments in one process. JNI is the boundary in both directions: bound C# types call Java methods through Java.Interop, and Java calls managed methods through generated Java callable wrappers (JCWs) with registered JNI entrypoints.
+
+`AndroidTypeMapImplementation=trimmable` is the only supported application TypeMap implementation. Earlier versions of this guide described a choice between reflection/delegate-based "dynamic" registration and native LLVM-generated marshal methods. Neither describes this path. Here, the build generates **managed** TypeMap assemblies (including proxy and marshal code) and Java sources; the managed runtime registers their native callbacks with ART. There is no application-level native TypeMap lookup table, generated `Java_...` symbol for each callback, or marshal-method callback rewriting.
 
 | Earlier guide | Trimmable TypeMap path |
 | --- | --- |
@@ -51,17 +40,9 @@ namespace MyApp
 }
 ```
 
-The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI
-signature `(Landroid/os/Bundle;)V`. The app override need not repeat
-`[Register]`: the scanner follows the registered base method through the
-override. The [scanner test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs)
-include both an explicitly registered `MainActivity` and an unannotated
-`UserActivity` override.
+The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI signature `(Landroid/os/Bundle;)V`. The app override need not repeat `[Register]`: the scanner follows the registered base method through the override. The [scanner test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs) include both an explicitly registered `MainActivity` and an unannotated `UserActivity` override.
 
-The corresponding JCW is roughly the following Java. This excerpt omits
-constructor and peer-reference code; its class name, registration call,
-override, and native callback name match the
-[JCW generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs):
+The corresponding JCW is roughly the following Java. This excerpt omits constructor and peer-reference code; its class name, registration call, override, and native callback name match the [JCW generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs):
 
 ```java
 package my.app;
@@ -83,26 +64,11 @@ public class MainActivity extends android.app.Activity
 }
 ```
 
-The Java name is `my/app/MainActivity`, not the assembly-qualified C# type
-name. The method descriptor means one `android.os.Bundle` argument and a
-`void` return; the `L...;` denotes an object reference. The generated
-callback name is derived from binding metadata. `OnCreate` can call
-`base.OnCreate` back into Java: that is a **new managed-to-Java invocation**,
-not a second JCW registration.
+The Java name is `my/app/MainActivity`, not the assembly-qualified C# type name. The method descriptor means one `android.os.Bundle` argument and a `void` return; the `L...;` denotes an object reference. The generated callback name is derived from binding metadata. `OnCreate` can call `base.OnCreate` back into Java: that is a **new managed-to-Java invocation**, not a second JCW registration.
 
 ## Build-time representation
 
-[`GenerateTrimmableTypeMap`](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
-invokes the
-[`JavaPeerScanner`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
-on the application, references, and SDK/framework inputs. The scanner reads
-managed assembly metadata, including Java type names, `[Register]` methods,
-overrides of registered base/interface methods, constructors, `[Export]`
-members, and manifest components. The
-[`TrimmableTypeMapGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs)
-validates the resulting model and feeds both the Java and managed emitters.
-The app's generated JCWs do not come from the old
-`JavaCallableWrapperGenerator` / `MarshalMethodsClassifier` pipeline.
+[`GenerateTrimmableTypeMap`](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs) invokes the [`JavaPeerScanner`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs) on the application, references, and SDK/framework inputs. The scanner reads managed assembly metadata, including Java type names, `[Register]` methods, overrides of registered base/interface methods, constructors, `[Export]` members, and manifest components. The [`TrimmableTypeMapGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs) validates the resulting model and feeds both the Java and managed emitters. The app's generated JCWs do not come from the old `JavaCallableWrapperGenerator` / `MarshalMethodsClassifier` pipeline.
 
 The main outputs are:
 
@@ -114,15 +80,7 @@ The main outputs are:
 | `typemap/typemap-assemblies.txt`, `java-files.txt`, `acw-map.txt` | Lists of actual generated assemblies/Java sources and Java-to-managed class mappings for the build. |
 | `android/src/net/dot/android/ApplicationRegistration.java`, merged `AndroidManifest.xml` | Generated application/instrumentation registration and manifest output. The former is built from scan results, **not** copied from a handwritten template. |
 
-Each per-assembly TypeMap contains assembly-level mapping attributes: a key
-such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the
-managed target type. The root references the per-assembly maps via
-`TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**,
-not `.cs` files; the C# in the sections below is an explanatory translation
-of emitted code, not a file that a developer should edit. See
-[`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs),
-[`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs),
-and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
+Each per-assembly TypeMap contains assembly-level mapping attributes: a key such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the managed target type. The root references the per-assembly maps via `TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**, not `.cs` files; the C# in the sections below is an explanatory translation of emitted code, not a file that a developer should edit. See [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
 
 For the example Activity, think of a mapping like this **conceptual C#**:
 
@@ -135,118 +93,40 @@ For the example Activity, think of a mapping like this **conceptual C#**:
 // IAndroidCallableWrapper. Proxy names are chosen by the emitter.
 ```
 
-There is no source-level `TypeMap` attribute for application code to write.
-The real emitted `TypeMapAttribute` takes the Java key and proxy reference;
-its trimmable three-argument form also takes the target reference. An
-unconditional mapping has just the key and proxy reference, whereas the
-target reference on a conditional mapping lets the trimming pipeline
-discard entries for unused managed types. ACW proxies implement
-`IAndroidCallableWrapper` to register callbacks; other proxies need not.
-[`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
-provides peer creation without `Activator.CreateInstance`.
-
-The
-[shared TypeMap targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
-run `_GenerateTrimmableTypeMap` after `CoreCompile`, compile the generated Java,
-and feed TypeMap DLLs to later steps. They track generated files and remove
-stale JCWs when the managed model changes. The target's stamp and output lists
-matter on incremental builds: a stale compiled Java class can otherwise
-outlive its managed callback.
-
-CoreCLR's [runtime-specific targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
-give the TypeMap DLLs to ILLink as trimmable inputs, with
-`_Microsoft.Android.TypeMaps` as the entry assembly. For
-`PublishTrimmed=true`, a **second scan of linked assemblies** regenerates
-JCWs in `typemap/linked-java/` and records `linked-java-files.txt`; the
-pre-trim Java set is not necessarily the packaged set. NativeAOT's
-[targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
-feed the generated DLLs to ILC and use its graph plus the ACW map when
-producing Java shrinker configuration. Both modes need reachable managed
-mapping/proxy/entrypoint code; they do not resurrect the native LLVM TypeMap.
+There is no source-level `TypeMap` attribute for application code to write. The real emitted `TypeMapAttribute` takes the Java key and proxy reference; its trimmable three-argument form also takes the target reference. An unconditional mapping has just the key and proxy reference, whereas the target reference on a conditional mapping lets the trimming pipeline discard entries for unused managed types. ACW proxies implement `IAndroidCallableWrapper` to register callbacks; other proxies need not. [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs) provides peer creation without `Activator.CreateInstance`.
+
+The [shared TypeMap targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets) run `_GenerateTrimmableTypeMap` after `CoreCompile`, compile the generated Java, and feed TypeMap DLLs to later steps. They track generated files and remove stale JCWs when the managed model changes. The target's stamp and output lists matter on incremental builds: a stale compiled Java class can otherwise outlive its managed callback.
+
+CoreCLR's [runtime-specific targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets) give the TypeMap DLLs to ILLink as trimmable inputs, with `_Microsoft.Android.TypeMaps` as the entry assembly. For `PublishTrimmed=true`, a **second scan of linked assemblies** regenerates JCWs in `typemap/linked-java/` and records `linked-java-files.txt`; the pre-trim Java set is not necessarily the packaged set. NativeAOT's [targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets) feed the generated DLLs to ILC and use its graph plus the ACW map when producing Java shrinker configuration. Both modes need reachable managed mapping/proxy/entrypoint code; they do not resurrect the native LLVM TypeMap.
 
 ## Managed code calls Java
 
-Android bindings are managed wrappers for *existing* Java APIs. For example,
-[`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs)
-uses its bound member descriptor `"reportFullyDrawn.()V"` and calls
-`_members.InstanceMethods.InvokeVirtualVoidMethod (...)` on `this`. The
-essential C# shape (simplified) is:
+Android bindings are managed wrappers for *existing* Java APIs. For example, [`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs) uses its bound member descriptor `"reportFullyDrawn.()V"` and calls `_members.InstanceMethods.InvokeVirtualVoidMethod (...)` on `this`. The essential C# shape (simplified) is:
 
 ```csharp
 const string id = "reportFullyDrawn.()V";
 _members.InstanceMethods.InvokeVirtualVoidMethod (id, this, null);
 ```
 
-Java.Interop resolves the class and method, invokes JNI with the peer's
-reference, and converts values/references according to the binding. Other
-bound methods use `JniArgumentValue` arrays and the appropriate virtual,
-nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a
-per-call method dispatch table: it is involved when Java classes and managed
-peers must be mapped or created, not in place of this invocation.
-
-When JNI returns an object or Java passes one into managed code,
-[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
-uses the Java name and generated mappings to select a managed target and
-proxy. [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
-looks for an existing managed peer or constructs one from the JNI handle.
-In the reverse direction, the type manager can obtain a JNI type signature
-for a managed peer type. Do not confuse a bound `Activity` MCW with the
-`MainActivity` JCW that implements Java-to-managed overrides.
+Java.Interop resolves the class and method, invokes JNI with the peer's reference, and converts values/references according to the binding. Other bound methods use `JniArgumentValue` arrays and the appropriate virtual, nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a per-call method dispatch table: it is involved when Java classes and managed peers must be mapped or created, not in place of this invocation.
+
+When JNI returns an object or Java passes one into managed code, [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs) uses the Java name and generated mappings to select a managed target and proxy. [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs) looks for an existing managed peer or constructs one from the JNI handle. In the reverse direction, the type manager can obtain a JNI type signature for a managed peer type. Do not confuse a bound `Activity` MCW with the `MainActivity` JCW that implements Java-to-managed overrides.
 
 ## Java code calls managed code
 
 ### JCW declarations and per-class registration
 
-The generated Java `onCreate` calls its native
-`n_OnCreate_Landroid_os_Bundle_`; constructors similarly declare generated
-`nctor_*` native callbacks, and instantiate/activate the managed peer when
-appropriate. The class's static block calls
-`mono.android.Runtime.registerNatives (MainActivity.class)` when the class
-is first initialized. This is **per Java class**. Application and
-instrumentation JCWs instead use a guarded `__md_registerNatives()` helper
-called from their generated wrappers: registration in their static
-initializer can be too early in startup. The declaration of
-`registerNatives(Class)` in
-[`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java)
-is handwritten Java; individual JCWs and their registration calls are
-generated.
-
-There is no concatenated `__md_methods` string and no
-`Runtime.register("managed.Type, Assembly", ...)` registration in this path.
-The old JNI native-symbol mangling rules (`Java_package_Class_method...`)
-matter for symbol-lookup-based JNI code, but generated app JCW callbacks
-here are associated with their Java declarations through
-[`RegisterNatives`](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#registernatives):
-the Java method **name** and **signature** must match; no `Java_...` export
-is required for each method.
+The generated Java `onCreate` calls its native `n_OnCreate_Landroid_os_Bundle_`; constructors similarly declare generated `nctor_*` native callbacks, and instantiate/activate the managed peer when appropriate. The class's static block calls `mono.android.Runtime.registerNatives (MainActivity.class)` when the class is first initialized. This is **per Java class**. Application and instrumentation JCWs instead use a guarded `__md_registerNatives()` helper called from their generated wrappers: registration in their static initializer can be too early in startup. The declaration of `registerNatives(Class)` in [`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java) is handwritten Java; individual JCWs and their registration calls are generated.
+
+There is no concatenated `__md_methods` string and no `Runtime.register("managed.Type, Assembly", ...)` registration in this path. The old JNI native-symbol mangling rules (`Java_package_Class_method...`) matter for symbol-lookup-based JNI code, but generated app JCW callbacks here are associated with their Java declarations through [`RegisterNatives`](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#registernatives): the Java method **name** and **signature** must match; no `Java_...` export is required for each method.
 
 ### Runtime startup and registration handshake
 
-On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures
-the VM at `JNI_OnLoad`, initializes the managed runtime from
-`Runtime.initInternal`, and enters
-[`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs).
-That installs `TrimmableTypeMapTypeManager` and
-`TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls
-`TrimmableTypeMap.RegisterNativeMethods()`. The old native
-`Runtime.register` entrypoint remains a compatibility stub, **not** the
-mechanism that registers every JCW.
-
-NativeAOT has its own entry:
-[`JavaInteropRuntime.JNI_OnLoad` and `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs)
-initialize the native host and a
-[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
-then call `JNIEnvInit.InitializeNativeAotRuntime()`. That path also registers
-the `TrimmableTypeMap` callback. NativeAOT cannot rely on CoreCLR's optional
-reflection-based peer construction path when a generated mapping is absent.
-Its generated `ApplicationRegistration.registerApplications()` calls
-`Runtime.registerNatives` for deferred startup types; the
-[`NativeAotRuntimeProvider`](../../../src/Xamarin.Android.Build.Tasks/Resources/NativeAotRuntimeProvider.java)
-invokes it after `JavaInteropRuntime.init(...)`.
-
-The first native binding is for `mono.android.Runtime.registerNatives`
-itself. [`TrimmableTypeMap.RegisterNativeMethods()`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-uses actual C# UTF-8 string literals for its JNI name and signature:
+On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures the VM at `JNI_OnLoad`, initializes the managed runtime from `Runtime.initInternal`, and enters [`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs). That installs `TrimmableTypeMapTypeManager` and `TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls `TrimmableTypeMap.RegisterNativeMethods()`. The old native `Runtime.register` entrypoint remains a compatibility stub, **not** the mechanism that registers every JCW.
+
+NativeAOT has its own entry: [`JavaInteropRuntime.JNI_OnLoad` and `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs) initialize the native host and a [`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs), then call `JNIEnvInit.InitializeNativeAotRuntime()`. That path also registers the `TrimmableTypeMap` callback. NativeAOT cannot rely on CoreCLR's optional reflection-based peer construction path when a generated mapping is absent. Its generated `ApplicationRegistration.registerApplications()` calls `Runtime.registerNatives` for deferred startup types; the [`NativeAotRuntimeProvider`](../../../src/Xamarin.Android.Build.Tasks/Resources/NativeAotRuntimeProvider.java) invokes it after `JavaInteropRuntime.init(...)`.
+
+The first native binding is for `mono.android.Runtime.registerNatives` itself. [`TrimmableTypeMap.RegisterNativeMethods()`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs) uses actual C# UTF-8 string literals for its JNI name and signature:
 
 ```csharp
 fixed (byte* name = "registerNatives"u8,
@@ -256,26 +136,11 @@ fixed (byte* name = "registerNatives"u8,
 }
 ```
 
-When a JCW's static block (or deferred helper) calls this Java native
-method, `TrimmableTypeMap.OnRegisterNatives` obtains the class's JNI
-name, finds its mapping/proxy, and calls the proxy's
-`IAndroidCallableWrapper.RegisterNatives(JniType)`. This registers the
-class's `n_*` and `nctor_*` methods with ART. The handwritten
-[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-does the lookup and handoff; the *per-class* method table is in a
-**generated managed TypeMap proxy**. The CoreCLR host does not supply a
-table of exported native functions for these app methods.
+When a JCW's static block (or deferred helper) calls this Java native method, `TrimmableTypeMap.OnRegisterNatives` obtains the class's JNI name, finds its mapping/proxy, and calls the proxy's `IAndroidCallableWrapper.RegisterNatives(JniType)`. This registers the class's `n_*` and `nctor_*` methods with ART. The handwritten [`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs) does the lookup and handoff; the *per-class* method table is in a **generated managed TypeMap proxy**. The CoreCLR host does not supply a table of exported native functions for these app methods.
 
 ### Generated registration in C# terms, including UTF-8
 
-The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
-emits sealed `JavaPeerProxy<T>` types for peers that need proxies. A JCW proxy also
-implements `IAndroidCallableWrapper`. For each native method it emits a
-`JniNativeMethod` containing a **pointer to a name**, a **pointer to a JNI
-signature**, and a **callable entrypoint pointer**. Its `RegisterNatives`
-method stack-allocates the entries and passes a `ReadOnlySpan<JniNativeMethod>`
-to `JniEnvironment.Types.RegisterNatives`. In **conceptual C#** (field and
-callback identifiers are illustrative, and the emitter writes IL):
+The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) emits sealed `JavaPeerProxy<T>` types for peers that need proxies. A JCW proxy also implements `IAndroidCallableWrapper`. For each native method it emits a `JniNativeMethod` containing a **pointer to a name**, a **pointer to a JNI signature**, and a **callable entrypoint pointer**. Its `RegisterNatives` method stack-allocates the entries and passes a `ReadOnlySpan<JniNativeMethod>` to `JniEnvironment.Types.RegisterNatives`. In **conceptual C#** (field and callback identifiers are illustrative, and the emitter writes IL):
 
 ```csharp
 public unsafe void RegisterNatives (JniType jniType)
@@ -290,65 +155,17 @@ public unsafe void RegisterNatives (JniType jniType)
 }
 ```
 
-The [`PEAssemblyBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/PEAssemblyBuilder.cs)
-emits the actual name/signature fields as **NUL-terminated UTF-8 bytes in
-RVA data**. It can reuse identical signature data. A representative
-registration pair for the Activity example is
-`n_OnCreate_Landroid_os_Bundle_` and `(Landroid/os/Bundle;)V`; these
-identify the *native* Java declaration, not the C# method's
-`GetOnCreate...Handler` connector. There is no runtime decoding of
-`__md_methods` or per-callback `Java_...` export lookup. The handwritten
-`registerNatives` binding above likewise supplies `byte*` name/signature
-data, via C# `u8` literals.
-
-These name/signature bytes are not Java `String` argument marshalling. JNI's
-`GetStringUTFChars`/`NewStringUTF` APIs use
-[modified UTF-8](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/types.html#modified-utf-8-strings);
-the emitter stores the registration identifiers/descriptors as UTF-8
-with explicit NUL terminators (the ASCII names/signatures above have
-the same bytes in either encoding). For example, the CoreCLR
-[class-name lookup](../../../src/native/clr/host/host-shared.cc)
-obtains a Java class name via `GetStringUTFChars`, then converts its dots to
-slashes for a TypeMap key. Separately,
-[`JniRemappingLookup`](../../../src/Mono.Android/Microsoft.Android.Runtime/JniRemappingLookup.cs)
-encodes method names/signatures as UTF-8 with an explicit trailing NUL
-for native remapping lookup. Neither path is a substitute for marshalling
-Java `String` values across JNI.
+The [`PEAssemblyBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/PEAssemblyBuilder.cs) emits the actual name/signature fields as **NUL-terminated UTF-8 bytes in RVA data**. It can reuse identical signature data. A representative registration pair for the Activity example is `n_OnCreate_Landroid_os_Bundle_` and `(Landroid/os/Bundle;)V`; these identify the *native* Java declaration, not the C# method's `GetOnCreate...Handler` connector. There is no runtime decoding of `__md_methods` or per-callback `Java_...` export lookup. The handwritten `registerNatives` binding above likewise supplies `byte*` name/signature data, via C# `u8` literals.
+
+These name/signature bytes are not Java `String` argument marshalling. JNI's `GetStringUTFChars`/`NewStringUTF` APIs use [modified UTF-8](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/types.html#modified-utf-8-strings); the emitter stores the registration identifiers/descriptors as UTF-8 with explicit NUL terminators (the ASCII names/signatures above have the same bytes in either encoding). For example, the CoreCLR [class-name lookup](../../../src/native/clr/host/host-shared.cc) obtains a Java class name via `GetStringUTFChars`, then converts its dots to slashes for a TypeMap key. Separately, [`JniRemappingLookup`](../../../src/Mono.Android/Microsoft.Android.Runtime/JniRemappingLookup.cs) encodes method names/signatures as UTF-8 with an explicit trailing NUL for native remapping lookup. Neither path is a substitute for marshalling Java `String` values across JNI.
 
 ### From JNI ABI to a C# method
 
-JNI passes a `JNIEnv*`, the instance (`jobject`) or class (`jclass`), then
-the declared arguments. Java object handles appear as pointer-sized
-parameters; the generated managed entrypoints have JNI-ABI-compatible
-signatures and are marked `UnmanagedCallersOnly`. For the example callback,
-the ABI parameters correspond to `IntPtr env`, `IntPtr self`, and
-`IntPtr savedInstanceState`. This does **not** mean the app override accepts
-`IntPtr`: its bound callback/proxy converts the `Bundle` reference and
-dispatches the virtual C# `OnCreate(Bundle?)`.
-
-The scanner reads `[Register ("onCreate",
-"(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]`
-on the bound method (or its base). The third string is **connector metadata**,
-not the Java name of the native callback. For a normal registered binding,
-the scanner uses it to find the callback's declaring type and name (such as
-`n_OnCreate_Landroid_os_Bundle_`) and, when available, its *real* CLR
-signature. The
-[`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
-emits an `UnmanagedCallersOnly` forwarder to that existing callback, which
-then calls the virtual managed method. The old path made a delegate using
-`GetOnCreate...Handler` and `JNINativeWrapper.CreateDelegate`; the
-trimmable path derives callback metadata from the connector without
-creating a delegate per registration.
-
-`[Export]` (and methods classified as directly callable) take a different
-branch. The
-[`ModelBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
-marks them for a generated direct dispatcher. The
-[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
-emits the JNI entrypoint and argument conversions, calls the managed target,
-converts the return value, and copies back applicable array outputs; it
-does not invoke a connector callback. For example, a Java-visible C#
-method can be written as:
+JNI passes a `JNIEnv*`, the instance (`jobject`) or class (`jclass`), then the declared arguments. Java object handles appear as pointer-sized parameters; the generated managed entrypoints have JNI-ABI-compatible signatures and are marked `UnmanagedCallersOnly`. For the example callback, the ABI parameters correspond to `IntPtr env`, `IntPtr self`, and `IntPtr savedInstanceState`. This does **not** mean the app override accepts `IntPtr`: its bound callback/proxy converts the `Bundle` reference and dispatches the virtual C# `OnCreate(Bundle?)`.
+
+The scanner reads `[Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]` on the bound method (or its base). The third string is **connector metadata**, not the Java name of the native callback. For a normal registered binding, the scanner uses it to find the callback's declaring type and name (such as `n_OnCreate_Landroid_os_Bundle_`) and, when available, its *real* CLR signature. The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) emits an `UnmanagedCallersOnly` forwarder to that existing callback, which then calls the virtual managed method. The old path made a delegate using `GetOnCreate...Handler` and `JNINativeWrapper.CreateDelegate`; the trimmable path derives callback metadata from the connector without creating a delegate per registration.
+
+`[Export]` (and methods classified as directly callable) take a different branch. The [`ModelBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs) marks them for a generated direct dispatcher. The [`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs) emits the JNI entrypoint and argument conversions, calls the managed target, converts the return value, and copies back applicable array outputs; it does not invoke a connector callback. For example, a Java-visible C# method can be written as:
 
 ```csharp
 [Java.Interop.Export ("handleClick")]
@@ -358,125 +175,35 @@ public bool HandleClick (Android.Views.View view, int action)
 }
 ```
 
-This is the shape exercised by the
-[export fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
-The Java wrapper has a `native` declaration with its calculated JNI
-signature; the generated managed dispatcher, not the developer's C#
-method directly, is the unmanaged entrypoint.
-
-JNI signatures are **not** CLR method signatures. JNI `Z` is an
-eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and
-`Landroid/os/Bundle;` a Java object reference. The emitted entrypoint
-uses JNI ABI types (a `byte` for a boolean); conversions such as
-`jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C#
-`bool`. For normal registered callbacks the generator uses the
-captured original callback signature where available: older bindings
-may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`.
-It must not assume that the callback signature is identical to the
-Java descriptor; see the scanner's
-[callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
-and [test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
-No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
-
-Both generated forwarders and direct dispatchers use a marshal-method
-frame: `BeginMarshalMethod`, a `try` around the managed call, exception
-handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in
-`finally`. An arbitrary managed exception is not simply allowed to
-escape across an unmanaged JNI boundary. Compare
-[`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
-with the
-[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
+This is the shape exercised by the [export fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs). The Java wrapper has a `native` declaration with its calculated JNI signature; the generated managed dispatcher, not the developer's C# method directly, is the unmanaged entrypoint.
+
+JNI signatures are **not** CLR method signatures. JNI `Z` is an eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and `Landroid/os/Bundle;` a Java object reference. The emitted entrypoint uses JNI ABI types (a `byte` for a boolean); conversions such as `jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C# `bool`. For normal registered callbacks the generator uses the captured original callback signature where available: older bindings may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`. It must not assume that the callback signature is identical to the Java descriptor; see the scanner's [callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs) and [test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs). No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
+
+Both generated forwarders and direct dispatchers use a marshal-method frame: `BeginMarshalMethod`, a `try` around the managed call, exception handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in `finally`. An arbitrary managed exception is not simply allowed to escape across an unmanaged JNI boundary. Compare [`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) with the [`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
 
 The call sequence for a Java `onCreate(Bundle)` is therefore:
 
 1. ART enters the generated `MainActivity.onCreate`.
 2. That method calls its registered `n_OnCreate_Landroid_os_Bundle_`.
-3. JNI invokes the generated `UnmanagedCallersOnly` entrypoint for the
-   registered name/signature. For a bound override, it forwards to the
-   connector-derived bound callback; for a direct export it marshals and
-   invokes the target itself.
-4. Peer lookup/activation and argument conversion supply the managed
-   `MainActivity` and `Bundle`; virtual dispatch runs the app override.
-   A call to `base.OnCreate` then goes **managed-to-Java** through
-   `JniPeerMembers`.
+3. JNI invokes the generated `UnmanagedCallersOnly` entrypoint for the registered name/signature. For a bound override, it forwards to the connector-derived bound callback; for a direct export it marshals and invokes the target itself.
+4. Peer lookup/activation and argument conversion supply the managed `MainActivity` and `Bundle`; virtual dispatch runs the app override. A call to `base.OnCreate` then goes **managed-to-Java** through `JniPeerMembers`.
 
 ## Peer activation and lifetime
 
-A Java-side constructor and a managed-side constructor do not allocate
-one shared object. Generated JCW constructors call `super(...)` and,
-when the actual Java class matches the wrapper, a generated
-`nctor_*` callback to activate the matching managed peer. This class
-check matters when a JCW is further subclassed. For some startup
-types registration is deferred as described above. The generator
-produces the appropriate constructor shape from its scan; compare
-[`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs)
-and its [constructor tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs).
-
-On the managed side,
-[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-uses generated mapping attributes to resolve a Java class and target
-type. Its [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
-can create the managed object from a handle without late-bound
-`Activator.CreateInstance`; activation also accounts for an existing
-replaceable peer. [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
-resolves names/types, while
-[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
-checks for registered peers and handles construction/ownership.
-
-Every generated JCW implements the Java
-[`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java)
-hooks `monodroidAddReference` and `monodroidClearReferences`. Managed
-[`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs)
-tracks add/peek/remove/finalize operations, and the GC bridge coordinates
-the two collectors. Local and global JNI references have different
-lifetimes: a managed wrapper may need a global reference to keep its
-peer accessible after a JNI call returns. `JniHandleOwnership` records
-whether an incoming reference is transferred. Calling `Dispose()` can
-remove the association; a raw `IntPtr` retained afterward is not a
-safe substitute for a live managed peer. For invalid reference
-diagnostics, see
-[Debugging JNI Object Reference Crashes](debug-jni-objrefs.md).
+A Java-side constructor and a managed-side constructor do not allocate one shared object. Generated JCW constructors call `super(...)` and, when the actual Java class matches the wrapper, a generated `nctor_*` callback to activate the matching managed peer. This class check matters when a JCW is further subclassed. For some startup types registration is deferred as described above. The generator produces the appropriate constructor shape from its scan; compare [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) and its [constructor tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs).
+
+On the managed side, [`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs) uses generated mapping attributes to resolve a Java class and target type. Its [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs) can create the managed object from a handle without late-bound `Activator.CreateInstance`; activation also accounts for an existing replaceable peer. [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs) resolves names/types, while [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs) checks for registered peers and handles construction/ownership.
+
+Every generated JCW implements the Java [`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java) hooks `monodroidAddReference` and `monodroidClearReferences`. Managed [`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs) tracks add/peek/remove/finalize operations, and the GC bridge coordinates the two collectors. Local and global JNI references have different lifetimes: a managed wrapper may need a global reference to keep its peer accessible after a JNI call returns. `JniHandleOwnership` records whether an incoming reference is transferred. Calling `Dispose()` can remove the association; a raw `IntPtr` retained afterward is not a safe substitute for a live managed peer. For invalid reference diagnostics, see [Debugging JNI Object Reference Crashes](debug-jni-objrefs.md).
 
 ## Diagnosing a broken interop path
 
-Start at the boundary where the failure occurs; these files distinguish
-build output, registration, and peer activation:
-
-1. **Missing or wrong Java class:** inspect the merged manifest,
-   `typemap/java/` (or CoreCLR's `typemap/linked-java/` after
-   trimming), `java-files.txt` / `linked-java-files.txt`, and
-   `acw-map.txt`. Confirm the expected Java name and base/override
-   signatures. A stale `.class` is not proof that a corresponding
-   TypeMap entry survived.
-2. **Unbound native method / `UnsatisfiedLinkError`:** compare the
-   generated JCW's `native` method **name and JNI descriptor** with
-   its generated proxy registration. Check whether
-   `mono.android.Runtime.registerNatives` ran for the class (or its
-   deferred helper did), and inspect `adb logcat` for the registration
-   exception. Do not search for a missing `Java_...` export in this
-   pipeline.
-3. **Wrong managed type or activation failure:** check
-   `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps`
-   assembly, `TrimmableTypeMap` lookup, proxy construction, and
-   `JavaMarshalRegisteredPeers`. Verify whether a Java callback came
-   from a managed-created peer or needs activation from a Java-created
-   peer. On NativeAOT a missing generated mapping cannot be rescued
-   by CoreCLR-only reflection.
-4. **Release/trim-only failure:** inspect the *linked* managed
-   assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and
-   shrinker rules. The pre-trim generated Java is not necessarily
-   packaged Java. The
-   [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
-   explains target stamps and stale-file handling.
-5. **JNI reference or marshal failure:** use `adb logcat` and
-   [the JNI reference guide](debug-jni-objrefs.md) for ownership and
-   collection problems. For unsupported TypeMap settings see
-   [the build property](../../docs-mobile/building-apps/build-properties.md);
-   duplicate Java-visible constructor signatures produce
-   [XA4259](../../docs-mobile/messages/xa4259.md).
-
-The [TypeMap generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs),
-[JCW tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs),
-and [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
-exercise these paths. Compare their expected names/signatures against
-the generated DLL and Java files before changing runtime registration.
+Start at the boundary where the failure occurs; these files distinguish build output, registration, and peer activation:
+
+1. **Missing or wrong Java class:** inspect the merged manifest, `typemap/java/` (or CoreCLR's `typemap/linked-java/` after trimming), `java-files.txt` / `linked-java-files.txt`, and `acw-map.txt`. Confirm the expected Java name and base/override signatures. A stale `.class` is not proof that a corresponding TypeMap entry survived.
+2. **Unbound native method / `UnsatisfiedLinkError`:** compare the generated JCW's `native` method **name and JNI descriptor** with its generated proxy registration. Check whether `mono.android.Runtime.registerNatives` ran for the class (or its deferred helper did), and inspect `adb logcat` for the registration exception. Do not search for a missing `Java_...` export in this pipeline.
+3. **Wrong managed type or activation failure:** check `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps` assembly, `TrimmableTypeMap` lookup, proxy construction, and `JavaMarshalRegisteredPeers`. Verify whether a Java callback came from a managed-created peer or needs activation from a Java-created peer. On NativeAOT a missing generated mapping cannot be rescued by CoreCLR-only reflection.
+4. **Release/trim-only failure:** inspect the *linked* managed assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and shrinker rules. The pre-trim generated Java is not necessarily packaged Java. The [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md) explains target stamps and stale-file handling.
+5. **JNI reference or marshal failure:** use `adb logcat` and [the JNI reference guide](debug-jni-objrefs.md) for ownership and collection problems. For unsupported TypeMap settings see [the build property](../../docs-mobile/building-apps/build-properties.md); duplicate Java-visible constructor signatures produce [XA4259](../../docs-mobile/messages/xa4259.md).
+
+The [TypeMap generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs), [JCW tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs), and [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs) exercise these paths. Compare their expected names/signatures against the generated DLL and Java files before changing runtime registration.

From 0b3db5b55b12e529f03f540e2c6f8a052b397141 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:49:39 +0200
Subject: [PATCH 31/58] Document unsupported explicit Java type registration

Clarify the trimmable TypeMap behavior after the parent runtime review fix.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 10d9b25ef4d..0984361b13d 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -200,6 +200,8 @@ Every generated JCW implements the Java [`IGCUserPeer`](../../../src/java-runtim
 
 Start at the boundary where the failure occurs; these files distinguish build output, registration, and peer activation:
 
+[`Java.Interop.TypeManager.RegisterType`](../../../src/Mono.Android/Java.Interop/TypeManager.cs) is not a fallback for a missing generated mapping: it throws `NotSupportedException` with the trimmable TypeMap. Give the peer a discoverable Java name (`[Register]` for a peer type, or the component `Name` attribute used above) so the scanner can generate the mapping instead.
+
 1. **Missing or wrong Java class:** inspect the merged manifest, `typemap/java/` (or CoreCLR's `typemap/linked-java/` after trimming), `java-files.txt` / `linked-java-files.txt`, and `acw-map.txt`. Confirm the expected Java name and base/override signatures. A stale `.class` is not proof that a corresponding TypeMap entry survived.
 2. **Unbound native method / `UnsatisfiedLinkError`:** compare the generated JCW's `native` method **name and JNI descriptor** with its generated proxy registration. Check whether `mono.android.Runtime.registerNatives` ran for the class (or its deferred helper did), and inspect `adb logcat` for the registration exception. Do not search for a missing `Java_...` export in this pipeline.
 3. **Wrong managed type or activation failure:** check `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps` assembly, `TrimmableTypeMap` lookup, proxy construction, and `JavaMarshalRegisteredPeers`. Verify whether a Java callback came from a managed-created peer or needs activation from a Java-created peer. On NativeAOT a missing generated mapping cannot be rescued by CoreCLR-only reflection.

From 79e0555a70f704679508444fef65b733ca55d953 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 14:28:07 +0200
Subject: [PATCH 32/58] Document app-generated platform JCWs

Clarify that trimmable app builds generate platform wrappers rather than using a prebuilt reference-pack jar, alongside the selected runtime support jar.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 0984361b13d..25601fccb2c 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -80,6 +80,8 @@ The main outputs are:
 | `typemap/typemap-assemblies.txt`, `java-files.txt`, `acw-map.txt` | Lists of actual generated assemblies/Java sources and Java-to-managed class mappings for the build. |
 | `android/src/net/dot/android/ApplicationRegistration.java`, merged `AndroidManifest.xml` | Generated application/instrumentation registration and manifest output. The former is built from scan results, **not** copied from a handwritten template. |
 
+The app build also generates needed **platform JCWs** from framework inputs alongside user JCWs: for example, the [build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs) check for `typemap/java/android/app/ActivityTracker.java` and its `Runtime.registerNatives` call. The [reference pack](../../../build-tools/create-packs/Microsoft.Android.Ref.proj) no longer ships prebuilt `mono.android.jar` or `mono.android.dex`. The handwritten Java runtime support instead comes from `java_runtime_trimmable.jar`, selected by [`_CollectRuntimeJarFilenames`](../../../src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets); this is not a jar of pre-generated platform JCWs. `ApplicationRegistration.java` is generated separately during the app build.
+
 Each per-assembly TypeMap contains assembly-level mapping attributes: a key such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the managed target type. The root references the per-assembly maps via `TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**, not `.cs` files; the C# in the sections below is an explanatory translation of emitted code, not a file that a developer should edit. See [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
 
 For the example Activity, think of a mapping like this **conceptual C#**:

From 9d7e9541644e0c5b456b8d2c92b9d6fdef26d16e Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 10:09:19 +0200
Subject: [PATCH 33/58] Remove unsupported typemap tests from Android runs

Omit obsolete reflection/native-map fixtures from the trimmable Android test assembly while retaining their JVM coverage and the unrelated mixed-file tests. Drop defunct category exclusions and test-only legacy build wiring.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../skills/tests/references/test-catalog.md   |  2 +-
 .../InvokeVirtualFromConstructorTests.cs      |  1 -
 .../Java.Interop/JavaManagedGCBridgeTests.cs  |  3 ++-
 .../Java.Interop/JavaObjectArrayTest.cs       |  3 ++-
 .../Java.Interop/JniInstanceMethodIDTest.cs   |  1 -
 .../Java.Interop/JniPeerMembersTests.cs       |  7 ++++---
 .../JniRuntime.JniTypeManagerTests.cs         |  3 ++-
 .../JniRuntimeJniValueManagerContract.cs      |  4 ----
 .../Java.Interop/JniRuntimeTest.cs            |  3 ++-
 .../JniValueMarshalerContractTests.cs         |  6 ++++--
 .../Java.Interop/MethodBindingTests.cs        |  1 -
 .../Java.Interop/TestTypeTests.cs             |  1 -
 .../Java.Interop-Tests.NET.csproj             | 21 +++++--------------
 .../Mono.Android.NET-Tests.csproj             |  3 ---
 14 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/.github/skills/tests/references/test-catalog.md b/.github/skills/tests/references/test-catalog.md
index 2adcf28b912..a512cef82b6 100644
--- a/.github/skills/tests/references/test-catalog.md
+++ b/.github/skills/tests/references/test-catalog.md
@@ -138,7 +138,7 @@ Device: **Yes**
 
 The `Mono.Android.NET-Tests.csproj` dynamically excludes categories based on runtime:
 - **CoreCLR runtime**: Excludes `CoreCLRIgnore`, `NTLM`
-- **NativeAOT runtime**: Excludes `NativeAOTIgnore`, `SSL`, `NTLM`, `Export`, `NativeTypeMap`
+- **NativeAOT runtime**: Excludes `NativeAOTIgnore`, `SSL`, `NTLM`
 
 Other categories: `SSL`, `InetAccess`, `JavaList`, `RuntimeConfig`, `Intune`, `NTLM`
 
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
index 949f1902997..daf35ea5a15 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
@@ -8,7 +8,6 @@
 namespace Java.InteropTests {
 
 	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
 #if !__ANDROID__
 	// We want stability around the CallVirtualFromConstructorDerived static fields
 	[NonParallelizable]
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
index 79b64ef2fd5..1635a3d4520 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
@@ -8,8 +8,8 @@
 
 namespace Java.InteropTests {
 
+#if !__ANDROID__
 	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
 	public class JavaManagedGCBridgeTests : JavaVMFixture {
 
 #if !NO_GC_BRIDGE_SUPPORT
@@ -54,6 +54,7 @@ static void SetupLinks (JavaObjectArray<CrossReferenceBridge> array, out WeakRef
 			child   = new WeakReference<CrossReferenceBridge> (b, true);
 		}
 	}
+#endif  // !__ANDROID__
 
 	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	public class CrossReferenceBridge : JavaObject {
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
index e5d2bc2fa98..695597da7ae 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
@@ -165,8 +165,8 @@ public void ObjectArrayType ()
 		}
 	}
 
+#if !__ANDROID__
 	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
 	public class JavaObjectArray_object_ContractTest : JavaObjectArrayContractTest<object> {
 		static  readonly    object  a   = new object ();
 
@@ -201,4 +201,5 @@ public void ObjectArrayType ()
 			Dispose (c);
 		}
 	}
+#endif  // !__ANDROID__
 }
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
index bce118ca8e7..2949f14286c 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
@@ -11,7 +11,6 @@ public class JniInstanceMethodIDTest : JavaVMFixture
 	{
 		// https://code.google.com/p/android/issues/detail?id=65710
 		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
 		public unsafe void CallNonvirtualVoidMethod_WithBaseMethodIDAndDerivedType ()
 		{
 			using (var b = new JniType ("net/dot/jni/test/CallNonvirtualBase"))
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
index 40ed2dc5390..83ebf2ece31 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
@@ -39,8 +39,8 @@ public void HandledReplacementTypeMissDoesNotUseStringFallback ()
 		}
 #endif  // !ANDROID
 
+#if !__ANDROID__
 		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
 		public void VirtualInvokeOnBaseInvokesMostDerivedJavaMethod ()
 		{
 			Assert.IsNull (GetInstanceMethods (MyString._members.InstanceMethods));
@@ -53,7 +53,6 @@ public void VirtualInvokeOnBaseInvokesMostDerivedJavaMethod ()
 		}
 
 		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
 		public void ConcurrentFirstUsePublishesSingleInstanceMethodCache ()
 		{
 			var members = new JniPeerMembers (MyString.JniTypeName, typeof (MyString));
@@ -73,6 +72,7 @@ public void ConcurrentFirstUsePublishesSingleInstanceMethodCache ()
 				JniPeerMembers.Dispose (members);
 			}
 		}
+#endif  // !__ANDROID__
 
 		[Test]
 		public void PeerMemberCachesAreInitiallyNull ()
@@ -226,15 +226,16 @@ public void MethodLookupForNonexistentStaticMethodWillTryFallbacks ()
 			}
 		}
 
+#if !__ANDROID__
 		[Test]
 		[Category ("NativeAOTIgnore")]
-		[Category ("TrimmableTypeMapUnsupported")]
 		public void ReplacementTypeUsedForMethodLookup ()
 		{
 			using var o = new RenameClassDerived ();
 			int r = o.hashCode();
 			Assert.AreEqual (33, r);
 		}
+#endif  // !__ANDROID__
 
 		[Test]
 		[Category ("NativeAOTIgnore")]
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
index f2dd684a8dd..8a5ef10a2b8 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
@@ -60,8 +60,8 @@ public void ReplacementTypeInfoSupportsStringAndUtf8Results ()
 			}
 		}
 
+#if !__ANDROID__
 		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
 		[RequiresDynamicCode ("This test uses ReflectionJniTypeManager, which is reflection-based and not NativeAOT-compatible.")]
 		[RequiresUnreferencedCode ("This test uses ReflectionJniTypeManager, which is reflection-based and not trimming-compatible.")]
 		public void GetInvokerType ()
@@ -85,6 +85,7 @@ public MyTypeManager ()
 			{
 			}
 		}
+#endif  // !__ANDROID__
 
 		class StringReplacementTypeManager : JniRuntime.JniTypeManager {
 
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
index a3343de62a0..b52a53edab2 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
@@ -14,12 +14,9 @@
 
 namespace Java.InteropTests {
 
-	// Android doesn't support `[NonParallelizable]`, but runs tests sequentially by default.
 #if !__ANDROID__
 	// Modifies JniRuntime.valueManager instance field; can't be done in parallel
 	[NonParallelizable]
-#endif  // !__ANDROID__
-	[Category ("TrimmableTypeMapUnsupported")]
 	public abstract class JniRuntimeJniValueManagerContract : JavaVMFixture {
 
 		[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
@@ -473,7 +470,6 @@ public abstract class JniRuntimeJniValueManagerContract<
 		protected override Type ValueManagerType => typeof (T);
 	}
 
-#if !__ANDROID__
 	[TestFixture]
 	public class JniRuntimeJniValueManagerContract_NoGCIntegration : JniRuntimeJniValueManagerContract<ManagedValueManager> {
 	}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
index f28d24727aa..d7af269401a 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
@@ -72,13 +72,14 @@ public void CreateJavaVMWithNullBuilder ()
 			Assert.Throws<ArgumentNullException> (() => new JavaVMWithNullBuilder ());
 		}
 
+#if !__ANDROID__
 		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
 		public void BuiltInSimpleReferenceMap_ContainsManagedPeerByDefault ()
 		{
 			var types = JniRuntime.CurrentRuntime.TypeManager.GetTypes (new JniTypeSignature (ManagedPeer.JniTypeName));
 			Assert.IsTrue (types.Contains (typeof (ManagedPeer)));
 		}
+#endif  // !__ANDROID__
 
 		class JavaVMWithNullBuilder : JniRuntime {
 			public JavaVMWithNullBuilder ()
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
index b241836a9d9..1f704229448 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
@@ -14,7 +14,7 @@
 
 namespace Java.InteropTests {
 
-	[Category ("TrimmableTypeMapUnsupported")]
+#if !__ANDROID__
 	public abstract class JniValueMarshalerContractTests<
 			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
 			T
@@ -704,6 +704,7 @@ protected override string GetExpectedReturnValueFromManagedExpression (string jv
 }}";
 		}
 	}
+#endif  // !__ANDROID__
 
 	[JniValueMarshaler (typeof (DemoValueTypeValueMarshaler))]
 	struct DemoValueType {
@@ -760,11 +761,12 @@ public override void DestroyGenericArgumentState (DemoValueType value, ref JniVa
 		}
 	}
 
+#if !__ANDROID__
 	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
 	class JniValueMarshaler_DemoValueType_ContractTests : JniValueMarshalerContractTests<DemoValueType> {
 
 		protected   override    DemoValueType       Value           {get {return new DemoValueType (42);}}
 		protected   override    bool                IsJniValueType  {get {return true;}}
 	}
+#endif  // !__ANDROID__
 }
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
index 05e8156fa91..de783870094 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
@@ -7,7 +7,6 @@
 namespace Java.InteropTests
 {
 	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
 	public class MethodBindingTests : JavaVMFixture
 	{
 		//
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
index b65e6f08412..3ae85674ca7 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
@@ -9,7 +9,6 @@ namespace Java.InteropTests
 {
 #if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
 	public class TestTypeTests : JavaVMFixture
 	{
 		int lrefStartCount;
diff --git a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
index 21920b4b9dd..fd25f6e85cb 100644
--- a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
+++ b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
@@ -27,25 +27,14 @@
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JavaVMFixture.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniNativeInterfaceTests.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniReferenceSafeHandleTest.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)obj\Release\net7.0-android/designtime/Resource.designer.cs" />
-  </ItemGroup>
-
-  <!--
-    [JniAddNativeMethodRegistrationAttribute] is not supported under the trimmable
-    typemap (XA4251). Exclude the upstream Java.Interop fixtures that use it (and
-    their dependents) when building for the trimmable typemap so the assembly can
-    compile through the generator. The matching NUnit test class is excluded by
-    name in tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs.
-  -->
-  <ItemGroup Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">
+    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniInstanceMethodIDTest.cs" />
+    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniRuntime.JniTypeManagerTests.cs" />
+    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\MethodBindingTests.cs" />
+    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniRuntime.JniValueManagerTests.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\CallVirtualFromConstructorBase.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\CallVirtualFromConstructorDerived.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\InvokeVirtualFromConstructorTests.cs" />
-  </ItemGroup>
-
-  <!-- ReflectionJniValueManager is unsupported by the trimmable typemap value manager. See dotnet/android#12221. -->
-  <ItemGroup Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniRuntime.JniValueManagerTests.cs" />
+    <Compile Remove="$(JavaInteropTestDirectory)obj\Release\net7.0-android/designtime/Resource.designer.cs" />
   </ItemGroup>
 
   <!-- Import Microsoft.NET.Sdk targets before our targets so we can override build/clean behavior -->
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index e3215dc6dc9..42c688e8ffe 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(XamarinAndroidSourcePath)product.snk</AssemblyOriginatorKeyFile>
-    <_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>$(XamarinAndroidSourcePath)bin\Test$(Configuration)</OutputPath>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -80,8 +79,6 @@
     <ProjectReference Include="..\..\StartupHook\StartupHook.csproj" />
     <ProjectReference Include="..\Java.Interop-Tests\Java.Interop-Tests.NET.csproj" />
     <ProjectReference Include="..\Mono.Android-Test.Library\Mono.Android-Test.Library.NET.csproj" />
-    <!-- Required for [Export] / [ExportField] runtime support (ExportTests.cs) on the LLVM-IR typemap path -->
-    <Reference Include="Mono.Android.Export" Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' " />
   </ItemGroup>
 
   <ItemGroup>

From 32573f739ee0e9807addaaf7126bcd4faf54c80c Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 11:29:56 +0200
Subject: [PATCH 34/58] Drop desktop-only Java.Interop test stages

Stop invoking the standalone JVM/tooling/NativeAOT test stage in public, internal, and official CI. Remove the orphaned GC-bridge test and fixture rather than guarding it by platform; Android interop tests remain in device lanes.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../automation/azure-pipelines-internal.yaml  |  12 --
 .../automation/azure-pipelines-public.yaml    |  14 --
 build-tools/automation/azure-pipelines.yaml   |  11 --
 .../stage-java-interop-tests.yaml             | 131 ------------------
 .../Java.Interop-Tests.csproj                 |   1 -
 .../Java.Interop/JavaManagedGCBridgeTests.cs  |  70 ----------
 .../Java.Interop/JavaVMFixture.cs             |   1 -
 .../dot/jni/test/CrossReferenceBridge.java    |  32 -----
 8 files changed, 272 deletions(-)
 delete mode 100644 build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java

diff --git a/build-tools/automation/azure-pipelines-internal.yaml b/build-tools/automation/azure-pipelines-internal.yaml
index c889c888558..e18ed162391 100644
--- a/build-tools/automation/azure-pipelines-internal.yaml
+++ b/build-tools/automation/azure-pipelines-internal.yaml
@@ -820,18 +820,6 @@ extends:
           parameters:
             condition: true
 
-    # Java.Interop Tests Stage
-    - template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
-      parameters:
-        windowsPool:
-          name: $(NetCoreInternalPoolName)
-          image: $(WindowsPoolImageNetCoreInternal)
-          os: windows
-        macPool:
-          name: Azure Pipelines
-          vmImage: $(HostedMacImage)
-          os: macOS
-
     # MAUI Tests Stage
     - stage: maui_tests
       displayName: MAUI Tests
diff --git a/build-tools/automation/azure-pipelines-public.yaml b/build-tools/automation/azure-pipelines-public.yaml
index c6fa657ba10..d5b35ce7500 100644
--- a/build-tools/automation/azure-pipelines-public.yaml
+++ b/build-tools/automation/azure-pipelines-public.yaml
@@ -432,20 +432,6 @@ stages:
       parameters:
         condition: true
 
-# Java.Interop Tests Stage
-- template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
-  parameters:
-    windowsPool:
-      name: $(NetCorePublicPoolName)
-      demands:
-      - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
-      os: windows
-    macPool:
-      name: AcesShared
-      demands:
-      - ImageOverride -equals ACES_VM_SharedPool_Tahoe
-      os: macOS
-
 # Android Tools Tests Stage
 - template: /build-tools/automation/yaml-templates/stage-xamarin-android-tools-tests.yaml@self
   parameters:
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index ec05b713c2e..7463c4434e8 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -106,17 +106,6 @@ extends:
       parameters:
         usesCleanImages: ${{ parameters.macTestAgentsUseCleanImages }}
 
-    - template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
-      parameters:
-        # The internal Xamarin.Android pipeline uses 1ES Pipeline Templates, which
-        # require Windows jobs to run on a 1ES-hosted pool. macOS is fine on the
-        # hosted Azure Pipelines pool as long as `os: macOS` is set (which is now
-        # the template default).
-        windowsPool:
-          name: MAUI-1ESPT
-          image: $(WindowsPoolImage1ESPT)
-          os: windows
-
     - template: /build-tools/automation/yaml-templates/stage-xamarin-android-tools-tests.yaml@self
       parameters:
         use1ESTemplate: true
diff --git a/build-tools/automation/yaml-templates/stage-java-interop-tests.yaml b/build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
deleted file mode 100644
index 92aff51cf19..00000000000
--- a/build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-# Java.Interop tests stage
-#
-# Mirrors the two jobs from
-# external/Java.Interop/build-tools/automation/azure-pipelines.yaml
-# (windows_dotnet_build, mac_dotnet_build) so that the Java.Interop
-# build + tests continue to run as part of dotnet/android CI now that
-# Java.Interop has been merged in-tree.
-#
-# Referenced from both:
-#   - build-tools/automation/azure-pipelines.yaml         (official / 1ES)
-#   - build-tools/automation/azure-pipelines-public.yaml  (public PR validation)
-
-parameters:
-- name: stageName
-  type: string
-  default: java_interop_tests
-- name: dependsOn
-  type: object
-  default: []
-- name: condition
-  type: string
-  default: succeeded()
-- name: windowsPool
-  type: object
-  # NOTE: This default is a Microsoft-hosted Azure Pipelines pool, which is NOT
-  # allowed by 1ES Pipeline Templates in Official mode. Callers that extend the
-  # 1ES Official template (e.g. build-tools/automation/azure-pipelines.yaml) must
-  # override this with a 1ES-hosted pool like `MAUI-1ESPT`.
-  default:
-    name: Azure Pipelines
-    vmImage: $(HostedWinImage)
-    os: windows
-- name: macPool
-  type: object
-  default:
-    name: Azure Pipelines
-    vmImage: $(HostedMacImage)
-    os: macOS
-
-stages:
-- stage: ${{ parameters.stageName }}
-  displayName: Java.Interop Tests
-  dependsOn: ${{ parameters.dependsOn }}
-  condition: ${{ parameters.condition }}
-  variables:
-    # Variables consumed by external/Java.Interop/build-tools/automation/templates/*.yaml.
-    # Defined at stage scope so they don't conflict with dotnet/android-wide
-    # variables (e.g. DotNetTargetFramework=net11.0).
-    DotNetCoreVersion: $(DotNetSdkVersion).x
-    DotNetTargetFramework: $(DotNetStableTargetFramework)
-    NetCoreTargetFrameworkPathSuffix: -$(DotNetStableTargetFramework)
-    Build.Configuration: Release
-    RunningOnCI: true
-    # Cap the JDK that external/Java.Interop's Prepare.targets picks when it
-    # calls the JdkInfo bootstrap task. Recent hosted agent images ship Java 25
-    # as the default JDK, and Gradle 8.12 (used by java-source-utils and the
-    # Bytecode-Tests kotlin-gradle project) crashes with "Unsupported class
-    # file major version 69" on it. JdkInfo reads JI_MAX_JDK from the env.
-    JI_MAX_JDK: 21
-  jobs:
-
-  # Check - "Xamarin.Android (Java.Interop Tests Windows - .NET)"
-  - job: java_interop_windows_dotnet_build
-    displayName: Windows - .NET
-    pool: ${{ parameters.windowsPool }}
-    timeoutInMinutes: 60
-    workspace:
-      clean: all
-    steps:
-    - checkout: self
-      submodules: recursive
-      clean: true
-
-    - template: /external/Java.Interop/build-tools/automation/templates/install-dependencies.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-build.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-tests.yaml@self
-      parameters:
-        runNativeDotnetTests: true
-        nativeAotRid: win-x64
-        platformName: .NET - Windows
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-dirty-tree.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-issue.yaml@self
-
-  # Check - "Xamarin.Android (Java.Interop Tests Mac - .NET)"
-  - job: java_interop_mac_dotnet_build
-    displayName: Mac - .NET
-    pool: ${{ parameters.macPool }}
-    timeoutInMinutes: 20
-    workspace:
-      clean: all
-    steps:
-    - checkout: self
-      submodules: recursive
-      clean: true
-
-    - bash: |
-        set -e
-        if ! command -v cmake >/dev/null 2>&1 ; then
-          brew install cmake
-        fi
-      displayName: Ensure cmake is installed
-
-    # The hosted macOS pool architecture can change between Intel (osx-x64) and
-    # Apple Silicon (osx-arm64), so detect it at runtime and publish/run the
-    # NativeAOT sample for the matching RID. Otherwise the produced .dylib fails
-    # to dlopen with an "incompatible architecture" error.
-    - bash: |
-        if [ "$(Agent.OSArchitecture)" = "ARM64" ]; then
-          echo "##vso[task.setvariable variable=NativeAOTRid]osx-arm64"
-        else
-          echo "##vso[task.setvariable variable=NativeAOTRid]osx-x64"
-        fi
-      displayName: Determine NativeAOT RID
-
-    - template: /external/Java.Interop/build-tools/automation/templates/install-dependencies.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-build.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-tests.yaml@self
-      parameters:
-        runNativeTests: true
-        nativeAotRid: $(NativeAOTRid)
-        platformName: .NET - MacOS
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-dirty-tree.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-issue.yaml@self
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
index 1d43a2ca427..864e5046c8a 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
@@ -32,7 +32,6 @@
 
   <ItemGroup>
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\AnotherJavaInterfaceImpl.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CrossReferenceBridge.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualBase.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived2.java" />
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
deleted file mode 100644
index 1635a3d4520..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-#if !__ANDROID__
-	[TestFixture]
-	public class JavaManagedGCBridgeTests : JavaVMFixture {
-
-#if !NO_GC_BRIDGE_SUPPORT
-		// https://github.com/mono/mono/blob/98d2314/mono/tests/sgen-bridge-xref.cs
-		[Test]
-		public void CrossReferences ()
-		{
-			using (var array = new JavaObjectArray<CrossReferenceBridge> (2)) {
-				WeakReference<CrossReferenceBridge> root = null, child = null;
-				var t = new Thread (() => SetupLinks (array, out root, out child));
-				t.Start ();
-				t.Join ();
-
-				JniEnvironment.Runtime.ValueManager.CollectPeers ();
-				CrossReferenceBridge a, b;
-				a = b = null;
-				Console.WriteLine ("try get A {0}", root.TryGetTarget (out a));
-				Console.WriteLine ("try get B {0}", child.TryGetTarget (out b));
-				Console.WriteLine ("a is null {0}", a == null);
-				Console.WriteLine ("b is null {0}", b == null);
-
-				Assert.IsNotNull (a);
-				Assert.IsNotNull (b);
-			}
-		}
-#endif  // !NO_GC_BRIDGE_SUPPORT
-
-		static void SetupLinks (JavaObjectArray<CrossReferenceBridge> array, out WeakReference<CrossReferenceBridge> root, out WeakReference<CrossReferenceBridge> child)
-		{
-			var a = new CrossReferenceBridge () {
-				id      = "bridge",
-			};
-			var b = new CrossReferenceBridge () {
-				id      = "child",
-			};
-			a.link.Add (b);
-
-			array [0] = a;
-			array [1] = b;
-
-			root    = new WeakReference<CrossReferenceBridge> (a, true);
-			child   = new WeakReference<CrossReferenceBridge> (b, true);
-		}
-	}
-#endif  // !__ANDROID__
-
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	public class CrossReferenceBridge : JavaObject {
-		internal    const    string         JniTypeName = "net/dot/jni/test/CrossReferenceBridge";
-
-		public  string          id;
-		public  List<object>    link        = new List<object> ();
-
-		protected override void Dispose (bool disposing)
-		{
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
index 8b5459df5eb..6a753b5ae01 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
@@ -53,7 +53,6 @@ enum ReplacementMethodStorage {
 			[AnotherJavaInterfaceImpl.JniTypeName]          = typeof (AnotherJavaInterfaceImpl),
 			[CallVirtualFromConstructorBase.JniTypeName]    = typeof (CallVirtualFromConstructorBase),
 			[CallVirtualFromConstructorDerived.JniTypeName] = typeof (CallVirtualFromConstructorDerived),
-			[CrossReferenceBridge.JniTypeName]              = typeof (CrossReferenceBridge),
 			[GetThis.JniTypeName]                           = typeof (GetThis),
 			[IAndroidInterface.JniTypeName]                 = typeof (IAndroidInterface),
 			[IJavaInterface.JniTypeName]                    = typeof (IJavaInterface),
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java
deleted file mode 100644
index a2c915bfe77..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class CrossReferenceBridge implements GCUserPeerable {
-
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.CrossReferenceBridge, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public CrossReferenceBridge () {
-		if (CrossReferenceBridge.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}

From 34b9d4aa835f7682aab2ada2274894e5142f47fc Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 13:44:17 +0200
Subject: [PATCH 35/58] Remove JVM-only Java.Interop test coverage

Retire the desktop-only test cases and Java fixtures now that Android is the supported test host. Keep Android test scenarios and their shared marshaler fixture, and remove unused jar inputs and remapping rules.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Java.Interop-Tests.csproj                 |   6 -
 .../CallVirtualFromConstructorBase.cs         |  55 --
 .../CallVirtualFromConstructorDerived.cs      | 101 ---
 .../InvokeVirtualFromConstructorTests.cs      | 155 ----
 .../Java.Interop/JavaObjectArrayTest.cs       |  37 -
 .../Java.Interop/JavaObjectTest.cs            |  13 +-
 .../JavaPeerableExtensionsTests.cs            |   4 -
 .../Java.Interop/JavaVMFixture.cs             |  55 +-
 .../Java.Interop/JniInstanceMethodIDTest.cs   |  40 -
 .../Java.Interop/JniPeerMembersTests.cs       | 171 ----
 .../JniRuntime.JniTypeManagerTests.cs         | 117 ---
 .../JniRuntime.JniValueManagerTests.cs        | 149 ----
 .../JniRuntimeJniValueManagerContract.cs      | 531 ------------
 .../Java.Interop/JniRuntimeTest.cs            |  54 --
 .../Java.Interop/JniTypeManagerTests.cs       |  12 -
 .../JniValueMarshalerAttributeTests.cs        |  53 +-
 .../JniValueMarshalerContractTests.cs         | 772 ------------------
 .../Java.Interop/MethodBindingTests.cs        |  78 --
 .../jni/test/AnotherJavaInterfaceImpl.java    |  13 -
 .../test/CallVirtualFromConstructorBase.java  |  38 -
 .../CallVirtualFromConstructorDerived.java    |  47 --
 .../net/dot/jni/test/RenameClassBase1.java    |  39 -
 .../net/dot/jni/test/RenameClassBase2.java    |  45 -
 .../net/dot/jni/test/RenameClassDerived.java  |  45 -
 .../Java.Interop-Tests.NET.csproj             |   7 -
 .../Mono.Android-Tests/Remaps.xml             |   9 -
 26 files changed, 54 insertions(+), 2592 deletions(-)
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java

diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
index 864e5046c8a..bdf902db659 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
@@ -31,19 +31,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\AnotherJavaInterfaceImpl.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualBase.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived2.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallVirtualFromConstructorBase.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallVirtualFromConstructorDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\GetThis.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\JavaInterface.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\MyJavaInterfaceImpl.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\ObjectHelper.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassBase1.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassBase2.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\AndroidInterface.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\DesugarAndroidInterface$_CC.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RegisterNativesTestType.java" />
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
deleted file mode 100644
index ce298734b93..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-
-using Java.Interop;
-namespace Java.InteropTests {
-
-	[JniTypeSignature (CallVirtualFromConstructorBase.JniTypeName, GenerateJavaPeer=false)]
-	public class CallVirtualFromConstructorBase : JavaObject {
-
-		internal    const   string          JniTypeName = "net/dot/jni/test/CallVirtualFromConstructorBase";
-		readonly    static  JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (CallVirtualFromConstructorBase));
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		public unsafe CallVirtualFromConstructorBase (int value)
-			: this (value, useNewObject: false)
-		{
-		}
-
-		public unsafe CallVirtualFromConstructorBase (int value, bool useNewObject)
-			: this (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			if (PeerReference.IsValid)
-				return;
-
-			const string __id = "(I)V";
-
-			if (useNewObject) {
-				var ctors   = JniPeerMembers.InstanceMethods.GetConstructorsForType (GetType ());
-				var init    = ctors.GetConstructor (__id);
-
-				JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-				__args [0] = new JniArgumentValue (value);
-				var lref = JniEnvironment.Object.NewObject (ctors.JniPeerType.PeerReference, init, __args);
-				Construct (ref lref, JniObjectReferenceOptions.CopyAndDispose);
-				return;
-			}
-			var peer    = JniPeerMembers.InstanceMethods.StartGenericCreateInstance (__id, GetType (), value);
-			Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
-			JniPeerMembers.InstanceMethods.FinishGenericCreateInstance (__id, this, value);
-		}
-
-		public CallVirtualFromConstructorBase (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (ref reference, options)
-		{
-		}
-
-		public virtual void CalledFromConstructor (int value)
-		{
-			_members.InstanceMethods.InvokeGenericVirtualVoidMethod ("calledFromConstructor.(I)V", this, value);
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
deleted file mode 100644
index 739b85e08c9..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-#nullable enable
-
-using System;
-using System.Runtime.CompilerServices;
-
-using Java.Interop;
-
-namespace Java.InteropTests
-{
-	[JniTypeSignature (CallVirtualFromConstructorDerived.JniTypeName, GenerateJavaPeer=false)]
-	public class CallVirtualFromConstructorDerived : CallVirtualFromConstructorBase {
-		new internal    const   string          JniTypeName = "net/dot/jni/test/CallVirtualFromConstructorDerived";
-		static  readonly        JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (CallVirtualFromConstructorDerived));
-
-		[JniAddNativeMethodRegistrationAttribute]
-		static void RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
-		{
-			args.Registrations.Add (new JniNativeMethodRegistration ("calledFromConstructor", "(I)V", (CalledFromConstructorMarshalMethod)CalledFromConstructorHandler));
-		}
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		int calledValue;
-
-		public  bool    InvokedConstructor;
-
-		public CallVirtualFromConstructorDerived (int value)
-			: this (value, useNewObject: false)
-		{
-		}
-
-		public CallVirtualFromConstructorDerived (int value, bool useNewObject)
-			: base (value, useNewObject)
-		{
-			InvokedConstructor = true;
-
-			if (useNewObject && calledValue != 0) {
-				// calledValue was set on a *different* instance! So it's 0 here.
-				throw new ArgumentException (
-						string.Format ("value '{0}' doesn't match expected value '{1}'.", value, 0),
-						"value");
-			}
-			if (!useNewObject && value != calledValue)
-				throw new ArgumentException (
-						string.Format ("value '{0}' doesn't match expected value '{1}'.", value, calledValue),
-						"value");
-		}
-
-		public  bool    InvokedActivationConstructor;
-
-		public  static  CallVirtualFromConstructorDerived?  Intermediate_FromCalledFromConstructor;
-		public  static  CallVirtualFromConstructorDerived?  Intermediate_FromActivationConstructor;
-
-		public CallVirtualFromConstructorDerived (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (ref reference, options)
-		{
-			InvokedActivationConstructor    = true;
-
-			Intermediate_FromActivationConstructor  = this;
-		}
-
-		public bool Called;
-
-		public override void CalledFromConstructor (int value)
-		{
-			Called      = true;
-			calledValue = value;
-
-			Intermediate_FromCalledFromConstructor  = this;
-		}
-
-		public static unsafe CallVirtualFromConstructorDerived NewInstance (int value)
-		{
-			JniArgumentValue* args = stackalloc JniArgumentValue [1];
-			args [0]    = new JniArgumentValue (value);
-			var o       = _members.StaticMethods.InvokeObjectMethod ("newInstance.(I)Lnet/dot/jni/test/CallVirtualFromConstructorDerived;", args);
-			return JniEnvironment.Runtime.ValueManager.GetValue<CallVirtualFromConstructorDerived> (ref o, JniObjectReferenceOptions.CopyAndDispose)!;
-		}
-
-		delegate void CalledFromConstructorMarshalMethod (IntPtr jnienv, IntPtr n_self, int value);
-		static void CalledFromConstructorHandler (IntPtr jnienv, IntPtr n_self, int value)
-		{
-			var envp = new JniTransition (jnienv);
-			try {
-				var r_self  = new JniObjectReference (n_self);
-				var self    = JniEnvironment.Runtime.ValueManager.GetValue<CallVirtualFromConstructorDerived>(ref r_self, JniObjectReferenceOptions.Copy)!;
-				self.CalledFromConstructor (value);
-				self.DisposeUnlessReferenced ();
-			}
-			catch (Exception e) when (JniEnvironment.Runtime.ExceptionShouldTransitionToJni (e)) {
-				envp.SetPendingException (e);
-			}
-			finally {
-				envp.Dispose ();
-			}
-		}
-	}
-}
-
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
deleted file mode 100644
index daf35ea5a15..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[TestFixture]
-#if !__ANDROID__
-	// We want stability around the CallVirtualFromConstructorDerived static fields
-	[NonParallelizable]
-#endif  // !__ANDROID__
-	public class InvokeVirtualFromConstructorTests : JavaVMFixture
-	{
-		[Test]
-		[Category ("NativeAOTIgnore")] // https://github.com/dotnet/android/issues/10950
-		public void CreateManagedInstanceFirst_WithAllocObject ()
-		{
-			CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor    = null;
-			CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor    = null;
-
-			using var t = new CallVirtualFromConstructorDerived (42);
-			Assert.IsTrue (
-					t.Called,
-					"CalledFromConstructor method override should have been called.");
-			Assert.IsFalse (
-					t.InvokedActivationConstructor,
-					"Activation Constructor should have been called, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.IsTrue (
-					t.InvokedConstructor,
-					"(int) constructor should have been called, via ManagedPeer.construct().");
-
-			var registered      = JniRuntime.CurrentRuntime.ValueManager.PeekValue (t.PeerReference);
-			var acIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor;
-			var cfIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor;
-
-			Assert.AreSame (t, registered,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"registered={RuntimeHelpers.GetHashCode (registered).ToString ("x")}");
-			Assert.IsNull (acIntermediate,
-					"Activation Constructor should not have been called, because of AllocObject semantics");
-			Assert.AreSame (t, cfIntermediate,
-					"Expected t and cfIntermediate to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor);
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor);
-		}
-
-		static void Dispose<T> (ref T peer)
-			where T : class, IJavaPeerable
-		{
-			if (peer == null)
-				return;
-
-			peer.Dispose ();
-			peer = null;
-		}
-
-		[Test]
-		[Category ("NativeAOTIgnore")] // https://github.com/dotnet/android/issues/10950
-		public void CreateManagedInstanceFirst_WithNewObject ()
-		{
-			CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor    = null;
-			CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor    = null;
-
-			using var t = new CallVirtualFromConstructorDerived (42, useNewObject: true);
-			Assert.IsFalse (
-					t.Called,
-					"CalledFromConstructor method override was called on a different instance.");
-			Assert.IsFalse (
-					t.InvokedActivationConstructor,
-					"Activation Constructor should not have been called, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.IsTrue (
-					t.InvokedConstructor,
-					"(int) constructor should have been called, via ManagedPeer.construct().");
-
-			var registered      = JniRuntime.CurrentRuntime.ValueManager.PeekValue (t.PeerReference);
-			var acIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor;
-			var cfIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor;
-
-			Assert.AreSame (t, registered,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"registered={RuntimeHelpers.GetHashCode (registered).ToString ("x")}");
-			Assert.IsNotNull (acIntermediate,
-					"Activation Constructor should have been called, because of NewObject");
-			Assert.IsTrue (
-					acIntermediate.Called,
-					"CalledFromConstructor method override should have been called on acIntermediate.");
-			Assert.IsTrue (
-					acIntermediate.InvokedActivationConstructor,
-					"Activation Constructor should have been called on intermediate instance, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.AreNotSame (t, acIntermediate,
-					"Expected t and registered to be different instances; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"acIntermediate={RuntimeHelpers.GetHashCode (acIntermediate).ToString ("x")}");
-			Assert.AreNotSame (t, cfIntermediate,
-					"Expected t and cfIntermediate to be different instances; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-			Assert.AreSame (acIntermediate, cfIntermediate,
-					"Expected acIntermediate and cfIntermediate to be the same instance; " +
-					$"acIntermediate={RuntimeHelpers.GetHashCode (acIntermediate).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor);
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor);
-		}
-
-		[Test]
-		[Category ("NativeAOTIgnore")] // https://github.com/dotnet/android/issues/10950
-		public void CreateJavaInstanceFirst ()
-		{
-			CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor    = null;
-			CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor    = null;
-
-			using var t = CallVirtualFromConstructorDerived.NewInstance (42);
-
-			Assert.IsTrue (
-					t.Called,
-					"CalledFromConstructor method override should have been called.");
-			Assert.IsTrue (
-					t.InvokedActivationConstructor,
-					"Activation Constructor should have been called, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.IsTrue (
-					t.InvokedConstructor,
-					"(int) constructor should have been called, via ManagedPeer.construct().");
-
-			var registered      = JniRuntime.CurrentRuntime.ValueManager.PeekValue (t.PeerReference);
-			var acIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor;
-			var cfIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor;
-
-			Assert.AreSame (t, registered,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"registered={RuntimeHelpers.GetHashCode (registered).ToString ("x")}");
-			Assert.AreSame (t, acIntermediate,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"acIntermediate={RuntimeHelpers.GetHashCode (acIntermediate).ToString ("x")}");
-			Assert.AreSame (t, cfIntermediate,
-					"Expected t and cfIntermediate to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor);
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor);
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
index 695597da7ae..c352abdf3f5 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
@@ -165,41 +165,4 @@ public void ObjectArrayType ()
 		}
 	}
 
-#if !__ANDROID__
-	[TestFixture]
-	public class JavaObjectArray_object_ContractTest : JavaObjectArrayContractTest<object> {
-		static  readonly    object  a   = new object ();
-
-		protected override object CreateValueA () {return a;}
-		protected override object CreateValueB () {return 42;}
-
-		int grefStartCount;
-
-		[OneTimeSetUp]
-		public void BeginCheckGlobalRefCount ()
-		{
-			// So that the JavaProxyObject.TypeRef GREF isn't counted.
-			using (var o = new JavaObjectArray<object> (1))
-				o [0] = a;
-			grefStartCount  = JniEnvironment.Runtime.GlobalReferenceCount;
-		}
-
-		[OneTimeTearDown]
-		public void EndCheckGlobalRefCount ()
-		{
-			int gref    = JniEnvironment.Runtime.GlobalReferenceCount;
-			Assert.IsTrue (gref <= (grefStartCount),
-					string.Format ("JNI global references: grefStartCount={0}; gref={1}", grefStartCount, gref));
-			JniEnvironment.Runtime.ValueManager.CollectPeers ();
-		}
-
-		[Test]
-		public void ObjectArrayType ()
-		{
-			var c = CreateCollection (new object[0]);
-			Assert.AreEqual ("[Ljava/lang/Object;", ((IJavaPeerable) c).GetJniTypeName ());
-			Dispose (c);
-		}
-	}
-#endif  // !__ANDROID__
 }
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
index 1d308fc945a..49bd8b16dd0 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
@@ -187,13 +187,7 @@ public void Ctor_Exceptions ()
 
 #if __ANDROID__
 			Assert.Throws<Java.Lang.ClassNotFoundException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
-#else   // !__ANDROID__
-			// Note: `JavaObjectWithNoJavaPeer` creation works on Android because tooling provides all
-			// typemap entries.  On desktop, we use the hardcoded dictionary in JavaVMFixture, which
-   			// deliberately *lacks* an  entry for `JavaObjectWithNoJavaPeer`.
-			Assert.Throws<NotSupportedException> (() => new JavaObjectWithNoJavaPeer ());
-			Assert.Throws<JavaException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
-#endif  // !__ANDROID__
+#endif  // __ANDROID__
 		}
 
 		[Test]
@@ -224,11 +218,6 @@ public void DisposeAccessesThis ()
 		}
 	}
 
-#if !__ANDROID__
-	class JavaObjectWithNoJavaPeer : JavaObject {
-	}
-#endif  // !__ANDROID__
-
 	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	class JavaObjectWithMissingJavaPeer : JavaObject {
 		internal    const   string  JniTypeName = "__this__/__type__/__had__/__better__/__not__/__Exist__";
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs
index 48e6580cd8c..367a8e050cd 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs
@@ -23,10 +23,6 @@ public void JavaAs_Exceptions ()
 		using var o = new JavaObject (ref r, JniObjectReferenceOptions.Copy);
 		// MyJavaInterfaceImpl doesn't provide an activation constructor
 		Assert.Throws<NotSupportedException>(() => o.JavaAs<MyJavaInterfaceImpl>());
-#if !__ANDROID__
-		// JavaObjectWithNoJavaPeer has no Java peer
-		Assert.Throws<ArgumentException>(() => v.JavaAs<JavaObjectWithNoJavaPeer>());
-#endif  // !__ANDROID__
 	}
 
 	[Test]
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
index 6a753b5ae01..fac3dcf670d 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Threading;
 
 using Java.Interop;
 
@@ -48,11 +47,6 @@ enum ReplacementMethodStorage {
 			[TestType.JniTypeName]              = typeof (TestType),
 #endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 			[GenericHolder<int>.JniTypeName]    = typeof (GenericHolder<>),
-			[RenameClassBase.JniTypeName]       = typeof (RenameClassBase),
-			[RenameClassDerived.JniTypeName]    = typeof (RenameClassDerived),
-			[AnotherJavaInterfaceImpl.JniTypeName]          = typeof (AnotherJavaInterfaceImpl),
-			[CallVirtualFromConstructorBase.JniTypeName]    = typeof (CallVirtualFromConstructorBase),
-			[CallVirtualFromConstructorDerived.JniTypeName] = typeof (CallVirtualFromConstructorDerived),
 			[GetThis.JniTypeName]                           = typeof (GetThis),
 			[IAndroidInterface.JniTypeName]                 = typeof (IAndroidInterface),
 			[IJavaInterface.JniTypeName]                    = typeof (IJavaInterface),
@@ -104,20 +98,13 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
 		IEnumerable<string> CreateSimpleReferencesEnumerator (Type type)
 		{
 			foreach (var e in TypeMappings) {
-				if (e.Value == type) {
-					if (ReplacmentTypes.TryGetValue (e.Key, out var alt)) {
-						yield return alt;
-						continue;
-					}
+				if (e.Value == type)
 					yield return e.Key;
-				}
 			}
 		}
 
-		public string? RequestedFallbackTypesForSimpleReference;
 		protected override IReadOnlyList<string>? GetStaticMethodFallbackTypesCore (string jniSimpleReference)
 		{
-			RequestedFallbackTypesForSimpleReference = jniSimpleReference;
 			Debug.WriteLine ($"# GetStaticMethodFallbackTypes (jniSimpleReference={jniSimpleReference})");
 
 			var slash       = jniSimpleReference.LastIndexOf ('/');
@@ -134,52 +121,12 @@ IEnumerable<string> CreateSimpleReferencesEnumerator (Type type)
 			};
 		}
 
-		Dictionary<string, string> ReplacmentTypes = new() {
-			["net/dot/jni/test/RenameClassBase1"] = "net/dot/jni/test/RenameClassBase2",
-		};
-
-		string? trackedReplacementType;
-		int replacementTypeStringLookupCount;
-		int replacementTypeUtf8LookupCount;
-
-		public void TrackReplacementTypeLookups (string jniSimpleReference)
-		{
-			trackedReplacementType = jniSimpleReference;
-			replacementTypeStringLookupCount = 0;
-			replacementTypeUtf8LookupCount = 0;
-		}
-
-		public (int String, int Utf8) GetReplacementTypeLookupCounts ()
-			=> (replacementTypeStringLookupCount, replacementTypeUtf8LookupCount);
-
-		protected override string? GetReplacementTypeCore (string jniSimpleReference)
-		{
-			if (jniSimpleReference == trackedReplacementType)
-				Interlocked.Increment (ref replacementTypeStringLookupCount);
-			return ReplacmentTypes.TryGetValue (jniSimpleReference, out var value)
-				? value
-				: null;
-		}
-
-		protected override void GetReplacementTypeInfoCore (string jniSimpleReference, out string? replacement, out IntPtr replacementUtf8)
-		{
-			if (jniSimpleReference == trackedReplacementType)
-				Interlocked.Increment (ref replacementTypeUtf8LookupCount);
-			replacement = null;
-			replacementUtf8 = ReplacmentTypes.TryGetValue (jniSimpleReference, out var value)
-				? GetUtf8Value (value)
-				: IntPtr.Zero;
-		}
-
 		Dictionary<(string SourceType, string SourceName, string? SourceSignature), (string? TargetType, string? TargetName, string? TargetSignature, int? ParamCount, bool TurnStatic, ReplacementMethodStorage Storage)> ReplacementMethods = new() {
 			[("java/lang/Object",                       "remappedToToString",                  "()Ljava/lang/String;")]    = (null, "toString", null, null, false, ReplacementMethodStorage.TypeUtf8 | ReplacementMethodStorage.MethodUtf8),
 			[("java/lang/Object",                       "remappedToStringWithUtf8Signature",    "()Ljava/lang/String;")]    = (null, "toString", "()Ljava/lang/String;", null, false, ReplacementMethodStorage.SignatureUtf8),
 			[("java/lang/Object",                       "remappedToStaticHashCode",            null)]                      = ("net/dot/jni/test/ObjectHelper", "getHashCodeHelper", null, null, true, ReplacementMethodStorage.TypeUtf8 | ReplacementMethodStorage.MethodUtf8 | ReplacementMethodStorage.SignatureUtf8),
 			[("java/lang/Runtime",                      "remappedToGetRuntime",                null)]                      = (null, "getRuntime", null, null, false, ReplacementMethodStorage.Strings),
 
-			// NOTE: key must use *post-renamed* value, not pre-renamed value
-			// NOTE: SourceSignature lacking return type; "closer in spirit" to what `remapping-config.json` allows
-			[("net/dot/jni/test/RenameClassBase2",   "hashCode",                            "()")]                      = ("net/dot/jni/test/RenameClassBase2", "myNewHashCode", null, null, false, ReplacementMethodStorage.TypeUtf8 | ReplacementMethodStorage.MethodUtf8),
 		};
 
 		protected override JniRuntime.ReplacementMethodInfo? GetReplacementMethodInfoCore (string jniSourceType, string jniMethodName, string jniMethodSignature)
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
deleted file mode 100644
index 2949f14286c..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests
-{
-	[TestFixture]
-	public class JniInstanceMethodIDTest : JavaVMFixture
-	{
-		// https://code.google.com/p/android/issues/detail?id=65710
-		[Test]
-		public unsafe void CallNonvirtualVoidMethod_WithBaseMethodIDAndDerivedType ()
-		{
-			using (var b = new JniType ("net/dot/jni/test/CallNonvirtualBase"))
-			using (var d = new JniType ("net/dot/jni/test/CallNonvirtualDerived")) {
-				var m = b.GetInstanceMethod ("method", "()V");
-				var f = b.GetInstanceField ("methodInvoked", "Z");
-
-				var c = d.GetConstructor ("()V");
-				var g = d.GetInstanceField ("methodInvoked", "Z");
-				var o = d.NewObject (c, null);
-				try {
-					if (JavaVMFixture.CallNonvirtualVoidMethodSupportsDeclaringClassMismatch) {
-						JniEnvironment.InstanceMethods.CallNonvirtualVoidMethod (o, d.PeerReference, m);
-						Assert.IsFalse (JniEnvironment.InstanceFields.GetBooleanField (o, f));
-						Assert.IsTrue (JniEnvironment.InstanceFields.GetBooleanField (o, g));
-					} else {
-						JniEnvironment.InstanceMethods.CallNonvirtualVoidMethod (o, d.PeerReference, m);
-						Assert.IsTrue (JniEnvironment.InstanceFields.GetBooleanField (o, f));
-						Assert.IsFalse (JniEnvironment.InstanceFields.GetBooleanField (o, g));
-					}
-				} finally {
-					JniObjectReference.Dispose (ref o);
-				}
-			}
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
index 83ebf2ece31..dd3ed929c22 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
@@ -18,62 +18,6 @@ public void Ctor_CanReferenceNonexistentType ()
 			JniPeerMembers.Dispose (members);
 		}
 
-#if !ANDROID    // Android doesn't allow providing a custom TypeManager
-		[Test]
-		[NonParallelizable]
-		public void HandledReplacementTypeMissDoesNotUseStringFallback ()
-		{
-			var typeManager = JavaVMFixture.TypeManager;
-			Assert.IsNotNull (typeManager);
-			typeManager.TrackReplacementTypeLookups ("java/lang/Double");
-			try {
-				var members = new JniPeerMembers ("java/lang/Double", typeof (MyString));
-				JniPeerMembers.Dispose (members);
-
-				var counts = typeManager.GetReplacementTypeLookupCounts ();
-				Assert.AreEqual (1, counts.Utf8);
-				Assert.AreEqual (0, counts.String);
-			} finally {
-				typeManager.TrackReplacementTypeLookups ("");
-			}
-		}
-#endif  // !ANDROID
-
-#if !__ANDROID__
-		[Test]
-		public void VirtualInvokeOnBaseInvokesMostDerivedJavaMethod ()
-		{
-			Assert.IsNull (GetInstanceMethods (MyString._members.InstanceMethods));
-			using (var s = new MyString ("hello!")) {
-				var registered = GetInstanceMethods (MyString._members.InstanceMethods);
-				Assert.AreEqual (1, registered.Count);  // for the constructor
-				Assert.AreEqual ("hello!", s.ToString ());
-				Assert.AreEqual (1, registered.Count);
-			}
-		}
-
-		[Test]
-		public void ConcurrentFirstUsePublishesSingleInstanceMethodCache ()
-		{
-			var members = new JniPeerMembers (MyString.JniTypeName, typeof (MyString));
-			try {
-				var methods = members.InstanceMethods;
-				var constructors = new JniMethodInfo [16];
-
-				Assert.IsNull (GetInstanceMethods (methods));
-				Parallel.For (0, constructors.Length, i => constructors [i] = methods.GetConstructor ("()V"));
-
-				var registered = GetInstanceMethods (methods);
-				Assert.AreEqual (1, registered.Count);
-				foreach (var constructor in constructors)
-					Assert.AreSame (constructors [0], constructor);
-				Assert.AreSame (registered ["()V"], constructors [0]);
-			} finally {
-				JniPeerMembers.Dispose (members);
-			}
-		}
-#endif  // !__ANDROID__
-
 		[Test]
 		public void PeerMemberCachesAreInitiallyNull ()
 		{
@@ -219,24 +163,9 @@ public void MethodLookupForNonexistentStaticMethodWillTryFallbacks ()
 				//   --- End of managed Java.Lang.NoSuchMethodError stack trace ---
 				// ```
 				Assert.IsTrue (e.Message.Contains ("doesNotExist", StringComparison.Ordinal));
-#if !ANDROID    // Android doesn't allow providing a custom TypeManager
-				Assert.AreEqual ("java/lang/Runtime",
-						JavaVMFixture.TypeManager.RequestedFallbackTypesForSimpleReference);
-#endif  // !ANDROID
 			}
 		}
 
-#if !__ANDROID__
-		[Test]
-		[Category ("NativeAOTIgnore")]
-		public void ReplacementTypeUsedForMethodLookup ()
-		{
-			using var o = new RenameClassDerived ();
-			int r = o.hashCode();
-			Assert.AreEqual (33, r);
-		}
-#endif  // !__ANDROID__
-
 		[Test]
 		[Category ("NativeAOTIgnore")]
 		public void ReplaceInstanceMethodName ()
@@ -274,54 +203,6 @@ public void ReplaceInstanceMethodWithStaticMethod ()
 			o.remappedToStaticHashCode ();
 		}
 
-#if !__ANDROID__
-		// Note: this test looks up a static method from one class, then
-		// calls `JNIEnv::CallStaticObjectMethod()` passing in a jclass
-		// for a *different* class.
-		//
-		// This appears to work on Desktop JVM.
-		//
-		// On Android, this will ABORT the app:
-		//  JNI DETECTED ERROR IN APPLICATION: can't call static int com.xamarin.interop.DesugarAndroidInterface$_CC.getClassName() with class java.lang.Class<com.xamarin.interop.AndroidInterface>
-		//      in call to CallStaticObjectMethodA
-		//
-		// This *also* aborts on JDK-17 + macOS + arm64:
-		//  FATAL ERROR in native method: Wrong object class or methodID passed to JNI call
-		//  Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-		//  V  [libjvm.dylib+0x4f718c]  jniCheck::validate_call(JavaThread*, _jclass*, _jmethodID*, _jobject*)+0x98
-		//  V  [libjvm.dylib+0x506474]  checked_jni_CallStaticObjectMethodA+0x150
-		//  C  [native JNI wrapper]  java_interop_jnienv_call_static_object_method_a+0x48
-		//  C  0x000000010798a8d8
-		//  C  0x000000010798a540
-		//  C  0x000000010798fa94
-		//  C  [libcoreclr.dylib+0x2db774]  CallDescrWorkerInternal+0x84
-		//  C  [libcoreclr.dylib+0x150db4]  CallDescrWorkerWithHandler(CallDescrData*, int)+0x74
-		//  C  [libcoreclr.dylib+0x1f92d0]  RuntimeMethodHandle::InvokeMethod(Object*, void**, SignatureNative*, bool)+0x79c
-		//  C  0x0000000104020ce4
-		//  …
-		//
-		// *Fascinating* the differences that can appear between JVM implementations
-		[Test]
-		public unsafe void DoesTheJmethodNeedToMatchDeclaringType ()
-		{
-			if (Environment.GetEnvironmentVariable ("CPUTYPE") is string cpu && cpu == "arm64") {
-				Assert.Ignore ("nope!");
-			}
-			if (VM.JdkInfo.Version is Version v && v >= new Version (17, 0)) {
-				// JDK-17 now crashes on this test as well:
-				// FATAL ERROR in native method: Wrong object class or methodID passed to JNI call
-				Assert.Ignore ("nope!");
-			}
-			var iface   = new JniType ("net/dot/jni/test/AndroidInterface");
-			var desugar = new JniType ("net/dot/jni/test/DesugarAndroidInterface$_CC");
-			var m       = desugar.GetStaticMethod ("getClassName", "()Ljava/lang/String;");
-
-			var r = JniEnvironment.StaticMethods.CallStaticObjectMethod (iface.PeerReference, m, null);
-			var s = JniEnvironment.Strings.ToString (ref r, JniObjectReferenceOptions.CopyAndDispose);
-			Assert.AreEqual ("DesugarAndroidInterface$-CC", s);
-		}
-#endif  // !__ANDROID__
-
 		[Test]
 		public void DesugarInterfaceStaticMethod ()
 		{
@@ -335,27 +216,6 @@ abstract class JavaLangSystemTestObject : JavaObject {
 		internal const string JniTypeName = "java/lang/System";
 	}
 
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	class MyString : JavaObject {
-		internal    const   string      JniTypeName = "java/lang/String";
-
-		internal    static  readonly    JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (MyString));
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		public unsafe MyString (string value)
-			: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			const   string  id  = "(Ljava/lang/String;)V";
-			var peer = _members.InstanceMethods.StartGenericCreateInstance (id, GetType (), value);
-			Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
-			_members.InstanceMethods.FinishGenericCreateInstance (id, this, value);
-		}
-	}
-
-
 	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	class JavaLangRemappingTestObject : JavaObject {
 		internal    const    string         JniTypeName = "java/lang/Object";
@@ -408,37 +268,6 @@ public static unsafe void doesNotExist ()
 		}
 	}
 
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	class RenameClassBase : JavaObject {
-		internal    const       string          JniTypeName    = "net/dot/jni/test/RenameClassBase1";
-		static      readonly    JniPeerMembers  _members        = new JniPeerMembers (JniTypeName, typeof (RenameClassBase));
-
-		public      override    JniPeerMembers  JniPeerMembers  => _members;
-
-		public RenameClassBase ()
-		{
-		}
-
-		public virtual unsafe int hashCode ()
-		{
-			const string id = "hashCode.()I";
-			return _members.InstanceMethods.InvokeVirtualInt32Method (id, this, null);
-		}
-	}
-
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	class RenameClassDerived : RenameClassBase {
-		internal    new     const       string          JniTypeName    = "net/dot/jni/test/RenameClassDerived";
-		public RenameClassDerived ()
-		{
-		}
-
-		public override unsafe int hashCode ()
-		{
-			return base.hashCode ();
-		}
-	}
-
 	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	interface IAndroidInterface : IJavaPeerable {
 		internal            const       string          JniTypeName    = "net/dot/jni/test/AndroidInterface";
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
deleted file mode 100644
index 8a5ef10a2b8..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[TestFixture]
-	public class JniRuntimeJniTypeManagerTests : JavaVMFixture {
-
-		[Test]
-		public void ReplacementMethodInfoToStringConvertsUtf8Pointers ()
-		{
-			var type = Marshal.StringToCoTaskMemUTF8 ("java/lang/Object");
-			var name = Marshal.StringToCoTaskMemUTF8 ("toString");
-			var signature = Marshal.StringToCoTaskMemUTF8 ("()Ljava/lang/String;");
-			try {
-				var info = new JniRuntime.ReplacementMethodInfo {
-					TargetJniTypeUtf8            = type,
-					TargetJniMethodNameUtf8      = name,
-					TargetJniMethodSignatureUtf8 = signature,
-				};
-
-				var value = info.ToString ();
-
-				Assert.That (value, Does.Contain ("TargetJniTypeUtf8 = \"java/lang/Object\""));
-				Assert.That (value, Does.Contain ("TargetJniMethodNameUtf8 = \"toString\""));
-				Assert.That (value, Does.Contain ("TargetJniMethodSignatureUtf8 = \"()Ljava/lang/String;\""));
-			} finally {
-				Marshal.ZeroFreeCoTaskMemUTF8 (type);
-				Marshal.ZeroFreeCoTaskMemUTF8 (name);
-				Marshal.ZeroFreeCoTaskMemUTF8 (signature);
-			}
-		}
-
-		[Test]
-		public void ReplacementTypeInfoSupportsStringAndUtf8Results ()
-		{
-			using var stringManager = new StringReplacementTypeManager ();
-			stringManager.GetReplacementTypeInfo ("java/lang/String", out var stringReplacement, out var stringReplacementUtf8);
-			Assert.AreEqual ("java/lang/Object", stringReplacement);
-			Assert.AreEqual (IntPtr.Zero, stringReplacementUtf8);
-			Assert.AreEqual (1, stringManager.LookupCount);
-
-			var utf8Value = Marshal.StringToCoTaskMemUTF8 ("java/lang/Object");
-			try {
-				using var utf8Manager = new Utf8ReplacementTypeManager (utf8Value);
-				utf8Manager.GetReplacementTypeInfo ("java/lang/Double", out var missingReplacement, out var missingReplacementUtf8);
-				Assert.IsNull (missingReplacement);
-				Assert.AreEqual (IntPtr.Zero, missingReplacementUtf8);
-				utf8Manager.GetReplacementTypeInfo ("java/lang/String", out var replacement, out var replacementUtf8);
-				Assert.IsNull (replacement);
-				Assert.AreEqual (utf8Value, replacementUtf8);
-				Assert.AreEqual ("java/lang/Object", utf8Manager.GetReplacementType ("java/lang/String"));
-			} finally {
-				Marshal.ZeroFreeCoTaskMemUTF8 (utf8Value);
-			}
-		}
-
-#if !__ANDROID__
-		[Test]
-		[RequiresDynamicCode ("This test uses ReflectionJniTypeManager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("This test uses ReflectionJniTypeManager, which is reflection-based and not trimming-compatible.")]
-		public void GetInvokerType ()
-		{
-			using (var vm  = new MyTypeManager ()) {
-				// Concrete type; no invoker
-				Assert.IsNull (vm.GetInvokerType (typeof (JavaObject)));
-
-				// Not a bound abstract Java type; no invoker
-				Assert.IsNull (vm.GetInvokerType (typeof (System.ICloneable)));
-
-				// Bound abstract Java type; has an invoker
-				Assert.AreSame (typeof (IJavaInterfaceInvoker), vm.GetInvokerType (typeof (IJavaInterface)));
-			}
-		}
-
-		[RequiresDynamicCode ("MyTypeManager uses ReflectionJniTypeManager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("MyTypeManager uses ReflectionJniTypeManager, which is reflection-based and not trimming-compatible.")]
-		class MyTypeManager : JniRuntime.ReflectionJniTypeManager {
-			public MyTypeManager ()
-			{
-			}
-		}
-#endif  // !__ANDROID__
-
-		class StringReplacementTypeManager : JniRuntime.JniTypeManager {
-
-			public int LookupCount { get; private set; }
-
-			protected override string GetReplacementTypeCore (string jniSimpleReference)
-			{
-				LookupCount++;
-				return jniSimpleReference == "java/lang/String" ? "java/lang/Object" : null;
-			}
-		}
-
-		class Utf8ReplacementTypeManager : JniRuntime.JniTypeManager {
-
-			readonly IntPtr replacement;
-
-			public Utf8ReplacementTypeManager (IntPtr replacement)
-			{
-				this.replacement = replacement;
-			}
-
-			protected override void GetReplacementTypeInfoCore (string jniSimpleReference, out string replacement, out IntPtr replacementUtf8)
-			{
-				replacement = jniSimpleReference == "java/lang/String" ? "ignored/string/value" : null;
-				replacementUtf8 = jniSimpleReference == "java/lang/String" ? this.replacement : IntPtr.Zero;
-			}
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
deleted file mode 100644
index a712105d7be..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Collections.Generic;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[TestFixture]
-	public class JniRuntimeJniValueManagerTests : JavaVMFixture {
-
-		[Test]
-		public void CreateValue ()
-		{
-			using (var vm  = new MyValueManager ())
-			using (var o = new JavaObject ()) {
-				vm.OnSetRuntime (JniRuntime.CurrentRuntime);
-
-				var r = o.PeerReference;
-				var x = (IJavaPeerable) vm.CreateValue (ref r, JniObjectReferenceOptions.Copy);
-				Assert.AreNotSame (o, x);
-				x.Dispose ();
-
-				x = vm.CreateValue<IJavaPeerable> (ref r, JniObjectReferenceOptions.Copy);
-				Assert.AreNotSame (o, x);
-				x.Dispose ();
-			}
-		}
-
-		[UnconditionalSuppressMessage ("AOT", "IL3050", Justification = "MyValueManager intentionally uses reflection-backed value manager behavior for tests.")]
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "MyValueManager intentionally uses reflection-backed value manager behavior for tests.")]
-		class MyValueManager : JniRuntime.ReflectionJniValueManager {
-
-			public override void WaitForGCBridgeProcessing ()
-			{
-			}
-
-			public override void CollectPeers ()
-			{
-			}
-
-			public override void AddPeer (IJavaPeerable reference)
-			{
-			}
-
-			public override void RemovePeer (IJavaPeerable reference)
-			{
-			}
-
-			public override void FinalizePeer (IJavaPeerable reference)
-			{
-			}
-
-			public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
-			{
-				return null;
-			}
-
-			public override IJavaPeerable PeekPeer (JniObjectReference reference)
-			{
-				return null;
-			}
-
-		}
-
-		[Test]
-		public void GetValue_ReturnsAlias ()
-		{
-			var local   = new JavaObject ();
-			local.UnregisterFromRuntime ();
-			Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.PeekValue (local.PeerReference));
-			// GetObject must always return a value (unless handle is null, etc.).
-			// However, since we called local.UnregisterFromRuntime(),
-			// JniRuntime.PeekObject() is null (asserted above), but GetObject() must
-			// **still** return _something_.
-			// In this case, it returns an _alias_.
-			// TODO: "most derived type" alias generation. (Not relevant here, but...)
-			var p       = local.PeerReference;
-			var alias   = JniRuntime.CurrentRuntime.ValueManager.GetValue<IJavaPeerable> (ref p, JniObjectReferenceOptions.Copy);
-			Assert.AreNotSame (local, alias);
-			alias.Dispose ();
-			local.Dispose ();
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithNullHandle ()
-		{
-			var r = new JniObjectReference ();
-			var o = JniRuntime.CurrentRuntime.ValueManager.GetValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsNull (o);
-		}
-
-		[Test]
-		public void PeekValue ()
-		{
-			JniObjectReference lref;
-			using (var o = new JavaObject ()) {
-				lref = o.PeerReference.NewLocalRef ();
-				Assert.AreSame (o, JniRuntime.CurrentRuntime.ValueManager.PeekValue (lref));
-			}
-			// At this point, the Java-side object is kept alive by `lref`,
-			// but the wrapper instance has been disposed, and thus should
-			// be unregistered, and thus unfindable.
-			Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.PeekValue (lref));
-			JniObjectReference.Dispose (ref lref);
-		}
-
-		public void PeekValue_BoxedObjects ()
-		{
-			var vm          = JniRuntime.CurrentRuntime.ValueManager;
-			var marshaler   = vm.GetValueMarshaler<object> ();
-			var ad          = AppDomain.CurrentDomain;
-
-			var proxy       = marshaler.CreateGenericArgumentState (ad);
-			Assert.AreSame (ad, vm.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ad, ref proxy);
-
-			var ex  = new InvalidOperationException ("boo!");
-			proxy   = marshaler.CreateGenericArgumentState (ex);
-			Assert.AreSame (ex, vm.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ex, ref proxy);
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithInvalidSafeHandle ()
-		{
-			var invalid = new JniObjectReference ();
-			Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.GetValue (ref invalid, JniObjectReferenceOptions.CopyAndDispose));
-		}
-
-#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-		[Test]
-		public unsafe void GetValue_FindBestMatchType ()
-		{
-			using (var t = new JniType (TestType.JniTypeName)) {
-				var c = t.GetConstructor ("()V");
-				var o = t.NewObject (c, null);
-				using (var w = JniRuntime.CurrentRuntime.ValueManager.GetValue<IJavaPeerable> (ref o, JniObjectReferenceOptions.CopyAndDispose)) {
-					Assert.AreEqual (typeof (TestType), w.GetType ());
-					Assert.IsTrue (((TestType) w).ExecutedActivationConstructor);
-				}
-			}
-		}
-#endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
deleted file mode 100644
index b52a53edab2..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
+++ /dev/null
@@ -1,531 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Threading;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-#if !__ANDROID__
-	// Modifies JniRuntime.valueManager instance field; can't be done in parallel
-	[NonParallelizable]
-	public abstract class JniRuntimeJniValueManagerContract : JavaVMFixture {
-
-		[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-		protected abstract Type ValueManagerType {
-			get;
-		}
-
-		protected virtual JniRuntime.JniValueManager CreateValueManager ()
-		{
-			var manager = Activator.CreateInstance (ValueManagerType) as JniRuntime.JniValueManager;
-			return manager ?? throw new InvalidOperationException ($"Could not create instance of `{ValueManagerType}`!");
-		}
-
-#pragma warning disable CS8618
-		JniRuntime.JniValueManager  systemManager;
-		JniRuntime.JniValueManager  valueManager;
-#pragma warning restore CS8618
-
-		[SetUp]
-		public void CreateVM ()
-		{
-			systemManager   = JniRuntime.CurrentRuntime.valueManager!;
-			valueManager    = CreateValueManager ();
-			valueManager.OnSetRuntime (JniRuntime.CurrentRuntime);
-			JniRuntime.CurrentRuntime.valueManager  = valueManager;
-		}
-
-		[TearDown]
-		public void DestroyVM ()
-		{
-			JniRuntime.CurrentRuntime.valueManager  = systemManager;
-			systemManager   = null!;
-			valueManager?.Dispose ();
-			valueManager    = null!;
-		}
-
-		[Test]
-		public void AddPeer ()
-		{
-		}
-
-		int GetSurfacedPeersCount ()
-		{
-			return valueManager.GetSurfacedPeers ().Count;
-		}
-
-		[Test]
-		public void AddPeer_NoDuplicates ()
-		{
-			int startPeerCount  = GetSurfacedPeersCount ();
-			using (var v = new MyDisposableObject ()) {
-				// MyDisposableObject ctor implicitly calls AddPeer();
-				Assert.AreEqual (startPeerCount + 1, GetSurfacedPeersCount (), DumpPeers ());
-				valueManager.AddPeer (v);
-				Assert.AreEqual (startPeerCount + 1, GetSurfacedPeersCount (), DumpPeers ());
-			}
-		}
-
-		[Test]
-		public void ConstructPeer_ImplicitViaBindingConstructor_PeerIsInSurfacedPeers ()
-		{
-			int startPeerCount  = GetSurfacedPeersCount ();
-
-			var g               = new GetThis ();
-			var surfaced        = valueManager.GetSurfacedPeers ();
-			Assert.AreEqual (startPeerCount + 1, surfaced.Count);
-
-			var found           = false;
-			foreach (var pr in surfaced) {
-				if (!pr.SurfacedPeer.TryGetTarget (out var p))
-					continue;
-				if (object.ReferenceEquals (g, p)) {
-					found = true;
-				}
-			}
-			Assert.IsTrue (found);
-
-			var localRef        = g.PeerReference.NewLocalRef ();
-			g.Dispose ();
-			Assert.AreEqual (startPeerCount, GetSurfacedPeersCount ());
-			Assert.IsNull (valueManager.PeekPeer (localRef));
-			JniObjectReference.Dispose (ref localRef);
-		}
-
-		[Test]
-		public void ConstructPeer_ImplicitViaBindingMethod_PeerIsInSurfacedPeers ()
-		{
-			int startPeerCount  = GetSurfacedPeersCount ();
-
-			var g               = new GetThis ();
-			var surfaced        = valueManager.GetSurfacedPeers ();
-			Assert.AreEqual (startPeerCount + 1, surfaced.Count);
-
-			var found           = false;
-			foreach (var pr in surfaced) {
-				if (!pr.SurfacedPeer.TryGetTarget (out var p))
-					continue;
-				if (object.ReferenceEquals (g, p)) {
-					found = true;
-				}
-			}
-			Assert.IsTrue (found);
-
-			var localRef        = g.PeerReference.NewLocalRef ();
-			g.Dispose ();
-			Assert.AreEqual (startPeerCount, GetSurfacedPeersCount ());
-			Assert.IsNull (valueManager.PeekPeer (localRef));
-			JniObjectReference.Dispose (ref localRef);
-		}
-
-		// https://github.com/dotnet/android/issues/11101
-		[Test]
-		public void ConstructPeer_CalledMultipleTimes_ShouldNotLeakGlobalRefs ()
-		{
-			// Simulate what TypeManager.Activate does in dotnet/android:
-			// 1. Create an uninitialized JavaObject
-			// 2. Set a peer reference (storing the raw handle)
-			// 3. The constructor chain then calls ConstructPeer multiple times
-			//
-			// This should not leak JNI global references.
-
-			using (var original = new MyDisposableObject ()) {
-				// Get the jobject handle, simulating the IntPtr jobject param in Activate
-				var handle = original.PeerReference;
-
-				// Create an uninitialized peer and set its reference (simulating Activate)
-				var peer = (IJavaPeerable) RuntimeHelpers.GetUninitializedObject (typeof (MyDisposableObject));
-				peer.SetPeerReference (new JniObjectReference (handle.Handle));
-
-				try {
-					// Now simulate the constructor chain calling ConstructPeer multiple times
-					var ref1 = new JniObjectReference (handle.Handle);
-					valueManager.ConstructPeer (peer, ref ref1, JniObjectReferenceOptions.Copy);
-
-					int grefAfterFirst = JniEnvironment.Runtime.GlobalReferenceCount;
-
-					var ref2 = new JniObjectReference (handle.Handle);
-					valueManager.ConstructPeer (peer, ref ref2, JniObjectReferenceOptions.Copy);
-
-					int grefAfterSecond = JniEnvironment.Runtime.GlobalReferenceCount;
-
-					// The second ConstructPeer should NOT create an additional global ref
-					Assert.AreEqual (grefAfterFirst, grefAfterSecond,
-						"Second ConstructPeer call should not create an additional global ref");
-				} finally {
-					peer.Dispose ();
-				}
-			}
-		}
-
-
-		[Test]
-		public void CollectPeers ()
-		{
-			// TODO
-		}
-
-		[Test]
-		public void CreatePeer_InvalidHandleReturnsNull ()
-		{
-			var r = new JniObjectReference ();
-			var o = valueManager.CreatePeer (ref r, JniObjectReferenceOptions.Copy, null);
-			Assert.IsNull (o);
-		}
-
-		[Test]
-		public unsafe void CreatePeer_UsesFallbackType ()
-		{
-			using var t = new JniType (AnotherJavaInterfaceImpl.JniTypeName);
-
-			var ctor    = t.GetConstructor ("()V");
-			var lref    = t.NewObject (ctor, null);
-
-			using var p = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.CopyAndDispose, typeof (IJavaInterface));
-
-			Assert.IsFalse (lref.IsValid);  // .CopyAndDispose disposes
-
-			Assert.IsNotNull (p);
-			Assert.AreSame (typeof (IJavaInterfaceInvoker), p!.GetType ());
-		}
-
-		[Test]
-		public void CreatePeer_CreatesNewValueUsingActivationConstructor ()
-		{
-			using var v1    = new AnotherJavaInterfaceImpl ();
-			var lref        = v1.PeerReference.NewLocalRef ();
-			try {
-				using var v2    = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.CopyAndDispose, typeof (AnotherJavaInterfaceImpl));
-				Assert.AreNotSame (v1, v2, "CreatePeer() should create new values");
-			}
-			finally {
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public void DisposePeerUnlessReferenced_CallsManagedDispose ()
-		{
-			using var registered = new AnotherJavaInterfaceImpl ();
-			var lref = registered.PeerReference.NewLocalRef ();
-			try {
-				using var alias = valueManager.CreatePeer (
-						ref lref,
-						JniObjectReferenceOptions.Copy,
-						typeof (AnotherJavaInterfaceImpl)) as AnotherJavaInterfaceImpl
-					?? throw new InvalidOperationException ("Could not create peer alias.");
-
-				Assert.AreNotSame (registered, alias);
-				Assert.AreSame (registered, valueManager.PeekPeer (lref));
-
-				alias.DisposeUnlessReferenced ();
-
-				Assert.IsTrue (alias.DisposeCalled, "The unregistered alias should receive its managed disposal callback.");
-				Assert.IsFalse (alias.PeerReference.IsValid, "The unregistered alias should release its JNI reference.");
-				Assert.IsFalse (registered.DisposeCalled, "The registered peer should remain undisposed.");
-				Assert.IsTrue (registered.PeerReference.IsValid, "The registered peer should retain its JNI reference.");
-			} finally {
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public unsafe void GetPeer_ReentrantActivation_ReturnsRegisteredPeer ()
-		{
-			using var t = new JniType (AnotherJavaInterfaceImpl.JniTypeName);
-			var ctor = t.GetConstructor ("()V");
-			var lref = t.NewObject (ctor, null);
-			AnotherJavaInterfaceImpl? reentrant = null;
-			var createdPeers = new List<AnotherJavaInterfaceImpl> ();
-			try {
-				Assert.IsNull (valueManager.PeekPeer (lref));
-				AnotherJavaInterfaceImpl.PeerCreated = createdPeers.Add;
-				AnotherJavaInterfaceImpl.BeforeConstruct = reference => {
-					reentrant = valueManager.GetPeer (reference, typeof (AnotherJavaInterfaceImpl)) as AnotherJavaInterfaceImpl;
-				};
-
-				var peer = valueManager.GetPeer (lref, typeof (AnotherJavaInterfaceImpl)) as AnotherJavaInterfaceImpl
-					?? throw new InvalidOperationException ("Could not create peer.");
-				var registered = valueManager.PeekPeer (lref)
-					?? throw new InvalidOperationException ("No peer was registered.");
-
-				Assert.AreSame (reentrant, registered, "The reentrant lookup should register first.");
-				Assert.AreSame (registered, peer, "The outer lookup should return the registered peer.");
-				Assert.AreEqual (2, createdPeers.Count, "Both lookups should construct a peer.");
-				Assert.AreNotSame (createdPeers [0], createdPeers [1]);
-				foreach (var created in createdPeers) {
-					Assert.AreEqual (ReferenceEquals (created, registered), created.PeerReference.IsValid,
-						"Only the returned registered peer should retain a JNI reference.");
-					Assert.AreEqual (!ReferenceEquals (created, registered), created.DisposeCalled,
-						"Only the losing alias should receive its managed disposal callback.");
-				}
-			} finally {
-				AnotherJavaInterfaceImpl.BeforeConstruct = null;
-				AnotherJavaInterfaceImpl.PeerCreated = null;
-				foreach (var peer in createdPeers)
-					peer.Dispose ();
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public void CreatePeer_ThrowsIfNoActivationConstructorPresent ()
-		{
-			using var v1    = new GetThis ();
-			var lref        = v1.PeerReference.NewLocalRef ();
-			var ex = Assert.Throws<NotSupportedException> (
-					() => valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.CopyAndDispose, typeof (GetThis)),
-					$"`GetThis` has no activation constructor, so attempting to use it should throw NotSupportedException.");
-			Assert.IsTrue (lref.IsValid, "lref should still be valid");
-			JniObjectReference.Dispose (ref lref);
-		}
-
-		[Test]
-		public void CreatePeer_ReplaceableDoesNotReplace ()
-		{
-			var v       = new AnotherJavaInterfaceImpl ();
-			var lref    = v.PeerReference.NewLocalRef ();
-			v.Dispose ();
-
-			try {
-				Assert.IsNull (valueManager.PeekPeer (lref), "v.Dispose() should have unregistered the peer.");
-				var peer1   = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.Copy, typeof (AnotherJavaInterfaceImpl));
-				Assert.IsTrue (
-						peer1!.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable),
-						$"Expected peer1.JniManagedPeerState to have .Replaceable, but was {peer1.JniManagedPeerState}.");
-				Assert.AreSame (peer1, valueManager.PeekPeer (lref),
-						$"Expected peer1==PeekValue(peer1.PeerReference); it's the only one that should exist!");
-
-				var peer2   = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.Copy, typeof (AnotherJavaInterfaceImpl));
-				Assert.IsTrue (
-						peer2!.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable),
-						$"Expected peer2.JniManagedPeerState to have .Replaceable, but was {peer2.JniManagedPeerState}.");
-				Assert.AreNotSame (peer1, peer2, "Expected peer1 and peer2 to be different instances.");
-
-				var peeked  = valueManager.PeekPeer (lref);
-				Assert.AreSame (peer1, peeked,
-						"Expected peer1 and peeked to be the same instance; " +
-						$"peeked={RuntimeHelpers.GetHashCode (peeked).ToString ("x")}, " +
-						$"peer1={RuntimeHelpers.GetHashCode (peer1).ToString ("x")}, " +
-						$"peer2={RuntimeHelpers.GetHashCode (peer2).ToString ("x")}");
-			} finally {
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public void CreateValue ()
-		{
-			using (var o = new JavaObject ()) {
-				var r = o.PeerReference;
-				var x = (IJavaPeerable) valueManager.CreateValue (ref r, JniObjectReferenceOptions.Copy)!;
-				Assert.AreNotSame (o, x);
-				x.Dispose ();
-
-				x = valueManager.CreateValue<IJavaPeerable> (ref r, JniObjectReferenceOptions.Copy);
-				Assert.AreNotSame (o, x);
-				x!.Dispose ();
-			}
-		}
-
-		[Test]
-		public void GetValue_ReturnsAlias ()
-		{
-			var local   = new JavaObject ();
-			local.UnregisterFromRuntime ();
-			Assert.IsNull (valueManager.PeekValue (local.PeerReference));
-			// GetObject must always return a value (unless handle is null, etc.).
-			// However, since we called local.UnregisterFromRuntime(),
-			// JniRuntime.PeekObject() is null (asserted above), but GetObject() must
-			// **still** return _something_.
-			// In this case, it returns an _alias_.
-			// TODO: "most derived type" alias generation. (Not relevant here, but...)
-			var p       = local.PeerReference;
-			var alias   = JniRuntime.CurrentRuntime.ValueManager.GetValue<IJavaPeerable> (ref p, JniObjectReferenceOptions.Copy);
-			Assert.AreNotSame (local, alias);
-			alias!.Dispose ();
-			local.Dispose ();
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithNullHandle ()
-		{
-			var r = new JniObjectReference ();
-			var o = valueManager.GetValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsNull (o);
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithInvalidSafeHandle ()
-		{
-			var invalid = new JniObjectReference ();
-			Assert.IsNull (valueManager.GetValue (ref invalid, JniObjectReferenceOptions.CopyAndDispose));
-		}
-
-		[Test]
-		public unsafe void GetValue_FindBestMatchType ()
-		{
-#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-			using (var t = new JniType (TestType.JniTypeName)) {
-				var c = t.GetConstructor ("()V");
-				var o = t.NewObject (c, null);
-				using (var w = valueManager.GetValue<IJavaPeerable> (ref o, JniObjectReferenceOptions.CopyAndDispose)) {
-					Assert.AreEqual (typeof (TestType), w!.GetType ());
-					Assert.IsTrue (((TestType) w).ExecutedActivationConstructor);
-				}
-			}
-#endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-		}
-
-		[Test]
-		public void PeekPeer ()
-		{
-			Assert.IsNull (valueManager.PeekPeer (new JniObjectReference ()));
-
-			using (var v = new MyDisposableObject ()) {
-				Assert.IsNotNull (valueManager.PeekPeer (v.PeerReference));
-				Assert.AreSame (v, valueManager.PeekPeer (v.PeerReference));
-			}
-		}
-
-		[Test]
-		public void PeekValue ()
-		{
-			JniObjectReference lref;
-			using (var o = new JavaObject ()) {
-				lref = o.PeerReference.NewLocalRef ();
-				Assert.AreSame (o, valueManager.PeekValue (lref));
-			}
-			// At this point, the Java-side object is kept alive by `lref`,
-			// but the wrapper instance has been disposed, and thus should
-			// be unregistered, and thus unfindable.
-			Assert.IsNull (valueManager.PeekValue (lref));
-			JniObjectReference.Dispose (ref lref);
-		}
-
-		[Test]
-		public void PeekValue_BoxedObjects ()
-		{
-			var marshaler   = valueManager.GetValueMarshaler<object> ();
-			var ad          = AppDomain.CurrentDomain;
-
-			var proxy       = marshaler.CreateGenericArgumentState (ad);
-			Assert.AreSame (ad, valueManager.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ad, ref proxy);
-
-			var ex  = new InvalidOperationException ("boo!");
-			proxy   = marshaler.CreateGenericArgumentState (ex);
-			Assert.AreSame (ex, valueManager.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ex, ref proxy);
-		}
-
-		void AllNestedRegistrationScopeTests ()
-		{
-			AddPeer ();
-			AddPeer_NoDuplicates ();
-			ConstructPeer_ImplicitViaBindingConstructor_PeerIsInSurfacedPeers ();
-			CreateValue ();
-			GetValue_FindBestMatchType ();
-			GetValue_ReturnsAlias ();
-			GetValue_ReturnsNullWithInvalidSafeHandle ();
-			GetValue_ReturnsNullWithNullHandle ();
-			PeekPeer ();
-			PeekValue ();
-			PeekValue_BoxedObjects ();
-		}
-
-		string DumpPeers ()
-		{
-			return DumpPeers (valueManager.GetSurfacedPeers ());
-		}
-
-		static string DumpPeers (IEnumerable<JniSurfacedPeerInfo> peers)
-		{
-			return string.Join ("," + Environment.NewLine, peers);
-		}
-
-
-		// also test:
-		// Singleton scenario
-		// Types w/o "activation" constructors -- need to support checking parent scopes
-		// nesting of scopes
-		// Adding an instance already added in a previous scope?
-	}
-
-	public abstract class JniRuntimeJniValueManagerContract<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-			T
-		> : JniRuntimeJniValueManagerContract
-	{
-		[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-		protected override Type ValueManagerType => typeof (T);
-	}
-
-	[TestFixture]
-	public class JniRuntimeJniValueManagerContract_NoGCIntegration : JniRuntimeJniValueManagerContract<ManagedValueManager> {
-	}
-#endif  // !__ANDROID__
-
-	// Note: Java side implements JavaInterface, while managed binding DOES NOT.
-	// This is so that `CreatePeer(…, typeof(IJavaInterface))` tests don't use an existing AnotherJavaInterfaceImpl instance.
-	//
-	// This is mostly identical to MyJavaInterfaceImpl; the important difference is that
-	// it contains an activation constructor, while MyJavaInterfaceImpl does not.
-	// MyJavaInterfaceImpl can't have one, as that's what provokes the NotSupportedException in the JavaAs() tests.
-	//
-	// We want one here so that in "bad" `CreatePeer()` implementations, we'll find this peer and construct it
-	// before verifying that it satisfies the targetType requirement.
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	public class AnotherJavaInterfaceImpl : JavaObject {
-		internal            const       string          JniTypeName    = "net/dot/jni/test/AnotherJavaInterfaceImpl";
-
-		internal    static  readonly    JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (AnotherJavaInterfaceImpl));
-
-		internal static Action<JniObjectReference>? BeforeConstruct;
-		internal static Action<AnotherJavaInterfaceImpl>? PeerCreated;
-
-		public bool DisposeCalled {
-			get;
-			private set;
-		}
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		unsafe AnotherJavaInterfaceImpl (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			var callback = BeforeConstruct;
-			BeforeConstruct = null;
-			callback?.Invoke (reference);
-			Construct (ref reference, options);
-			PeerCreated?.Invoke (this);
-		}
-
-		public unsafe AnotherJavaInterfaceImpl ()
-			: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			const   string  id  = "()V";
-			var peer = _members.InstanceMethods.StartCreateInstance (id, GetType (), null);
-			Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
-			_members.InstanceMethods.FinishCreateInstance (id, this, null);
-		}
-
-		protected override void Dispose (bool disposing)
-		{
-			if (disposing)
-				DisposeCalled = true;
-			base.Dispose (disposing);
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
index d7af269401a..63144cf2fec 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Reflection;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Diagnostics.CodeAnalysis;
 
@@ -11,9 +10,6 @@
 
 namespace Java.InteropTests
 {
-#if !__ANDROID__
-	[NonParallelizable]
-#endif  // !__ANDROID__
 	[TestFixture]
 	public class JniRuntimeTest : JavaVMFixture
 	{
@@ -25,62 +21,12 @@ public void CreateJavaVM ()
 			Assert.IsTrue (JniEnvironment.EnvironmentPointer != IntPtr.Zero);
 		}
 
-#if !__ANDROID__
-		[Test]
-		[RequiresDynamicCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not trimming-compatible.")]
-		public void JDK_OnlySupportsOneVM ()
-		{
-			try {
-				var second = new TestJVM (new TestJVMOptions () {
-					JvmLibraryPath  = TestJVM.GetJvmLibraryPath (),
-				});
-				// If we reach here, we're in a JVM that supports > 1 VM
-				second.Dispose ();
-				Assert.Ignore ();
-			} catch (NotSupportedException) {
-			} catch (Exception e){
-				Assert.Fail ("Expected NotSupportedException; got: {0}", e);
-			}
-		}
-
-		[Test]
-		[RequiresDynamicCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not trimming-compatible.")]
-		public void UseInvocationPointerOnNewThread ()
-		{
-			var InvocationPointer = JniRuntime.CurrentRuntime.InvocationPointer;
-
-			var t = new Thread (() => {
-				try {
-					var second = new TestJVM (new TestJVMOptions () {
-						InvocationPointer   = InvocationPointer,
-					});
-				}
-				catch (Exception e) {
-					Assert.Fail ("Expected no exception, got: {0}", e);
-				}
-			});
-			t.Start ();
-			t.Join ();
-		}
-#endif  // !__ANDROID__
-
 		[Test]
 		public void CreateJavaVMWithNullBuilder ()
 		{
 			Assert.Throws<ArgumentNullException> (() => new JavaVMWithNullBuilder ());
 		}
 
-#if !__ANDROID__
-		[Test]
-		public void BuiltInSimpleReferenceMap_ContainsManagedPeerByDefault ()
-		{
-			var types = JniRuntime.CurrentRuntime.TypeManager.GetTypes (new JniTypeSignature (ManagedPeer.JniTypeName));
-			Assert.IsTrue (types.Contains (typeof (ManagedPeer)));
-		}
-#endif  // !__ANDROID__
-
 		class JavaVMWithNullBuilder : JniRuntime {
 			public JavaVMWithNullBuilder ()
 				: base ((JniRuntime.CreationOptions) null)
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs
index 3a407b527d1..ff5fb0d66a1 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs
@@ -88,18 +88,6 @@ public void GetTypeSignature_Type ()
 			AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>),         "[[I",                  true,   2);
 			AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>[]),       "[[[I",                 true,   3);
 
-#if !__ANDROID__
-			// Re-enable once typemap files contain `JavaObject` subclasses, not just Java.Lang.Object subclasses
-			//
-			// Note: dotnet/android@5c23bcda updates Java.Lang.Object to inherit JavaObject; this is not enough,
-			// as `<GenerateJavaStubs/>` only processes assemblies if they reference Mono.Android.dll.
-			AssertGetJniTypeInfoForType (typeof (GenericHolder<int>),       GenericHolder<int>.JniTypeName,    false,   0);
-
-			// XAJavaInterop1 Java Callable Wrappers, as used in dotnet/android, may contain
-			// `Runtime.register("Java.InteropTests.GenericHolder`1, Mono.Android-Tests", …)`,
-			// which results in a generic type definition.  Permit this.
-			AssertGetJniTypeInfoForType (typeof (GenericHolder<>),          GenericHolder<int>.JniTypeName,    false,   0);
-#endif  // !__ANDROID__
 		}
 
 		static void AssertGetJniTypeInfoForType (Type type, string jniType, bool isKeyword, int arrayRank)
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
index 97397fc70a6..6ef4b07b487 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 
 using Java.Interop;
 
@@ -19,5 +20,55 @@ public void Constructor ()
 			Assert.AreEqual (a.MarshalerType, typeof (DemoValueTypeValueMarshaler));
 		}
 	}
-}
 
+	[JniValueMarshaler (typeof (DemoValueTypeValueMarshaler))]
+	struct DemoValueType {
+		public int Value { get; }
+
+		public DemoValueType (int value)
+		{
+			Value = value;
+		}
+	}
+
+	class DemoValueTypeValueMarshaler : JniValueMarshaler<DemoValueType> {
+
+		JniValueMarshaler<int> Int32Marshaler;
+
+		public override bool IsJniValueType => Int32Marshaler.IsJniValueType;
+
+		public DemoValueTypeValueMarshaler ()
+		{
+			Int32Marshaler = JniRuntime.CurrentRuntime.ValueManager.GetValueMarshaler<int> ();
+		}
+
+		public override DemoValueType CreateGenericValue (
+			ref JniObjectReference reference,
+			JniObjectReferenceOptions options,
+			Type targetType)
+		{
+			var value = Int32Marshaler.CreateGenericValue (ref reference, options, typeof (int));
+			return new DemoValueType (value);
+		}
+
+		public override JniValueMarshalerState CreateGenericArgumentState (DemoValueType value, ParameterAttributes synchronize)
+		{
+			return Int32Marshaler.CreateGenericArgumentState (value.Value, synchronize);
+		}
+
+		public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (DemoValueType value, ParameterAttributes synchronize)
+		{
+			return Int32Marshaler.CreateGenericObjectReferenceArgumentState (value.Value, synchronize);
+		}
+
+		public override void DestroyArgumentState (object value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
+		{
+			Int32Marshaler.DestroyArgumentState ((value as DemoValueType?)?.Value, ref state, synchronize);
+		}
+
+		public override void DestroyGenericArgumentState (DemoValueType value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
+		{
+			Int32Marshaler.DestroyGenericArgumentState (value.Value, ref state, synchronize);
+		}
+	}
+}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
deleted file mode 100644
index 1f704229448..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
+++ /dev/null
@@ -1,772 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-using Java.Interop;
-using Java.Interop.Expressions;
-
-using Mono.Linq.Expressions;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-#if !__ANDROID__
-	public abstract class JniValueMarshalerContractTests<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-			T
-		> : JavaVMFixture
-	{
-
-		protected   abstract    T       Value           {get;}
-
-		protected   virtual     bool    IsJniValueType  {get;}
-		protected   virtual     bool    UsesProxy       {get;}
-
-		protected   virtual     bool    Equals (T x, T y)
-		{
-			return EqualityComparer<T>.Default.Equals (x, y);
-		}
-
-		protected   virtual     void    Dispose (T value)
-		{
-		}
-
-		protected   JniValueMarshaler<T>    marshaler;
-
-		protected JniValueMarshalerContractTests (JniValueMarshaler<T> marshaler = null)
-		{
-			this.marshaler  = marshaler ?? JniRuntime.CurrentRuntime.ValueManager.GetValueMarshaler<T> ();
-		}
-
-		[Test]
-		public void TestIsJniValueType ()
-		{
-			Assert.AreEqual (IsJniValueType, marshaler.IsJniValueType);
-		}
-
-		[Test]
-		public void CreateArgumentState ()
-		{
-			if (IsJniValueType) {
-				var s   = marshaler.CreateArgumentState (Value);
-
-				// Note: Only valid if `Value` isn't 0, so don't do that!
-				Assert.AreNotEqual (new JniArgumentValue (), s.JniArgumentValue);
-
-				// JniValueMarshaler<T>.CreateArgumentState() for value types only
-				// fills out the JniArgumentValue value, nothing else.
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.IsNull (s.PeerableValue);
-				Assert.IsNull (s.Extra);
-
-				marshaler.DestroyArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-			else {
-				var s   = marshaler.CreateArgumentState (Value);
-
-				if (s.PeerableValue != null) {
-					Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-				}
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-				marshaler.DestroyArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-		}
-
-		[Test]
-		public void CreateGenericArgumentState ()
-		{
-			if (IsJniValueType) {
-				var s   = marshaler.CreateGenericArgumentState (Value);
-
-				// Note: Only valid if `Value` isn't 0, so don't do that!
-				Assert.AreNotEqual (new JniArgumentValue (), s.JniArgumentValue);
-
-				// JniValueMarshaler<T>.CreateArgumentState() for value types only
-				// fills out the JniArgumentValue value, nothing else.
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.IsNull (s.PeerableValue);
-				Assert.IsNull (s.Extra);
-
-				marshaler.DestroyGenericArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-			else {
-				var s   = marshaler.CreateGenericArgumentState (Value);
-
-				if (s.PeerableValue != null) {
-					Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-				}
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-				marshaler.DestroyGenericArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-		}
-
-		[Test]
-		public void CreateObjectReferenceArgumentState_DefaultValue ()
-		{
-			var s = marshaler.CreateObjectReferenceArgumentState (default (T));
-
-			if (IsJniValueType) {
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-			} else {
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (), s.JniArgumentValue);
-			}
-			Assert.IsNull (s.PeerableValue);
-			marshaler.DestroyArgumentState (default (T), ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateObjectReferenceArgumentState ()
-		{
-			var s   = marshaler.CreateObjectReferenceArgumentState (Value);
-			if (s.PeerableValue != null) {
-				Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-			}
-			Assert.IsTrue (s.ReferenceValue.IsValid);
-			Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-			marshaler.DestroyArgumentState (Value, ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateGenericObjectReferenceArgumentState_DefaultValue ()
-		{
-			var s = marshaler.CreateGenericObjectReferenceArgumentState (default (T));
-
-			if (IsJniValueType) {
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-			} else {
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (), s.JniArgumentValue);
-			}
-			Assert.IsNull (s.PeerableValue);
-			marshaler.DestroyGenericArgumentState (default (T), ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateGenericObjectReferenceArgumentState ()
-		{
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (Value);
-			if (s.PeerableValue != null) {
-				Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-			}
-			Assert.IsTrue (s.ReferenceValue.IsValid);
-			Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-			marshaler.DestroyGenericArgumentState (Value, ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateValue ()
-		{
-			var s   = marshaler.CreateObjectReferenceArgumentState (Value);
-			var r   = s.ReferenceValue;
-			var o   = marshaler.CreateValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsTrue (Equals (Value, (T) o));
-			if (!UsesProxy && !typeof(T).IsValueType)
-				Assert.AreNotSame (Value, o);
-			marshaler.DestroyArgumentState (Value, ref s);
-
-			Dispose ((T) o);
-		}
-
-		[Test]
-		public void CreateGenericValue ()
-		{
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (Value);
-			var r   = s.ReferenceValue;
-			var o   = marshaler.CreateGenericValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsTrue (Equals (Value, o));
-			if (!UsesProxy && !typeof(T).IsValueType)
-				Assert.AreNotSame (Value, o);
-			marshaler.DestroyGenericArgumentState (Value, ref s);
-
-			Dispose (o);
-		}
-
-		[Test]
-		public void DestroyArgumentState ()
-		{
-			var s   = new JniValueMarshalerState ();
-			marshaler.DestroyArgumentState (null, ref s);
-		}
-
-		[Test]
-		public void DestroyGenericArgumentState ()
-		{
-			var s   = new JniValueMarshalerState ();
-			marshaler.DestroyGenericArgumentState (default (T), ref s);
-		}
-
-		[Test]
-		[RequiresUnreferencedCode ("CreateReturnValueFromManagedExpression")]
-		[RequiresDynamicCode ("CreateReturnValueFromManagedExpression")]
-		public void CreateReturnValueFromManagedExpression ()
-		{
-			var runtime = Expression.Variable (typeof (JniRuntime), "__jvm");
-			var value   = Expression.Variable (typeof (T),          "__value");
-			var context = new JniValueMarshalerContext (runtime) {
-				LocalVariables  = {
-					runtime,
-					value,
-				},
-			};
-			var ret     = marshaler.CreateReturnValueFromManagedExpression (context, value);
-			CheckExpression (context, GetExpectedReturnValueFromManagedExpression (runtime.Name, value.Name, ret), ret);
-		}
-
-		protected virtual string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var valueType       = GetTypeName (typeof (T));
-			var marshalerType   = GetTypeName (marshaler.GetType ());
-			return $@"{{
-	JniRuntime {jvm};
-	{valueType} {value};
-	{marshalerType} {value}_marshaler;
-	JniValueMarshalerState {value}_state;
-	IntPtr {value}_val;
-	IntPtr {value}_rtn;
-
-	try
-	{{
-		{value}_marshaler = new {marshalerType}();
-		{value}_state = {value}_marshaler.CreateArgumentState((object){value}, ParameterAttributes.None);
-		{value}_val = {value}_state.ReferenceValue.Handle;
-		{value}_rtn = References.NewReturnToJniRef({value}_state.ReferenceValue);
-		return {value}_rtn;
-	}}
-	finally
-	{{
-		{value}_marshaler.DestroyArgumentState((object){value}, {value}_state, ParameterAttributes.None);
-	}}
-}}";
-		}
-
-		void CheckExpression (JniValueMarshalerContext context, string expected, Expression ret)
-		{
-			var body    = Expression.Block (context.CreationStatements.Concat (new[]{ ret }));
-			var cleanup = context.CleanupStatements.Any ()
-				? (Expression) Expression.Block (context.CleanupStatements.Reverse ())
-				: (Expression) Expression.Empty ();
-			var expr    = Expression.TryFinally (body, cleanup);
-			var block   = Expression.Block (context.LocalVariables, expr);
-			// Convert line endings to Unix style to support building and running on different OS types.
-			string blockCSharp = block.ToCSharpCode ();
-			blockCSharp = blockCSharp.Replace ("\r\n", "\n");
-			expected = expected.Replace ("\r\n", "\n");
-			Console.WriteLine ("# jonp: expected: {0}", GetType ().Name);
-			Console.WriteLine (blockCSharp);
-			Assert.AreEqual (expected, blockCSharp);
-		}
-
-		protected static string GetTypeName (Type type)
-		{
-			switch (type.Name) {
-			case "Boolean":
-				return "bool";
-			case "Byte":
-				return "byte";
-			case "Char":
-				return "char";
-			case "Double":
-				return "double";
-			case "Int16":
-				return "short";
-			case "Int32":
-				return "int";
-			case "Int64":
-				return "long";
-			case "Object":
-				return "object";
-			case "SByte":
-				return "sbyte";
-			case "Single":
-				return "float";
-			}
-			if (type.IsArray) {
-				return GetTypeName (type.GetElementType ()) + "[]";
-			}
-			if (!type.IsGenericType) {
-				return type.Name;
-			}
-			var n = new System.Text.StringBuilder ();
-			n.Append (type.Name);
-			var b = type.Name.IndexOf ('`');
-			n.Remove (b, type.Name.Length - b);
-			n.Append ("<");
-			n.Append (string.Join (", ", type.GenericTypeArguments.Select (tp => GetTypeName (tp))));
-			n.Append (">");
-			return n.ToString ();
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_String_ContractTests : JniValueMarshalerContractTests<string> {
-		protected   override    string      Value       {get {return "value";}}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var rname       = ((ParameterExpression) ret).Name;
-			return $@"{{
-	JniRuntime {jvm};
-	string {value};
-	JniObjectReference {value}_ref;
-	IntPtr {value}_rtn;
-
-	try
-	{{
-		{value}_ref = Strings.NewString({value});
-		{value}_rtn = References.NewReturnToJniRef({value}_ref);
-		return {rname};
-	}}
-	finally
-	{{
-		JniObjectReference.Dispose(__value_ref);
-	}}
-}}";
-		}
-	}
-
-	public abstract class JniValueMarshaler_BuiltinType_ContractTests<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-			T
-		> : JniValueMarshalerContractTests<T>
-	{
-		protected   override    bool    IsJniValueType  {get {return true;}}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var valueType   = GetTypeName (typeof (T));
-			var rname       = ((ParameterExpression) ret).Name;
-			return $@"{{
-	JniRuntime {jvm};
-	{valueType} {value};
-
-	try
-	{{
-		return {rname};
-	}}
-	finally
-	{{
-		default(void);
-	}}
-}}";
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Boolean_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<bool> {
-		protected   override    bool    Value           {get {return true;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_SByte_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<sbyte> {
-		protected   override    sbyte   Value           {get {return (sbyte) 2;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Char_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<char> {
-		protected   override    char    Value           {get {return '3';}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int16_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<short> {
-		protected   override    short   Value           {get {return (short) 4;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int32_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<int> {
-		protected   override    int     Value           {get {return 5;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int64_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<long> {
-		protected   override    long    Value           {get {return 6;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Single_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<float> {
-		protected   override    float   Value           {get {return 7F;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Double_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<double> {
-		protected   override    double  Value           {get {return 8D;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableBoolean_ContractTests : JniValueMarshalerContractTests<bool?> {
-		protected   override    bool?   Value           {get {return true;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableSByte_ContractTests : JniValueMarshalerContractTests<sbyte?> {
-		protected   override    sbyte?  Value           {get {return (sbyte) 2;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableByte_ContractTests : JniValueMarshalerContractTests<byte?> {
-		protected   override    byte?   Value           {get {return (byte) 200;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableChar_ContractTests : JniValueMarshalerContractTests<char?> {
-		protected   override    char?   Value           {get {return '3';}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableInt16_ContractTests : JniValueMarshalerContractTests<short?> {
-		protected   override    short?  Value           {get {return (short) 4;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableInt32_ContractTests : JniValueMarshalerContractTests<int?> {
-		protected   override    int?    Value           {get {return 5;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableInt64_ContractTests : JniValueMarshalerContractTests<long?> {
-		protected   override    long?   Value           {get {return 6;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableSingle_ContractTests : JniValueMarshalerContractTests<float?> {
-		protected   override    float?  Value           {get {return 7F;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableDouble_ContractTests : JniValueMarshalerContractTests<double?> {
-		protected   override    double? Value           {get {return 8D;}}
-	}
-
-	public abstract class JniInt32ArrayValueMarshalerContractTests<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-			T
-		> : JniValueMarshalerContractTests<T>
-			where T : IEnumerable<int>
-	{
-		protected   abstract    T       CreateArray (int[] values);
-		protected   abstract    string  ValueMarshalerSourceType    {get;}
-
-		protected   override    T       Value {
-			get {return CreateArray (new[]{ 1, 2, 3 });}
-		}
-
-		protected   override    bool    Equals (T x, T y)
-		{
-			return x.SequenceEqual (y);
-		}
-
-		[Test]
-		public unsafe void DestroyGenericArgumentState_UpdatesSource ()
-		{
-			var a   = CreateArray (new[]{ 1 });
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (a);
-			fixed (int *p = new[]{3})
-				JniEnvironment.Arrays.SetIntArrayRegion (s.ReferenceValue, 0, 1, p);
-			marshaler.DestroyGenericArgumentState (a, ref s);
-			Assert.AreEqual (3, a.First ());
-			Dispose (a);
-		}
-
-		protected override void Dispose (T value)
-		{
-			var d = value as IDisposable;
-			if (d != null) {
-				d.Dispose ();
-			}
-		}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			return $@"{{
-	JniRuntime __jvm;
-	{ValueMarshalerSourceType} __value;
-	ValueMarshaler __value_marshaler;
-	JniValueMarshalerState __value_state;
-	IntPtr __value_val;
-	IntPtr __value_rtn;
-
-	try
-	{{
-		__value_marshaler = new ValueMarshaler();
-		__value_state = __value_marshaler.CreateArgumentState((object)__value, ParameterAttributes.None);
-		__value_val = __value_state.ReferenceValue.Handle;
-		__value_rtn = References.NewReturnToJniRef(__value_state.ReferenceValue);
-		return __value_rtn;
-	}}
-	finally
-	{{
-		__value_marshaler.DestroyArgumentState((object)__value, __value_state, ParameterAttributes.None);
-	}}
-}}";
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int32Array_ContractTests : JniInt32ArrayValueMarshalerContractTests<int[]> {
-		protected   override    int[]                   CreateArray (int[] values) {return values;}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "int[]";}}
-
-		[Test]
-		public unsafe void CreateGenericObjectReferenceArgumentState_OutParameterDoesNotCopy ()
-		{
-			var a   = new[]{ 1 };
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (a, ParameterAttributes.Out);
-			int v;
-			JniEnvironment.Arrays.GetIntArrayRegion (s.ReferenceValue, 0, 1, &v);
-			Assert.AreEqual (0, v);
-			marshaler.DestroyGenericArgumentState (a, ref s);
-		}
-
-		[Test]
-		public unsafe void DestroyGenericArgumentState_InParameterDoesNotUpdatesSource ()
-		{
-			var a   = CreateArray (new[]{ 1 });
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (a);
-			fixed (int *p = new[]{3})
-				JniEnvironment.Arrays.SetIntArrayRegion (s.ReferenceValue, 0, 1, p);
-			marshaler.DestroyGenericArgumentState (a, ref s, ParameterAttributes.In);
-			Assert.AreEqual (1, a.First ());
-			Dispose (a);
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_ListOfInt32_ContractTests : JniInt32ArrayValueMarshalerContractTests<IList<int>> {
-		protected   override    IList<int>              CreateArray (int[] values) {return values;}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "IList<int>";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_JavaArray_Int32_ContractTests : JniInt32ArrayValueMarshalerContractTests<JavaArray<int>> {
-		protected   override    JavaArray<int>          CreateArray (int[] values) {return new JavaInt32Array (values);}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "JavaArray<int>";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_JavaPrimitiveArray_Int32_ContractTests : JniInt32ArrayValueMarshalerContractTests<JavaPrimitiveArray<int>> {
-		protected   override    JavaPrimitiveArray<int> CreateArray (int[] values) {return new JavaInt32Array (values);}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "JavaPrimitiveArray<int>";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_JavaInt32Array_ContractTests : JniInt32ArrayValueMarshalerContractTests<JavaInt32Array> {
-		protected   override    JavaInt32Array          CreateArray (int[] values) {return new JavaInt32Array (values);}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "JavaInt32Array";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_object_ContractTests : JniValueMarshalerContractTests<object> {
-
-		readonly    object      value   = new object ();
-
-		protected   override    object                  Value               {get {return value;}}
-		protected   override    bool                    UsesProxy           {get {return true;}}
-
-		[Test]
-		public unsafe void ProxyObjectMethodsDelegateToManagedValue ()
-		{
-			var value       = new ProxyValue (42);
-			var equalValue  = new ProxyValue (42);
-			var otherValue  = new ProxyValue (43);
-			var valueState  = marshaler.CreateGenericObjectReferenceArgumentState (value);
-			var equalState  = marshaler.CreateGenericObjectReferenceArgumentState (equalValue);
-			var otherState  = marshaler.CreateGenericObjectReferenceArgumentState (otherValue);
-
-			try {
-				using (var proxyType = new JniType ("net/dot/jni/internal/JavaProxyObject")) {
-					var equals   = proxyType.GetInstanceMethod ("equals", "(Ljava/lang/Object;)Z");
-					var hashCode = proxyType.GetInstanceMethod ("hashCode", "()I");
-					var toString = proxyType.GetInstanceMethod ("toString", "()Ljava/lang/String;");
-					var args     = stackalloc JniArgumentValue [1];
-
-					args [0] = new JniArgumentValue (equalState.ReferenceValue);
-					Assert.IsTrue (JniEnvironment.InstanceMethods.CallBooleanMethod (valueState.ReferenceValue, equals, args));
-
-					args [0] = new JniArgumentValue (otherState.ReferenceValue);
-					Assert.IsFalse (JniEnvironment.InstanceMethods.CallBooleanMethod (valueState.ReferenceValue, equals, args));
-
-					Assert.AreEqual (value.GetHashCode (), JniEnvironment.InstanceMethods.CallIntMethod (valueState.ReferenceValue, hashCode));
-
-					var proxyString = JniEnvironment.InstanceMethods.CallObjectMethod (valueState.ReferenceValue, toString);
-					Assert.AreEqual (value.ToString (), JniEnvironment.Strings.ToString (ref proxyString, JniObjectReferenceOptions.CopyAndDispose));
-				}
-			} finally {
-				marshaler.DestroyGenericArgumentState (otherValue, ref otherState);
-				marshaler.DestroyGenericArgumentState (equalValue, ref equalState);
-				marshaler.DestroyGenericArgumentState (value, ref valueState);
-			}
-		}
-
-		[Test]
-		public void SpecificTypesAreUsed ()
-		{
-			// As a "GREF optimization", the JniValueMarshaler<object> implementation
-			// will use a "nested" JniValueMarshaler for the runtime type,
-			// e.g. a boxed int will use JniValueMarshaler<int>
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (42);
-			Assert.AreEqual ("java/lang/Integer",   JniEnvironment.Types.GetJniTypeNameFromInstance (s.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (42, ref s);
-
-			// Compare to the default proxy behavior...
-			s       = marshaler.CreateGenericObjectReferenceArgumentState (value);
-			Assert.AreEqual ("net/dot/jni/internal/JavaProxyObject",    JniEnvironment.Types.GetJniTypeNameFromInstance (s.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (value, ref s);
-		}
-
-		sealed class ProxyValue {
-
-			readonly int value;
-
-			public ProxyValue (int value)
-			{
-				this.value = value;
-			}
-
-			public override bool Equals (object obj)
-			{
-				return obj is ProxyValue other && value == other.value;
-			}
-
-			public override int GetHashCode ()
-			{
-				return value;
-			}
-
-			public override string ToString ()
-			{
-				return $"ProxyValue({value})";
-			}
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_IJavaPeerable_ContractTests : JniValueMarshalerContractTests<IJavaPeerable> {
-		readonly    IJavaPeerable      value   = new JavaObject ();
-
-		protected   override    IJavaPeerable       Value   {get {return value;}}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var pret    = (ParameterExpression) ret;
-			return $@"{{
-	JniRuntime {jvm};
-	IJavaPeerable {value};
-	JniObjectReference {value}_ref;
-	IntPtr {value}_rtn;
-
-	try
-	{{
-		if (null == {value})
-		{{
-			return {value}_ref = new JniObjectReference();
-		}}
-		else
-		{{
-			return {value}_ref = (IJavaPeerable){value}.PeerReference;
-		}}
-		{value}_rtn = References.NewReturnToJniRef({value}_ref);
-		return {pret.Name};
-	}}
-	finally
-	{{
-		default(void);
-	}}
-}}";
-		}
-	}
-#endif  // !__ANDROID__
-
-	[JniValueMarshaler (typeof (DemoValueTypeValueMarshaler))]
-	struct DemoValueType {
-		public  int Value   {get;}
-
-		public DemoValueType (int value)
-		{
-			Value = value;
-		}
-	}
-
-	class DemoValueTypeValueMarshaler : JniValueMarshaler<DemoValueType> {
-
-		JniValueMarshaler<int>  Int32Marshaler;
-
-		public override bool IsJniValueType {
-			get {
-				return Int32Marshaler.IsJniValueType;
-			}
-		}
-
-		public DemoValueTypeValueMarshaler ()
-		{
-			Int32Marshaler  = JniRuntime.CurrentRuntime.ValueManager.GetValueMarshaler<int> ();
-		}
-
-		public override DemoValueType CreateGenericValue (
-			ref JniObjectReference reference,
-			JniObjectReferenceOptions options,
-			Type targetType)
-		{
-			var v   = Int32Marshaler.CreateGenericValue (ref reference, options, typeof (int));
-			return new DemoValueType (v);
-		}
-
-		public override JniValueMarshalerState CreateGenericArgumentState (DemoValueType value, ParameterAttributes synchronize)
-		{
-			return Int32Marshaler.CreateGenericArgumentState (value.Value, synchronize);
-		}
-
-		public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (DemoValueType value, ParameterAttributes synchronize)
-		{
-			return Int32Marshaler.CreateGenericObjectReferenceArgumentState (value.Value, synchronize);
-		}
-
-		public override void DestroyArgumentState (object value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
-		{
-			Int32Marshaler.DestroyArgumentState ((value as DemoValueType?)?.Value, ref state, synchronize);
-		}
-
-		public override void DestroyGenericArgumentState (DemoValueType value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
-		{
-			Int32Marshaler.DestroyGenericArgumentState (value.Value, ref state, synchronize);
-		}
-	}
-
-#if !__ANDROID__
-	[TestFixture]
-	class JniValueMarshaler_DemoValueType_ContractTests : JniValueMarshalerContractTests<DemoValueType> {
-
-		protected   override    DemoValueType       Value           {get {return new DemoValueType (42);}}
-		protected   override    bool                IsJniValueType  {get {return true;}}
-	}
-#endif  // !__ANDROID__
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
deleted file mode 100644
index de783870094..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests
-{
-	[TestFixture]
-	public class MethodBindingTests : JavaVMFixture
-	{
-		//
-		//  https://bugzilla.xamarin.com/show_bug.cgi?id=17630
-		//  https://bugzilla.xamarin.com/show_bug.cgi?id=17750#c6
-		//  https://code.google.com/p/android/issues/detail?id=65710
-		//
-		//  The scenario: Assume a class hiearchy three-deep:
-		//      CallNonvirtualBase > CallNonvirtualDerived > CallNonvirtualDerived2
-		//
-		//  Historically, "normal" binding rules/convention within Xamarin.Android
-		//  is that if a Java class' Derived method overrides a base method
-		//  without changing anything (visibility, return type), then the Derived
-		//  method is not emitted.
-		//
-		//  Thus consider the java CallNonvirtualDerived.method() method, which
-		//  overrides but doesn't otherwise change CallNonvirtualBase.method().
-		//  Consequently, it doesn't need to be emitted, saving on IL size.
-		//
-		//  Which leads us to the problem: what should the body of the "common"
-		//  CallNonvirtualBase.Method() binding do? It needs to do EITHER a
-		//  virtual method dispatch (invocation on non-public types) OR a
-		//  non-virtual method dispatch (e.g. `base.Method()` invocation).
-		//
-		//  THEN there are concerns about efficiency and not doing too much extra
-		//  work within the binding methods.
-		//
-		//  Which brings us to THIS scenario: CallNonvirtualBase declares method().
-		//  CallNonvirtualDerived overrides method(), but the override isn't
-		//  declared within the CallNonvirtualDerived binding. Finally we have
-		//  CallNonvirtualDerived2, which inherits CallNonvirtualDerived and
-		//  doesn't override anything.
-		//
-		//  Logically then, if we have a CallNonvirtualDerived2 instance and we
-		//  invoke method() upon it, then we SHOULD invoke
-		//  CallNonvirtualDerived.method(). ASSERT that this is the case.
-		//  Failure to do so possibly results in Bug #17630/#65710, or #17750.
-		//
-		//  Aside: just to get to this point we're throwing in
-		//  JavaObject.JniThresholdType and JavaObject.JniThresholdClass.
-		//  These likely won't survive long.
-		//
-		//  Aside: in Bug #17630 terms, CallNonvirtualBase is ContextWrapper,
-		//  CallNonvirtualDerived is Activity, and CallNonvirtualDerived2 is
-		//  an Android Callable Wrapper/user subclass
-		[Test]
-		public void VirtualMethodBinding ()
-		{
-			using (var d = new CallNonvirtualDerived ()) {
-				d.Method ();
-				Assert.IsTrue (d.MethodInvoked);
-			}
-			using (var b = new CallNonvirtualBase ()) {
-				b.Method ();
-				Assert.IsTrue (b.MethodInvoked);
-			}
-			using (CallNonvirtualBase b = new CallNonvirtualDerived ()) {
-				b.Method ();
-				Assert.IsFalse (b.MethodInvoked);
-				Assert.IsTrue (((CallNonvirtualDerived) b).MethodInvoked);
-			}
-			using (var d2 = new CallNonvirtualDerived2 ()) {
-				d2.Method ();
-				Assert.IsTrue (((CallNonvirtualDerived) d2).MethodInvoked);
-				Assert.IsFalse (((CallNonvirtualBase) d2).MethodInvoked);
-			}
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java
deleted file mode 100644
index 02005c388b3..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.dot.jni.test;
-
-public class AnotherJavaInterfaceImpl
-	implements JavaInterface, Cloneable
-{
-	public String getValue() {
-		return "Another hello from Java!";
-	}
-
-	public Object clone() {
-		return this;
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java
deleted file mode 100644
index f4660d0cb87..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class CallVirtualFromConstructorBase implements GCUserPeerable {
-
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.CallVirtualFromConstructorBase, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public CallVirtualFromConstructorBase (int value) {
-		if (CallVirtualFromConstructorBase.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					"System.Int32",
-					value
-			);
-		}
-		calledFromConstructor (value);
-	}
-
-	public void calledFromConstructor (int value) {
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
-
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java
deleted file mode 100644
index 5ae143daf1c..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class CallVirtualFromConstructorDerived
-		extends CallVirtualFromConstructorBase
-		implements GCUserPeerable
-{
-	static {
-		net.dot.jni.ManagedPeer.registerNativeMembers (
-				CallVirtualFromConstructorDerived.class,
-				"");
-	}
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public CallVirtualFromConstructorDerived (int value) {
-		super (value);
-		if (CallVirtualFromConstructorDerived.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					"(I)V",
-					value
-			);
-		}
-	}
-
-	public static CallVirtualFromConstructorDerived newInstance (int value)
-	{
-		return new CallVirtualFromConstructorDerived (value);
-	}
-
-	public native void calledFromConstructor (int value);
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
-
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java
deleted file mode 100644
index d843e43a7c6..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class RenameClassBase1
-	implements GCUserPeerable
-{
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.RenameClassBase, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public RenameClassBase1 () {
-		System.out.println("RenameClassBase.<init>()");
-		if (RenameClassBase1.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	public int hashCode () {
-		System.out.println("RenameClassBase1.hashCode()");
-		return 16;
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java
deleted file mode 100644
index 562e15bff04..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class RenameClassBase2
-	extends RenameClassBase1
-	implements GCUserPeerable
-{
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.RenameClassBase, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public RenameClassBase2 () {
-		System.out.println("RenameClassBase.<init>()");
-		if (RenameClassBase2.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	public int hashCode () {
-		System.out.println("RenameClassBase2.hashCode()");
-		return 32;
-	}
-
-	public int myNewHashCode() {
-		System.out.println("RenameClassBase2.myNewHashCode()");
-		return 33;
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java
deleted file mode 100644
index cfbe173f005..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class RenameClassDerived
-	extends RenameClassBase2        // Note: does NOT match C# binding!  This is "post Bytecode rewriting"
-	implements GCUserPeerable
-{
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.RenameClassDerived, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public RenameClassDerived () {
-		System.out.println("RenameClassDerived.<init>()");
-		if (RenameClassDerived.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	// Note: while *at runtime* `RenameClassBase1` is replaced with `RenameClassBase2`,
-	// Java Callable Wrapper generator doesn't know about that (yet?), and thus the
-	// *original* method name will be present.
-	// Not sure if this is actually a problem; perhaps Bytecode rewriting happens *after*
-	// Java Callable Wrapper generation?
-	public int hashCode () {
-		System.out.println("RenameClassDerived.hashCode()");
-		return 64;
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
diff --git a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
index fd25f6e85cb..38c319b894c 100644
--- a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
+++ b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
@@ -27,13 +27,6 @@
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JavaVMFixture.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniNativeInterfaceTests.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniReferenceSafeHandleTest.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniInstanceMethodIDTest.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniRuntime.JniTypeManagerTests.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\MethodBindingTests.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniRuntime.JniValueManagerTests.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\CallVirtualFromConstructorBase.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\CallVirtualFromConstructorDerived.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\InvokeVirtualFromConstructorTests.cs" />
     <Compile Remove="$(JavaInteropTestDirectory)obj\Release\net7.0-android/designtime/Resource.designer.cs" />
   </ItemGroup>
 
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml b/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml
index 643106c7d20..0b1cea5f4e9 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml
@@ -1,7 +1,4 @@
 <replacements>
-  <replace-type
-      from="net/dot/jni/test/RenameClassBase1"
-      to="net/dot/jni/test/RenameClassBase2" />
   <replace-type
       from="net/dot/jni/test/AndroidInterface"
       to="net/dot/jni/test/DesugarAndroidInterface$_CC" />
@@ -29,10 +26,4 @@
       source-method-name="remappedToGetRuntime"
       target-type="java/lang/Runtime"
       target-method-name="getRuntime" target-method-instance-to-static="false" />
-  <replace-method
-      source-type="net/dot/jni/test/RenameClassBase2"
-      source-method-name="hashCode"
-      source-method-signature="()"
-      target-type="net/dot/jni/test/RenameClassBase2"
-      target-method-name="myNewHashCode" target-method-instance-to-static="false" />
 </replacements>

From b301a725e3becf27b2f577d9028652db6f62cc95 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 16:16:21 +0200
Subject: [PATCH 36/58] Preserve Android test discovery with default type map

Root reflection-discovered JcwGen and Mono.Android/Java.Interop fixtures when the type map default resolves at target execution. Always package the Android-safe GetThis fixture from the referenced test library, whose type map property remains unset at project evaluation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Xamarin.Android.JcwGen-Tests.csproj       |  9 +++++++
 .../Java.Interop-Tests.targets                | 24 +++++++------------
 .../Mono.Android.NET-Tests.csproj             | 14 ++++++++---
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
index 15d30a5f612..ede4e30982a 100644
--- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
+++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
@@ -36,6 +36,15 @@
     <RuntimeHostConfigurationOption Include="IncludeCategories" Value="$(IncludeCategories)" Condition=" '$(IncludeCategories)' != '' " />
   </ItemGroup>
 
+  <!-- NUnit discovers these fixtures by reflection; the type map default is set after project evaluation. -->
+  <Target Name="_AndroidRootJcwGenTests"
+      BeforeTargets="PrepareForILLink;_RunILLink"
+      Condition=" '$(Configuration)' == 'Release' and '$(PublishTrimmed)' == 'true' and '$(AndroidTypeMapImplementation)' == 'trimmable' ">
+    <ItemGroup>
+      <TrimmerRootAssembly Include="$(AssemblyName)" RootMode="All" />
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <ProjectReference Include="..\..\TestRunner.Core\TestRunner.Core.NET.csproj" />
     <ProjectReference Include="..\Xamarin.Android.FixJavaAbstractMethod-APIv2Binding\Xamarin.Android.FixJavaAbstractMethod-APIv2Binding.csproj" />
diff --git a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.targets b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.targets
index 813e443a09a..310adf457e2 100644
--- a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.targets
+++ b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.targets
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_JavaInteropTestsJarFile>Jars\Mono.Android-Test-classes.jar</_JavaInteropTestsJarFile>
-    <_JavaInteropTestsJarFile Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">Jars\Mono.Android-Test-classes-trimmable.jar</_JavaInteropTestsJarFile>
+    <_JavaInteropTestsJarFile>Jars\Mono.Android-Test-classes-trimmable.jar</_JavaInteropTestsJarFile>
   </PropertyGroup>
   <ItemGroup>
     <AndroidJavaLibrary Include="$(_JavaInteropTestsJarFile)" />
@@ -24,7 +23,7 @@
   <ItemGroup>
     <!--
       java-trimmable/net/dot/jni/test/GetThis.java is added explicitly via
-      TestJarEntry below when building for the trimmable typemap; it must be
+      TestJarEntry below; it must be
       removed from the implicit AndroidJavaSource glob so the .NET SDK does
       not also try to compile it as a regular AndroidJavaSource (which would
       collide with the desktop GetThis.java in the test JAR).
@@ -39,23 +38,16 @@
       the desktop-JVM static initializer (net.dot.jni.ManagedPeer.registerNativeMembers /
       ManagedPeer.construct) that is only registered by the Java.Interop test
       JVM and throws UnsatisfiedLinkError on Android. Both files declare
-      `public class net.dot.jni.test.GetThis`, so include exactly one based on
-      $(AndroidTypeMapImplementation). The trimmable variant lives in this
+      `public class net.dot.jni.test.GetThis`, so include only the Android variant.
+      Android apps use the trimmable type map by default, but this referenced
+      library does not inherit the app's AndroidTypeMapImplementation property.
+      The trimmable variant lives in this
       project (not the submodule) and in a parallel directory because javac
       requires the file name match the public class name.
     -->
-    <!--
-      Both branches below are mutually exclusive on $(AndroidTypeMapImplementation).
-      The trimmable variant uses a distinct output jar so MSBuild up-to-date
-      checks cannot reuse a non-trimmable jar with the desktop GetThis class.
-    -->
-    <TestJarEntry Include="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\java\**\*.java"
-                  Exclude="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\java\net\dot\jni\test\GetThis.java"
-                  Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' " />
     <TestJarEntry Include="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\java\**\*.java"
-                  Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' " />
-    <TestJarEntry Include="$(MSBuildThisFileDirectory)java-trimmable\net\dot\jni\test\GetThis.java"
-                  Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' " />
+                  Exclude="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\java\net\dot\jni\test\GetThis.java" />
+    <TestJarEntry Include="$(MSBuildThisFileDirectory)java-trimmable\net\dot\jni\test\GetThis.java" />
   </ItemGroup>
   <Target Name="_CopyTestJarFiles">
     <Copy
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index 42c688e8ffe..8df71832b03 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -82,16 +82,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="All" Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' " />
-    <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="All" Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' " />
     <TrimmerRootAssembly Include="StartupHook" RootMode="All" Condition=" '$(StartupHookSupport)' == 'true' " />
-    <TrimmerRootDescriptor Include="TrimmerRoots.xml" Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' " />
     <_AndroidRemapMembers Include="Remaps.xml" />
     <_AndroidRemapMembers Include="IsAssignableFromRemaps.xml" Condition=" '$(_AndroidIsAssignableFromCheck)' == 'false' " />
     <ProguardConfiguration Include="proguard.cfg" />
     <ProguardConfiguration Include="InterfaceCollection.proguard.cfg" />
   </ItemGroup>
 
+  <!-- Resolve the app's default type map before rooting NUnit's reflection-discovered tests. -->
+  <Target Name="_AndroidRootRuntimeTests"
+      BeforeTargets="PrepareForILLink;_RunILLink"
+      Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">
+    <ItemGroup>
+      <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="All" />
+      <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="All" />
+      <TrimmerRootDescriptor Include="TrimmerRoots.xml" />
+    </ItemGroup>
+  </Target>
+
   <!--
     NativeAOT trims the closed-generic-instantiation metadata for IEquatable<T>,
     so NUnit's EquatablesComparer.GetEquatableImplementations() ends up calling

From 4fe370aaac419b8b22b606a95cb546ec1b58f007 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 13:00:18 +0200
Subject: [PATCH 37/58] Simplify LLVM IR native source generation

Replace the reflection-based IR object model with focused textual emitters and ABI layout helpers. Remove unused native runtime linking generation and retain NativeAOT JNI initialization sources.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Microsoft.Android.Sdk.After.targets       |    1 -
 ...oft.Android.Sdk.AssemblyResolution.targets |   16 +-
 .../Microsoft.Android.Sdk.BuildOrder.targets  |    5 -
 ...icrosoft.Android.Sdk.NativeRuntime.targets |   66 -
 ...teCompressedAssembliesNativeSourceFiles.cs |    5 +-
 .../Tasks/GenerateJniRemappingNativeCode.cs   |    8 +-
 ...teLayoutBindings.CSharpBindingGenerator.cs |    1 -
 ...ateNativeAotEnvironmentAssemblerSources.cs |    3 +-
 ...ateNativeAotLibraryLoadAssemblerSources.cs |    5 +-
 .../GenerateNativeApplicationConfigSources.cs |   10 +-
 .../GenerateNativeRuntimeLinkingSources.cs    |  113 -
 .../Tasks/GetNativeRuntimeComponents.cs       |  139 --
 .../Tasks/LinkNativeRuntime.cs                |  161 --
 .../Tasks/PrepareAbiItems.cs                  |    3 -
 .../Tasks/ProcessNativeLibraries.cs           |   37 +-
 .../NativeAotBuildTests.cs                    |    1 -
 ...pressedAssembliesNativeSourceFilesTests.cs |   37 +
 .../GenerateJniRemappingNativeCodeTests.cs    |   56 +
 ...rateNativeApplicationConfigSourcesTests.cs |   43 +
 .../Tasks/LlvmIrGeneratorTests.cs             |   86 -
 .../Tasks/LlvmIrWriterTests.cs                |   72 +
 .../Utilities/EnvironmentHelper.cs            |    5 +-
 .../Utilities/AppEnvironmentVariableTable.cs  |   79 +
 .../Utilities/ApplicationConfig.cs            |   11 +-
 ...pplicationConfigNativeAssemblyGenerator.cs |  587 +++--
 ...ressedAssembliesNativeAssemblyGenerator.cs |  203 +-
 .../JniOnLoadNativeAssemblerHelper.cs         |   21 -
 .../JniRemappingAssemblyGenerator.cs          |  396 ++--
 .../Utilities/KnownMetadata.cs                |    1 -
 .../LlvmIrGenerator/FunctionAttributes.cs     | 1282 -----------
 .../LlvmIrAddressSignificance.cs              |   25 -
 .../LlvmIrGenerator/LlvmIrArraySection.cs     |   62 -
 .../LlvmIrGenerator/LlvmIrBufferManager.cs    |  108 -
 .../LlvmIrGenerator/LlvmIrCallMarkers.cs      |   25 -
 .../LlvmIrCallingConvention.cs                |   34 -
 .../LlvmIrGenerator/LlvmIrComposer.cs         |  101 -
 .../LlvmIrGenerator/LlvmIrDataLayout.cs       |  492 -----
 .../LlvmIrGenerator/LlvmIrFunction.cs         |  533 -----
 .../LlvmIrFunctionAttributeSet.cs             |  110 -
 .../LlvmIrGenerator/LlvmIrFunctionBody.cs     |  330 ---
 .../LlvmIrGenerator.Constants.cs              |   57 -
 .../LlvmIrGenerator/LlvmIrGenerator.cs        | 1960 -----------------
 .../LlvmIrGenerator/LlvmIrIcmpCond.cs         |   49 -
 .../LlvmIrGenerator/LlvmIrInstructions.cs     |  777 -------
 .../LlvmIrGenerator/LlvmIrKnownMetadata.cs    |   17 -
 .../LlvmIrGenerator/LlvmIrLinkage.cs          |   56 -
 .../LlvmIrGenerator/LlvmIrMetadataManager.cs  |  189 --
 .../Utilities/LlvmIrGenerator/LlvmIrModule.cs |  712 ------
 .../LlvmIrGenerator/LlvmIrModuleAArch64.cs    |   83 -
 .../LlvmIrGenerator/LlvmIrModuleArmV7a.cs     |   63 -
 .../LlvmIrModuleMergeBehavior.cs              |   38 -
 .../LlvmIrGenerator/LlvmIrModuleTarget.cs     |  113 -
 .../LlvmIrGenerator/LlvmIrModuleX64.cs        |  114 -
 .../LlvmIrGenerator/LlvmIrModuleX86.cs        |  103 -
 .../LlvmIrRuntimePreemption.cs                |   25 -
 .../LlvmIrGenerator/LlvmIrSectionedArray.cs   |   52 -
 .../LlvmIrGenerator/LlvmIrStringBlob.cs       |   81 -
 .../LlvmIrGenerator/LlvmIrStringEncoding.cs   |   17 -
 .../LlvmIrGenerator/LlvmIrStringGroup.cs      |   33 -
 .../LlvmIrGenerator/LlvmIrStringManager.cs    |   94 -
 .../LlvmIrGenerator/LlvmIrTypeCache.cs        |   40 -
 .../LlvmIrGenerator/LlvmIrVariable.cs         |  542 -----
 .../LlvmIrGenerator/LlvmIrVariableOptions.cs  |  117 -
 .../LlvmIrGenerator/LlvmIrWritability.cs      |   21 -
 .../LlvmIrGenerator/LlvmVisibility.cs         |   24 -
 .../LlvmIrGenerator/MemberInfoUtilities.cs    |  202 --
 .../NativeAssemblerAttribute.cs               |  111 -
 .../NativeAssemblerContextDataProvider.cs     |   73 -
 .../LlvmIrGenerator/NativeClassAttribute.cs   |   14 -
 .../LlvmIrGenerator/NativePointerAttribute.cs |   37 -
 .../Utilities/LlvmIrGenerator/StringHolder.cs |  179 --
 .../LlvmIrGenerator/StructureInfo.cs          |  103 -
 .../LlvmIrGenerator/StructureInstance.cs      |   96 -
 .../LlvmIrGenerator/StructureMemberInfo.cs    |  163 --
 .../LlvmIrGenerator/TypeUtilities.cs          |  214 --
 .../Utilities/LlvmIrHelpers.cs                |   91 -
 .../Utilities/LlvmIrTarget.cs                 |  106 +
 .../Utilities/LlvmIrWriter.cs                 |  414 ++++
 ...veAotEnvironmentNativeAssemblyGenerator.cs |   86 +-
 ...NativeAotJniInitNativeAssemblyGenerator.cs |   59 +-
 .../Utilities/NativeRuntimeComponents.cs      |  143 +-
 ...PreservePinvokesNativeAssemblyGenerator.cs |  372 ----
 .../Xamarin.Android.Common.targets            |   29 +-
 83 files changed, 1438 insertions(+), 11704 deletions(-)
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeRuntime.targets
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GetNativeRuntimeComponents.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/LinkNativeRuntime.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCompressedAssembliesNativeSourceFilesTests.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateJniRemappingNativeCodeTests.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/JniOnLoadNativeAssemblerHelper.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/FunctionAttributes.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrAddressSignificance.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrArraySection.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrBufferManager.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallMarkers.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallingConvention.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrDataLayout.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunction.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionAttributeSet.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionBody.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.Constants.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrIcmpCond.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrInstructions.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrKnownMetadata.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrLinkage.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrMetadataManager.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleAArch64.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleArmV7a.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleMergeBehavior.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleTarget.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX64.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX86.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrRuntimePreemption.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrSectionedArray.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringBlob.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringEncoding.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringGroup.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringManager.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrTypeCache.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariable.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariableOptions.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrWritability.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmVisibility.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/MemberInfoUtilities.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerAttribute.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerContextDataProvider.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeClassAttribute.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativePointerAttribute.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StringHolder.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInfo.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInstance.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureMemberInfo.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/TypeUtilities.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrHelpers.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrTarget.cs
 create mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.After.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.After.targets
index 3b82a416e25..2af7fdb39ee 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.After.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.After.targets
@@ -25,7 +25,6 @@ This file is imported *after* the Microsoft.NET.Sdk/Sdk.targets.
   <Import Project="Microsoft.Android.Sdk.AssemblyResolution.targets" />
 
   <!-- This one must be imported after `Microsoft.Android.Sdk.AssemblyResolution.targets` -->
-  <Import Project="Microsoft.Android.Sdk.NativeRuntime.targets" Condition=" '$(AndroidApplication)' == 'true' And '$(_AndroidRuntime)' == 'CoreCLR' " />
 
   <Import Project="Microsoft.Android.Sdk.ProjectCapabilities.targets" />
   <Import Project="Microsoft.Android.Sdk.Publish.targets" />
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
index 691cb182bef..2aedc6b1e76 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
@@ -316,25 +316,11 @@ _ResolveAssemblies MSBuild target.
       <_ExcludedNativeLibraries Condition=" '$(_AndroidRuntime)' == 'CoreCLR' And '$(AndroidIncludeDebugSymbols)' != 'true' " Include="libmscordbi" />
     </ItemGroup>
 
-    <!-- Let's keep the item group close to the task that uses them, the list is irrelevant for
-         anything else. The group MUST contain only shared libraries from the runtime pack.
-         DO NOT modify the group unless you're absolutely sure what you're doing -->
-    <ItemGroup Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " >
-      <_KnownRuntimeNativeLibrary Include="libSystem.Globalization.Native.so" />
-      <_KnownRuntimeNativeLibrary Include="libSystem.IO.Compression.Native.so" />
-      <_KnownRuntimeNativeLibrary Include="libSystem.Native.so" />
-      <_KnownRuntimeNativeLibrary Include="libSystem.Security.Cryptography.Native.Android.so" />
-      <_KnownRuntimeNativeLibrary Include="libclrjit.so" />
-      <_KnownRuntimeNativeLibrary Include="libcorclr.so" />
-    </ItemGroup>
-
     <ProcessNativeLibraries
-        NativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
         InputLibraries="@(_ResolvedNativeLibraries)"
         ExcludedLibraries="@(_ExcludedNativeLibraries)"
         Components="@(_MonoComponent->Distinct())"
-        IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
-        KnownRuntimeNativeLibraries="@(_KnownRuntimeNativeLibrary)">
+        IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)">
       <Output TaskParameter="OutputLibraries" ItemName="FrameworkNativeLibrary" />
     </ProcessNativeLibraries>
   </Target>
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
index 39b01d08114..0592661778b 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
@@ -31,10 +31,6 @@ properties that determine build ordering.
     </_AndroidBuildDependsOn>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(AndroidApplication)' == 'true' And '$(_AndroidRuntime)' == 'CoreCLR' ">
-    <_NativeRuntimeLinking>_LinkNativeRuntime</_NativeRuntimeLinking>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(AndroidApplication)' == 'True' ">
     <BuildDependsOn>
       $(_AndroidBuildDependsOn);
@@ -81,7 +77,6 @@ properties that determine build ordering.
       _ReadAndroidManifest;
       _CompileJava;
       _CreateApplicationSharedLibraries;
-      $(_NativeRuntimeLinking);
       _CompileDex;
       $(_AfterCompileDex);
       _CreateBaseApk;
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeRuntime.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeRuntime.targets
deleted file mode 100644
index 36daf0c2619..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeRuntime.targets
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-***********************************************************************************************
-Microsoft.Android.Sdk.NativeRuntime.targets
-
-Contains code to build and link the native runtime at application build time.
-
-***********************************************************************************************
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask TaskName="Xamarin.Android.Tasks.GetNativeRuntimeComponents" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.LinkNativeRuntime" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-
-  <Target Name="_PrepareUnifiedNativeRuntimeItems"
-          Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' ">
-    <ItemGroup>
-      <_UnifiedNativeRuntime Include="$(_AndroidApplicationSharedLibraryPath)%(_BuildTargetAbis.Identity)\libnetdroid-unified.so">
-        <abi>%(_BuildTargetAbis.Identity)</abi>
-        <ArchiveFileName>libmonodroid.so</ArchiveFileName>
-      </_UnifiedNativeRuntime>
-    </ItemGroup>
-
-    <ItemGroup>
-      <_ResolvedNativeArchive Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.a' " />
-      <_ResolvedNativeObjectFile Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.o' " />
-      <_ApplicationSharedLibrary Include="@(_UnifiedNativeRuntime)" />
-    </ItemGroup>
-
-    <GetNativeRuntimeComponents
-        MonoComponents="@(_MonoComponent)"
-        ResolvedNativeObjectFiles="@(_ResolvedNativeObjectFile)"
-        ResolvedNativeArchives="@(_ResolvedNativeArchive)">
-      <Output TaskParameter="NativeArchives" ItemName="_SelectedNativeArchive" />
-      <Output TaskParameter="RequiredLibraries" ItemName="_RequiredLinkLibraries" />
-      <Output TaskParameter="LinkStartFiles" ItemName="_NativeLinkStartFiles" />
-      <Output TaskParameter="LinkEndFiles" ItemName="_NativeLinkEndFiles" />
-      <Output TaskParameter="NativeSymbolsToExport" ItemName="_NativeSymbolsToExport" />
-    </GetNativeRuntimeComponents>
-  </Target>
-
-  <Target Name="_LinkNativeRuntime"
-          DependsOnTargets="_CompileNativeAssemblySources;_PrepareUnifiedNativeRuntimeItems"
-          Inputs="@(_NativeAssemblyTarget);@(_SelectedNativeArchive)"
-          Outputs="@(_UnifiedNativeRuntime)"
-          Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' ">
-
-    <!-- AndroidApiLevel must be set to the same version our CoreCLR runtime is built
-         against -->
-    <LinkNativeRuntime
-        MonoComponents="@(_MonoComponent)"
-        AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
-        IntermediateOutputPath="$(IntermediateOutputPath)"
-        NativeArchives="@(_SelectedNativeArchive)"
-        NativeObjectFiles="@(_NativeAssemblyTarget)"
-        NativeLinkStartFiles="@(_NativeLinkStartFiles)"
-        NativeLinkEndFiles="@(_NativeLinkEndFiles)"
-        NativeSymbolsToExport="@(_NativeSymbolsToExport)"
-        LinkLibraries="@(_RequiredLinkLibraries)"
-        OutputRuntimes="@(_UnifiedNativeRuntime)"
-        SupportedAbis="@(_BuildTargetAbis)"
-        RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)" />
-
-    <ItemGroup>
-      <FileWrites Include="@(_UnifiedNativeRuntime)" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs
index f0c800c8358..a25becf0fad 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs
@@ -100,10 +100,9 @@ void GenerateCompressedAssemblySources ()
 
 			void Generate (Dictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>? dict)
 			{
-				var composer = new CompressedAssembliesNativeAssemblyGenerator (Log, dict) {
+				var generator = new CompressedAssembliesNativeAssemblyGenerator (Log, dict) {
 					EmitComments = EmitLlvmIrComments,
 				};
-				LLVMIR.LlvmIrModule compressedAssemblies = composer.Construct ();
 
 				foreach (string abi in SupportedAbis) {
 					string baseAsmFilePath = Path.Combine (EnvironmentOutputDirectory, $"compressed_assemblies.{abi.ToLowerInvariant ()}");
@@ -111,7 +110,7 @@ void Generate (Dictionary<AndroidTargetArch, Dictionary<string, CompressedAssemb
 
 					using (var sw = MemoryStreamPool.Shared.CreateStreamWriter ()) {
 						try {
-							composer.Generate (compressedAssemblies, GenerateNativeApplicationConfigSources.GetAndroidTargetArchForAbi (abi), sw, llvmIrFilePath);
+							generator.Generate (GenerateNativeApplicationConfigSources.GetAndroidTargetArchForAbi (abi), sw, llvmIrFilePath);
 						} catch {
 							throw;
 						} finally {
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJniRemappingNativeCode.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJniRemappingNativeCode.cs
index 16cf42c3533..91d2daec925 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJniRemappingNativeCode.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJniRemappingNativeCode.cs
@@ -79,16 +79,14 @@ void Generate (string remappingXmlFilePath)
 			Generate (new JniRemappingAssemblyGenerator (Log, typeReplacements, methodReplacements), typeReplacements.Count);
 		}
 
-		void Generate (JniRemappingAssemblyGenerator jniRemappingComposer, int typeReplacementsCount)
+		void Generate (JniRemappingAssemblyGenerator jniRemappingGenerator, int typeReplacementsCount)
 		{
-			LLVMIR.LlvmIrModule module =  jniRemappingComposer.Construct ();
-
 			foreach (string abi in SupportedAbis) {
 				string baseAsmFilePath = Path.Combine (OutputDirectory, $"jni_remap.{abi.ToLowerInvariant ()}");
 				string llFilePath  = $"{baseAsmFilePath}.ll";
 
 				using (var sw = MemoryStreamPool.Shared.CreateStreamWriter ()) {
-					jniRemappingComposer.Generate (module, GenerateNativeApplicationConfigSources.GetAndroidTargetArchForAbi (abi), sw, llFilePath);
+					jniRemappingGenerator.Generate (GenerateNativeApplicationConfigSources.GetAndroidTargetArchForAbi (abi), sw, llFilePath);
 					sw.Flush ();
 					Files.CopyIfStreamChanged (sw.BaseStream, llFilePath);
 				}
@@ -96,7 +94,7 @@ void Generate (JniRemappingAssemblyGenerator jniRemappingComposer, int typeRepla
 
 			BuildEngine4.RegisterTaskObjectAssemblyLocal (
 				ProjectSpecificTaskObjectKey (JniRemappingNativeCodeInfoKey),
-				new JniRemappingNativeCodeInfo (typeReplacementsCount, jniRemappingComposer.ReplacementMethodIndexEntryCount),
+				new JniRemappingNativeCodeInfo (typeReplacementsCount, jniRemappingGenerator.ReplacementMethodIndexEntryCount),
 				RegisteredTaskObjectLifetime.Build
 			);
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs
index a2986bbad54..26d2e9f414f 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs
@@ -3,7 +3,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using Xamarin.Android.Tasks.LLVMIR;
 using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Tasks
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotEnvironmentAssemblerSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotEnvironmentAssemblerSources.cs
index 20fd07fa424..b27247d49b1 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotEnvironmentAssemblerSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotEnvironmentAssemblerSources.cs
@@ -39,11 +39,10 @@ public override bool RunTask ()
 
 		string environmentLlFilePath = outputFile.ItemSpec;
 		var generator = new NativeAotEnvironmentNativeAssemblyGenerator (Log, envBuilder);
-		LLVMIR.LlvmIrModule environmentModule = generator.Construct ();
 		using var environmentWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
 		bool fileFullyWritten = false;
 		try {
-			generator.Generate (environmentModule, targetArch, environmentWriter, environmentLlFilePath);
+			generator.Generate (targetArch, environmentWriter, environmentLlFilePath);
 			environmentWriter.Flush ();
 			Files.CopyIfStreamChanged (environmentWriter.BaseStream, environmentLlFilePath);
 			fileFullyWritten = true;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
index 19940d834a1..e8893bfc5f6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
@@ -92,7 +92,7 @@ public override bool RunTask ()
 
 		// Take library names, match against NativeRuntimeComponents to see whether a
 		// component has an init function associated with it.
-		var bclComponents = new NativeRuntimeComponents (monoComponents: null);
+		var bclComponents = new NativeRuntimeComponents ();
 		var bclInitFunctions = new List<string> ();
 
 		seen = new HashSet<string> (StringComparer.Ordinal);
@@ -146,11 +146,10 @@ public override bool RunTask ()
 
 		string jniInitFuncsLlFilePath = outputFile.ItemSpec;
 		var generator = new NativeAotJniInitNativeAssemblyGenerator (Log, bclInitFunctions, customInitFunctions);
-		LLVMIR.LlvmIrModule jniInitFuncsModule = generator.Construct ();
 		using var jniInitFuncsWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
 		bool fileFullyWritten = false;
 		try {
-			generator.Generate (jniInitFuncsModule, targetArch, jniInitFuncsWriter, jniInitFuncsLlFilePath!);
+			generator.Generate (targetArch, jniInitFuncsWriter, jniInitFuncsLlFilePath!);
 			jniInitFuncsWriter.Flush ();
 			Files.CopyIfStreamChanged (jniInitFuncsWriter.BaseStream, jniInitFuncsLlFilePath!);
 			fileFullyWritten = true;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
index 8fe4acf9d73..159660a70a6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
@@ -227,7 +227,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 
 			var jniRemappingNativeCodeInfo = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<GenerateJniRemappingNativeCode.JniRemappingNativeCodeInfo> (ProjectSpecificTaskObjectKey (GenerateJniRemappingNativeCode.JniRemappingNativeCodeInfoKey), RegisteredTaskObjectLifetime.Build);
 			Dictionary<string, string>? runtimeProperties = RuntimePropertiesParser.ParseConfig (ProjectRuntimeConfigFilePath, ProjectRuntimeConfigDevFilePath);
-			LLVMIR.LlvmIrComposer appConfigAsmGen = new ApplicationConfigNativeAssemblyGenerator (envBuilder.EnvironmentVariables, envBuilder.SystemProperties, runtimeProperties, Log) {
+			var appConfigAsmGen = new ApplicationConfigNativeAssemblyGenerator (envBuilder.EnvironmentVariables, envBuilder.SystemProperties, runtimeProperties, Log) {
 				UsesAssemblyPreload = envBuilder.Parser.UsesAssemblyPreload,
 				AndroidPackageName = AndroidPackageName,
 				PackageNamingPolicy = pnp,
@@ -243,9 +243,11 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 				MarshalMethodsEnabled = false,
 				IgnoreSplitConfigs = ShouldIgnoreSplitConfigs (),
 				HaveAssemblyStore = UseAssemblyStore,
+				EmitComments = EmitLlvmIrComments,
 			};
-			LLVMIR.LlvmIrModule appConfigModule = appConfigAsmGen.Construct ();
-			appConfigAsmGen.EmitComments = EmitLlvmIrComments;
+
+			// Any errors in the input data must be reported before any of the output files is written
+			appConfigAsmGen.Initialize ();
 
 			foreach (string abi in SupportedAbis) {
 				string targetAbi = abi.ToLowerInvariant ();
@@ -255,7 +257,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 
 				using var appConfigWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
 				try {
-					appConfigAsmGen.Generate (appConfigModule, targetArch, appConfigWriter, environmentLlFilePath);
+					appConfigAsmGen.Generate (targetArch, appConfigWriter, environmentLlFilePath);
 				} catch {
 					throw;
 				} finally {
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs
deleted file mode 100644
index 3c50e45cfc3..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeRuntimeLinkingSources.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Generates P/Invoke preservation code for native runtime linking.
-/// </summary>
-/// <remarks>
-/// The generated LLVM IR (.ll) is compiled with the other application native sources.
-/// </remarks>
-public class GenerateNativeRuntimeLinkingSources : AndroidTask
-{
-	/// <summary>
-	/// Gets the task prefix used for logging and error messages.
-	/// </summary>
-	public override string TaskPrefix => "GNM";
-
-	/// <summary>
-	/// Gets or sets the Mono runtime components to include in the build.
-	/// Used for P/Invoke preservation.
-	/// </summary>
-	public ITaskItem[] MonoComponents { get; set; } = [];
-
-	/// <summary>
-	/// Gets or sets the output directory for environment files.
-	/// Generated LLVM IR files are written to this directory.
-	/// </summary>
-	[Required]
-	public string EnvironmentOutputDirectory { get; set; } = "";
-
-	/// <summary>
-	/// Gets or sets the resolved assemblies to process.
-	/// These assemblies are scanned for P/Invokes when native linking is enabled.
-	/// </summary>
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	/// <summary>
-	/// Gets or sets the list of supported Android ABIs to generate code for.
-	/// Common values include arm64-v8a, armeabi-v7a, x86_64, and x86.
-	/// </summary>
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	/// <summary>
-	/// Generates the P/Invoke preservation sources for all supported Android ABIs.
-	/// </summary>
-	/// <returns>
-	/// true if the task completed successfully; false if errors occurred during processing.
-	/// </returns>
-	/// <remarks>
-	/// Scans framework assemblies for P/Invokes and emits LLVM IR for each ABI.
-	/// </remarks>
-	public override bool RunTask ()
-	{
-		foreach (var abi in SupportedAbis)
-			Generate (abi);
-
-		return !Log.HasLoggedErrors;
-	}
-
-	/// <summary>
-	/// Generates a native LLVM IR P/Invoke preservation source for an ABI.
-	/// </summary>
-	/// <param name="abi">The target Android ABI to generate code for (e.g., "arm64-v8a").</param>
-	/// <remarks>
-	/// Writes <c>pinvoke_preserve.{abi}.ll</c>.
-	/// </remarks>
-	void Generate (string abi)
-	{
-		// Setup target information and file paths
-		var targetAbi = abi.ToLowerInvariant ();
-		var targetArch = MonoAndroidHelper.AbiToTargetArch (abi);
-		var pinvokePreserveLlFilePath = Path.Combine (EnvironmentOutputDirectory, $"pinvoke_preserve.{targetAbi}.ll");
-
-		var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, targetArch, ScanPInvokes (targetArch), MonoComponents);
-		LLVMIR.LlvmIrModule pinvokePreserveModule = pinvokePreserveGen.Construct ();
-		using var pinvokePreserveWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
-		bool fileFullyWritten = false;
-		try {
-			pinvokePreserveGen.Generate (pinvokePreserveModule, targetArch, pinvokePreserveWriter, pinvokePreserveLlFilePath);
-			pinvokePreserveWriter.Flush ();
-			Files.CopyIfStreamChanged (pinvokePreserveWriter.BaseStream, pinvokePreserveLlFilePath);
-			fileFullyWritten = true;
-		} finally {
-			if (!fileFullyWritten) {
-				MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{pinvokePreserveLlFilePath}'", pinvokePreserveWriter.BaseStream);
-			}
-		}
-	}
-
-	List<PinvokeScanner.PinvokeEntryInfo> ScanPInvokes (AndroidTargetArch arch)
-	{
-		// Generated trimmable type map assemblies are attached only to the first ABI.
-		var assemblies = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: false);
-		if (!assemblies.TryGetValue (arch, out var archAssemblies)) {
-			throw new InvalidOperationException ($"No resolved assemblies for architecture '{arch}'.");
-		}
-		var frameworkAssemblies = archAssemblies.Values
-			.Where (assembly => bool.TryParse (assembly.GetMetadata ("FrameworkAssembly"), out bool isFramework) && isFramework)
-			.ToList ();
-		using var resolver = MonoAndroidHelper.MakeResolver (Log, arch, archAssemblies, loadDebugSymbols: false);
-		return new PinvokeScanner (Log).Scan (arch, resolver, frameworkAssemblies);
-	}
-
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetNativeRuntimeComponents.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetNativeRuntimeComponents.cs
deleted file mode 100644
index 0ad28721dc9..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GetNativeRuntimeComponents.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-#nullable enable
-using System;
-using System.IO;
-using System.Collections.Generic;
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Android.Build.Tasks;
-
-namespace Xamarin.Android.Tasks;
-
-public class GetNativeRuntimeComponents : AndroidTask
-{
-	public override string TaskPrefix => "GNRC";
-
-	public ITaskItem[]? MonoComponents { get; set; }
-
-	[Required]
-	public ITaskItem[] ResolvedNativeArchives { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] ResolvedNativeObjectFiles { get; set; } = [];
-
-	[Output]
-	public ITaskItem[] NativeArchives { get; set; } = [];
-
-	[Output]
-	public ITaskItem[] RequiredLibraries { get; set; } = [];
-
-	[Output]
-	public ITaskItem[] LinkStartFiles { get; set; } = [];
-
-	[Output]
-	public ITaskItem[] LinkEndFiles { get; set; } = [];
-
-	// TODO: more research, for now it seems `--export-dynamic-symbol=name` options generated from
-	//       this array don't work as expected.
-	[Output]
-	public ITaskItem[] NativeSymbolsToExport { get; set; } = [];
-
-	public override bool RunTask ()
-	{
-		var components = new NativeRuntimeComponents (MonoComponents);
-		var uniqueAbis = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
-		var archives = new List<ITaskItem> ();
-		var symbolsToExport = new List<ITaskItem> ();
-
-		Log.LogDebugMessage ($"Generating list of native files for linking");
-		foreach (NativeRuntimeComponents.Archive archiveItem in components.KnownArchives) {
-			Log.LogDebugMessage ($"  archive '{archiveItem.Name}'");
-			if (!archiveItem.Include) {
-				Log.LogDebugMessage ("    will not be included");
-				continue;
-			}
-			MakeArchiveItem (archiveItem, archives, uniqueAbis);
-			if (archiveItem.SymbolsToPreserve == null || archiveItem.SymbolsToPreserve.Count == 0) {
-				continue;
-			}
-
-			foreach (string symbolName in archiveItem.SymbolsToPreserve) {
-				MakeLibItem (symbolName, symbolsToExport, uniqueAbis);
-			}
-		}
-
-		NativeArchives = archives.ToArray ();
-		NativeSymbolsToExport = symbolsToExport.ToArray ();
-
-		var items = new List<ITaskItem> ();
-		foreach (string lib in components.NativeLibraries) {
-			MakeLibItem (lib, items, uniqueAbis);
-		}
-		RequiredLibraries = items.ToArray ();
-
-		items = new List<ITaskItem> ();
-		foreach (string startFile in components.LinkStartFiles) {
-			MakeFileItem ("_NativeLinkStartFiles", startFile, ResolvedNativeObjectFiles, items, uniqueAbis);
-		}
-		LinkStartFiles = items.ToArray ();
-
-		items = new List<ITaskItem> ();
-		foreach (string endFile in components.LinkEndFiles) {
-			MakeFileItem ("_NativeLinkEndFiles", endFile, ResolvedNativeObjectFiles, items, uniqueAbis);
-		}
-		LinkEndFiles = items.ToArray ();
-
-		return !Log.HasLoggedErrors;
-	}
-
-	void MakeLibItem (string libName, List<ITaskItem> libraries, HashSet<string> uniqueAbis)
-	{
-		foreach (string abi in uniqueAbis) {
-			var item = new TaskItem (libName);
-			item.SetMetadata (KnownMetadata.Abi, abi);
-			item.SetMetadata (KnownMetadata.NativeSharedLibrary, "true");
-			libraries.Add (item);
-		}
-	}
-
-	void MakeFileItem (string msbuildItemName, string fileName, ITaskItem[] inputItems, List<ITaskItem> outputItems, HashSet<string> uniqueAbis)
-	{
-		foreach (ITaskItem item in inputItems) {
-			string name = Path.GetFileName (item.ItemSpec);
-			if (MonoAndroidHelper.StringEquals (name, fileName, StringComparison.OrdinalIgnoreCase)) {
-				outputItems.Add (DoMakeItem (msbuildItemName, item, uniqueAbis));
-			}
-		}
-	}
-
-	void MakeArchiveItem (NativeRuntimeComponents.Archive archive, List<ITaskItem> archives, HashSet<string> uniqueAbis)
-	{
-		foreach (ITaskItem resolvedArchive in ResolvedNativeArchives) {
-			string fileName = Path.GetFileName (resolvedArchive.ItemSpec);
-			if (!MonoAndroidHelper.StringEquals (fileName, archive.Name, StringComparison.OrdinalIgnoreCase)) {
-				continue;
-			}
-
-			Log.LogDebugMessage ($"  creating msbuild item for archive '{archive.Name}'");
-			ITaskItem newItem = DoMakeItem ("_ResolvedNativeArchive", resolvedArchive, uniqueAbis);
-			newItem.SetMetadata (KnownMetadata.NativeLinkWholeArchive, archive.WholeArchive.ToString ());
-			newItem.SetMetadata (KnownMetadata.NativeLinkItemSet, archive.SetName);
-			if (archive.DontExportSymbols) {
-				newItem.SetMetadata (KnownMetadata.NativeDontExportSymbols, "true");
-			}
-			archives.Add (newItem);
-		}
-	}
-
-	ITaskItem DoMakeItem (string msbuildItemName, ITaskItem sourceItem, HashSet<string> uniqueAbis)
-	{
-		var ret = new TaskItem (sourceItem.ItemSpec);
-		string rid = sourceItem.GetRequiredMetadata (msbuildItemName, KnownMetadata.RuntimeIdentifier, Log) ?? String.Empty;
-		string abi = MonoAndroidHelper.RidToAbi (rid);
-		uniqueAbis.Add (abi);
-		ret.SetMetadata (KnownMetadata.Abi, abi);
-		ret.SetMetadata (KnownMetadata.RuntimeIdentifier, rid);
-
-		return ret;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/LinkNativeRuntime.cs b/src/Xamarin.Android.Build.Tasks/Tasks/LinkNativeRuntime.cs
deleted file mode 100644
index cc2b3391652..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/LinkNativeRuntime.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-using Microsoft.Android.Build.Tasks;
-
-namespace Xamarin.Android.Tasks;
-
-public class LinkNativeRuntime : AsyncTask
-{
-	public override string TaskPrefix => "LNR";
-
-	public ITaskItem[]? MonoComponents { get; set; }
-
-	[Required]
-	public string AndroidBinUtilsDirectory { get; set; } = "";
-
-	[Required]
-	public string IntermediateOutputPath { get; set; } = "";
-
-	[Required]
-	public ITaskItem[] LinkLibraries { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] NativeArchives { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] NativeObjectFiles { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] NativeLinkStartFiles { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] NativeLinkEndFiles { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] NativeSymbolsToExport { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] OutputRuntimes { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] SupportedAbis { get; set; } = [];
-
-	[Required]
-	public ITaskItem[] RuntimePackLibraryDirectories { get; set; } = [];
-
-	public bool SaveDebugSymbols { get; set; } = true;
-	public bool StripDebugSymbols { get; set; } = true;
-
-	public override System.Threading.Tasks.Task RunTaskAsync ()
-	{
-		return this.WhenAll (SupportedAbis, LinkRuntime);
-	}
-
-	void LinkRuntime (ITaskItem abiItem)
-	{
-		string abi = abiItem.ItemSpec;
-		LogDebugMessage ($"LinkRuntime ({abi})");
-		ITaskItem outputRuntime = GetFirstAbiItem (OutputRuntimes, "_UnifiedNativeRuntime", abi);
-		string soname = Path.GetFileNameWithoutExtension (outputRuntime.ItemSpec);
-		if (soname.StartsWith ("lib", StringComparison.OrdinalIgnoreCase)) {
-			soname = soname.Substring (3);
-		}
-
-		var linker = new NativeLinker (Log, abi, soname, AndroidBinUtilsDirectory, IntermediateOutputPath, RuntimePackLibraryDirectories, CancellationToken, Cancel) {
-			StripDebugSymbols = StripDebugSymbols,
-			SaveDebugSymbols = SaveDebugSymbols,
-			UseNdkLibraries = false,
-			UseSymbolic = true,
-		};
-
-		List<ITaskItem> items = OrganizeCommandLineItemsCLR (abi);
-		linker.Link (
-			outputRuntime,
-			items,
-			GetAbiItems (NativeLinkStartFiles, "_NativeLinkStartFiles", abi),
-			GetAbiItems (NativeLinkEndFiles, "_NativeLinkEndFiles", abi),
-			GetAbiItems (NativeSymbolsToExport, "_NativeSymbolsToExport", abi)
-		);
-	}
-
-	// Puts object files, static archives in the correct order. This is a bit clumsy, but unfortunately necessary
-	List<ITaskItem> OrganizeCommandLineItemsCLR (string abi)
-	{
-		// Code farther down the method does NOT check whether a set is present, it assumes that. This is on purpose, to
-		// let the exception be thrown should a required (and assumed to be present) set be missing.
-		var sets = new Dictionary<string, List<ITaskItem>> (StringComparer.Ordinal);
-		foreach (ITaskItem item in GetAbiItems (NativeArchives, "_SelectedNativeArchive", abi)) {
-			string setName = item.GetRequiredMetadata ("_SelectedNativeArchive", KnownMetadata.NativeLinkItemSet, Log) ?? String.Empty;
-			if (!sets.TryGetValue (setName, out List<ITaskItem>? items)) {
-				items = new List<ITaskItem> ();
-				sets.Add (setName, items);
-			}
-
-			items.Add (item);
-		}
-
-		var ret = new List<ITaskItem> ();
-
-		// First go our own object files...
-		ret.AddRange (GetAbiItems (NativeObjectFiles, "_NativeAssemblyTarget", abi));
-
-		// ...then go our runtime archives...
-		ret.AddRange (sets[NativeRuntimeComponents.KnownSets.XamarinAndroidRuntime]);
-
-		// ...followed by CoreCLR components...
-		ret.AddRange (sets[NativeRuntimeComponents.KnownSets.CoreClrRuntime]);
-
-		// ...and after them the BCL PAL libraries...
-		ret.AddRange (sets[NativeRuntimeComponents.KnownSets.BCL]);
-
-		// ...and then the C runtime and compiler support libraries
-		var systemLibs = new Dictionary<string, ITaskItem> (StringComparer.Ordinal);
-		foreach (ITaskItem item in GetAbiItems (LinkLibraries, "_RequiredLinkLibraries", abi)) {
-			systemLibs.Add (Path.GetFileName (item.ItemSpec), item);
-		}
-
-		ret.Add (systemLibs["log"]);
-		ret.AddRange (sets[NativeRuntimeComponents.KnownSets.CompilerRuntime]);
-		ret.Add (systemLibs["z"]);
-		ret.Add (systemLibs["m"]);
-		ret.Add (systemLibs["dl"]);
-		ret.Add (systemLibs["c"]);
-
-		return ret;
-	}
-
-	List<ITaskItem> GetAbiItems (ITaskItem[] source, string itemName, string abi)
-	{
-		var ret = new List<ITaskItem> ();
-
-		foreach (ITaskItem item in source) {
-			if (AbiMatches (abi, item, itemName)) {
-				ret.Add (item);
-			}
-		}
-
-		return ret;
-	}
-
-	ITaskItem GetFirstAbiItem (ITaskItem[] source, string itemName, string abi)
-	{
-		foreach (ITaskItem item in source) {
-			if (AbiMatches (abi, item, itemName)) {
-				return item;
-			}
-		}
-
-		throw new InvalidOperationException ($"Internal error: item '{itemName}' for ABI '{abi}' not found");
-	}
-
-	bool AbiMatches (string abi, ITaskItem item, string itemName)
-	{
-		return MonoAndroidHelper.StringEquals (abi, item.GetRequiredMetadata (itemName, "Abi", Log), StringComparison.OrdinalIgnoreCase);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
index 023dc507fbc..4545d269d61 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
@@ -15,7 +15,6 @@ public class PrepareAbiItems : AndroidTask
 		const string EnvBase = "environment";
 		const string CompressedAssembliesBase = "compressed_assemblies";
 		const string JniRemappingBase = "jni_remap";
-		const string PinvokePreserveBase = "pinvoke_preserve";
 		const string JniInitFuncsBase = "jni_init_funcs";
 
 		public override string TaskPrefix => "PAI";
@@ -50,8 +49,6 @@ public override bool RunTask ()
 				baseName = CompressedAssembliesBase;
 			} else if (MonoAndroidHelper.StringEquals ("jniremap", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = JniRemappingBase;
-			} else if (MonoAndroidHelper.StringEquals ("runtime_linking", Mode, StringComparison.OrdinalIgnoreCase)) {
-				baseName = PinvokePreserveBase;
 			} else if (MonoAndroidHelper.StringEquals ("jni_init", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = JniInitFuncsBase;
 			} else {
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs
index bba7568715e..d05abf25c7c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs
@@ -23,11 +23,6 @@ public class ProcessNativeLibraries : AndroidTask
 			"libxamarin-debug-app-helper",
 		};
 
-		static readonly HashSet<string> RuntimeNativeLibraryNames = new (StringComparer.OrdinalIgnoreCase);
-
-		[Required]
-		public ITaskItem[] KnownRuntimeNativeLibraries { get; set; } = [];
-
 		/// <summary>
 		/// Assumed to be .so files only
 		/// </summary>
@@ -36,7 +31,6 @@ public class ProcessNativeLibraries : AndroidTask
 		public string []? ExcludedLibraries { get; set; }
 
 		public bool IncludeDebugSymbols { get; set; }
-		public bool NativeRuntimeLinking { get; set; }
 
 		[Output]
 		public ITaskItem []? OutputLibraries { get; set; }
@@ -53,10 +47,6 @@ public override bool RunTask ()
 				}
 			}
 
-			foreach (ITaskItem lib in KnownRuntimeNativeLibraries) {
-				RuntimeNativeLibraryNames.Add (Path.GetFileName (lib.ItemSpec));
-			}
-
 			var output = new List<ITaskItem> (InputLibraries.Length);
 
 			foreach (var library in InputLibraries) {
@@ -80,11 +70,6 @@ public override bool RunTask ()
 				}
 
 				if (fileName.StartsWith ("libmono-android", StringComparison.Ordinal) || fileName.StartsWith ("libnet-android", StringComparison.Ordinal)) {
-					if (NativeRuntimeLinking) {
-						// We don't need the precompiled runtime, it will be linked during application build
-						continue;
-					}
-
 					if (fileName.EndsWith (".debug", StringComparison.Ordinal)) {
 						if (!IncludeDebugSymbols)
 							continue;
@@ -106,32 +91,12 @@ public override bool RunTask ()
 					}
 				}
 
-				if (!IgnoreLibraryWhenLinkingRuntime (library)) {
-					output.Add (library);
-				} else {
-					Log.LogDebugMessage ($"Ignoring '{library.ItemSpec}'");
-				}
+				output.Add (library);
 			}
 
 			OutputLibraries = output.ToArray ();
 
 			return !Log.HasLoggedErrors;
 		}
-
-		bool IgnoreLibraryWhenLinkingRuntime (ITaskItem libItem)
-		{
-			if (!NativeRuntimeLinking) {
-				return false;
-			}
-
-			// We ignore all the shared libraries coming from the runtime packages, as they are all linked into our runtime and
-			// need not be packaged.
-			if (MonoAndroidHelper.IsFromAKnownRuntimePack (libItem)) {
-				return true;
-			}
-
-			// Should `NuGetPackageId` be empty, we check the libs by name, as the last resort.
-			return RuntimeNativeLibraryNames.Contains (Path.GetFileName (libItem.ItemSpec));
-		}
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/NativeAotBuildTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/NativeAotBuildTests.cs
index fbd55a2a148..e895c0c8267 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/NativeAotBuildTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/NativeAotBuildTests.cs
@@ -42,7 +42,6 @@ public void BuildCoreClrWithPrebuiltRuntime (string abi)
 
 			using var builder = CreateApkBuilder ();
 			Assert.IsTrue (builder.Build (proj), $"CoreCLR app build should succeed for {abi} with the prebuilt runtime.");
-			builder.Output.AssertTargetIsSkipped ("_LinkNativeRuntime", defaultIfNotUsed: true);
 		}
 
 		[TestCase ("armeabi-v7a")]
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCompressedAssembliesNativeSourceFilesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCompressedAssembliesNativeSourceFilesTests.cs
new file mode 100644
index 00000000000..ef74cc4360d
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateCompressedAssembliesNativeSourceFilesTests.cs
@@ -0,0 +1,37 @@
+#nullable enable
+using System.IO;
+
+using NUnit.Framework;
+using Xamarin.Android.Tasks;
+
+namespace Xamarin.Android.Build.Tests.Tasks;
+
+[TestFixture]
+public class GenerateCompressedAssembliesNativeSourceFilesTests : BaseTest
+{
+	[Test]
+	public void EmitsEmptyDescriptorsForAllAbis ()
+	{
+		string outputDirectory = Path.Combine (Root, "temp", nameof (EmitsEmptyDescriptorsForAllAbis));
+		var task = new GenerateCompressedAssembliesNativeSourceFiles {
+			BuildEngine = new MockBuildEngine (TestContext.Out),
+			EnvironmentOutputDirectory = outputDirectory,
+			SupportedAbis = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"],
+			ProjectFullPath = Path.Combine (Root, "test.csproj"),
+			Debug = true,
+			EnableCompression = false,
+		};
+
+		Assert.IsTrue (task.Execute (), "GenerateCompressedAssembliesNativeSourceFiles should succeed.");
+
+		foreach (string abi in task.SupportedAbis) {
+			string source = File.ReadAllText (Path.Combine (outputDirectory, $"compressed_assemblies.{abi}.ll"));
+			Assert.That (source, Does.Contain ("%struct.CompressedAssemblyDescriptor = type"), abi);
+			Assert.That (source, Does.Contain ("@compressed_assembly_count = "), abi);
+			Assert.That (source, Does.Contain ("@compressed_assembly_descriptors = "), abi);
+			Assert.That (source, Does.Contain ("@uncompressed_assemblies_data_size = "), abi);
+			Assert.That (source, Does.Contain ("@uncompressed_assemblies_data_buffer = "), abi);
+			Assert.That (source, Does.Contain ("zeroinitializer"), abi);
+		}
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateJniRemappingNativeCodeTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateJniRemappingNativeCodeTests.cs
new file mode 100644
index 00000000000..9485db029cb
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateJniRemappingNativeCodeTests.cs
@@ -0,0 +1,56 @@
+#nullable enable
+using System.IO;
+
+using Microsoft.Build.Utilities;
+using NUnit.Framework;
+using Xamarin.Android.Tasks;
+
+namespace Xamarin.Android.Build.Tests.Tasks;
+
+[TestFixture]
+public class GenerateJniRemappingNativeCodeTests : BaseTest
+{
+	[TestCase (false)]
+	[TestCase (true)]
+	public void EmitsRemappingForAllAbis (bool generateEmptyCode)
+	{
+		string outputDirectory = Path.Combine (Root, "temp", $"{nameof (EmitsRemappingForAllAbis)}-{generateEmptyCode}");
+		Directory.CreateDirectory (outputDirectory);
+
+		string remappingXml = Path.Combine (outputDirectory, "remapping.xml");
+		if (!generateEmptyCode) {
+			File.WriteAllText (remappingXml, """
+				<replacements>
+				  <replace-type from="a/B" to="c/D&quot;\path&#xE9;" />
+				  <replace-method source-type="a/B" source-method-name="m" source-method-signature="()V"
+				                  target-type="c/D" target-method-name="n" target-method-instance-to-static="false" />
+				</replacements>
+				""");
+		}
+
+		var task = new GenerateJniRemappingNativeCode {
+			BuildEngine = new MockBuildEngine (TestContext.Out),
+			OutputDirectory = outputDirectory,
+			SupportedAbis = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"],
+			GenerateEmptyCode = generateEmptyCode,
+			RemappingXmlFilePath = generateEmptyCode ? null : new TaskItem (remappingXml),
+		};
+
+		Assert.IsTrue (task.Execute (), "GenerateJniRemappingNativeCode should succeed.");
+
+		foreach (string abi in task.SupportedAbis) {
+			string source = File.ReadAllText (Path.Combine (outputDirectory, $"jni_remap.{abi}.ll"));
+			Assert.That (source, Does.Contain ("@jni_remapping_type_replacements = "), abi);
+			Assert.That (source, Does.Contain ("@jni_remapping_method_replacement_index = "), abi);
+			Assert.That (source, Does.Contain ("%struct.JniRemappingIndexTypeEntry = type"), abi);
+			if (generateEmptyCode) {
+				Assert.That (source, Does.Not.Contain ("@mm_a_B = "), abi);
+			} else {
+				Assert.That (source, Does.Contain ("@mm_a_B = "), abi);
+				Assert.That (source, Does.Contain ("c\"a/B\\00\""), abi);
+				Assert.That (source, Does.Contain ("c\"()V\\00\""), abi);
+				Assert.That (source, Does.Contain ("c\"c/D\\22\\5Cpath\\C3\\A9\\00\""), abi);
+			}
+		}
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
index 1e11f0e39df..30f2bb79ae4 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
@@ -11,6 +11,49 @@ namespace Xamarin.Android.Build.Tests.Tasks;
 [TestFixture]
 public class GenerateNativeApplicationConfigSourcesTests : BaseTest
 {
+	[TestCase (false)]
+	[TestCase (true)]
+	public void EmitsApplicationConfigForAllAbis (bool emitComments)
+	{
+		string outputRoot = Path.Combine (Root, "temp", $"{nameof (EmitsApplicationConfigForAllAbis)}-{emitComments}");
+		string monoAndroidPath = Path.Combine (TestEnvironment.MonoAndroidFrameworkDirectory, "Mono.Android.dll");
+		FileAssert.Exists (monoAndroidPath);
+
+		var task = new GenerateNativeApplicationConfigSources {
+			BuildEngine = new MockBuildEngine (TestContext.Out),
+			ResolvedAssemblies = [new TaskItem (monoAndroidPath)],
+			EnvironmentOutputDirectory = Path.Combine (outputRoot, "android"),
+			SupportedAbis = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"],
+			AndroidPackageName = "com.microsoft.android.llvmassemblytest",
+			EnablePreloadAssembliesDefault = false,
+			AndroidRuntime = "CoreCLR",
+			UseAssemblyStore = true,
+			EmitLlvmIrComments = emitComments,
+		};
+
+		Assert.IsTrue (task.Execute (), "GenerateNativeApplicationConfigSources should succeed.");
+
+		foreach (var (abi, triple) in new [] {
+			("armeabi-v7a", "armv7-unknown-linux-android21"),
+			("arm64-v8a", "aarch64-unknown-linux-android21"),
+			("x86", "i686-unknown-linux-android21"),
+			("x86_64", "x86_64-unknown-linux-android21"),
+		}) {
+			string fileName = $"environment.{abi}.ll";
+			string source = File.ReadAllText (Path.Combine (outputRoot, "android", fileName));
+			Assert.That (source, Does.Contain ($"source_filename = \"{fileName}\""), abi);
+			Assert.That (source, Does.Contain ($"target triple = \"{triple}\""), abi);
+			Assert.That (source, Does.Contain ("%struct.ApplicationConfig = type"), abi);
+			Assert.That (source, Does.Contain ("@application_config = "), abi);
+			Assert.That (source, Does.Contain ("@app_environment_variables = "), abi);
+			Assert.That (source, Does.Contain ("@app_system_properties = "), abi);
+			Assert.That (source, Does.Contain ("@assembly_store = "), abi);
+			Assert.That (source, Does.Contain ("@dso_cache = "), abi);
+			Assert.That (source, Does.Contain ("!llvm.module.flags = "), abi);
+			Assert.That (source, emitComments ? Does.Contain ("; Application environment variables") : Does.Not.Contain ("; Application environment variables"), abi);
+		}
+	}
+
 	[TestCase (false)]
 	[TestCase (true)]
 	public void HaveAssemblyStoreIsEmittedForCoreCLR (bool haveAssemblyStore)
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
deleted file mode 100644
index 9fdd6e03778..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using Microsoft.Build.Utilities;
-using NUnit.Framework;
-using Xamarin.Android.Tasks;
-using Xamarin.Android.Tasks.LLVMIR;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Build.Tests.Tasks
-{
-	[TestFixture]
-	public class LlvmIrGeneratorTests
-	{
-		/// <summary>
-		/// Regression test for https://github.com/dotnet/android/issues/10679
-		///
-		/// When a managed method parameter has a whitespace-only name, the LLVM IR
-		/// generator would produce invalid IR like:
-		///   define void @test(ptr noundef % )
-		///
-		/// The fix ensures whitespace-only names are normalized to null before
-		/// creating LlvmIrFunctionParameter instances, so that LlvmIrFunction
-		/// assigns them valid numeric names (e.g., %0, %1).
-		/// </summary>
-		[Test]
-		[TestCase (null, Description = "Null parameter name")]
-		[TestCase ("", Description = "Empty parameter name")]
-		[TestCase (" ", Description = "Space-only parameter name")]
-		[TestCase ("  ", Description = "Multiple spaces parameter name")]
-		[TestCase ("\t", Description = "Tab-only parameter name")]
-		public void FunctionParameterWithInvalidName_GetsNumericName (string? paramName)
-		{
-			var parameters = new List<LlvmIrFunctionParameter> {
-				new LlvmIrFunctionParameter (typeof (IntPtr), "env"),
-				new LlvmIrFunctionParameter (typeof (IntPtr), "klass"),
-				new LlvmIrFunctionParameter (typeof (IntPtr), paramName),
-			};
-
-			var func = new LlvmIrFunction ("test_function", typeof (void), parameters);
-
-			// The third parameter should have been assigned a numeric name
-			var thirdParam = func.Signature.Parameters[2];
-			Assert.IsNotNull (thirdParam.Name, "Parameter name should not be null after LlvmIrFunction construction");
-			Assert.IsNotEmpty (thirdParam.Name, "Parameter name should not be empty after LlvmIrFunction construction");
-			Assert.That (thirdParam.Name.Trim (), Is.Not.Empty, "Parameter name should not be whitespace-only after LlvmIrFunction construction");
-		}
-
-		/// <summary>
-		/// Verifies that the LLVM IR generator produces valid function signatures
-		/// when parameters have whitespace-only names that would have caused
-		/// invalid IR like "ptr noundef % )" before the fix.
-		/// </summary>
-		[Test]
-		[TestCase (" ", Description = "Space-only parameter name")]
-		[TestCase ("\t", Description = "Tab-only parameter name")]
-		public void GeneratedIR_FunctionWithWhitespaceParameterName_ProducesValidOutput (string paramName)
-		{
-			var parameters = new List<LlvmIrFunctionParameter> {
-				new LlvmIrFunctionParameter (typeof (IntPtr), "env"),
-				new LlvmIrFunctionParameter (typeof (IntPtr), "klass"),
-				new LlvmIrFunctionParameter (typeof (IntPtr), paramName),
-			};
-
-			var func = new LlvmIrFunction ("test_function", typeof (void), parameters);
-
-			var log = new TaskLoggingHelper (new MockBuildEngine (TestContext.Out, [], [], []), "test");
-			var module = new LlvmIrModule (new LlvmIrTypeCache (), log);
-			func.Body.Ret (typeof (void));
-			module.Add (func);
-			module.AfterConstruction ();
-
-			var generator = LlvmIrGenerator.Create (AndroidTargetArch.Arm64, "test.ll");
-			using var writer = new StringWriter ();
-			generator.Generate (writer, module);
-
-			string output = writer.ToString ();
-			// The output should contain valid parameter declarations - no whitespace-only names after %
-			Assert.That (output, Does.Not.Contain ("% )"), "Generated LLVM IR should not contain 'ptr noundef % )' pattern");
-			Assert.That (output, Does.Not.Contain ("%\t)"), "Generated LLVM IR should not contain 'ptr noundef %\\t)' pattern");
-			Assert.That (output, Does.Contain ("@test_function"), "Generated LLVM IR should contain the function name");
-		}
-
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
new file mode 100644
index 00000000000..705ca785eb1
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
@@ -0,0 +1,72 @@
+#nullable enable
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using Microsoft.Build.Utilities;
+using NUnit.Framework;
+using Xamarin.Android.Build.Tasks;
+using Xamarin.Android.Tasks;
+using Xamarin.Android.Tools;
+
+namespace Xamarin.Android.Build.Tests.Tasks;
+
+[TestFixture]
+public class LlvmIrWriterTests
+{
+	[Test]
+	public void QuotesUtf8AndReservedBytes ()
+	{
+		byte[] bytes = Encoding.UTF8.GetBytes ("c/D\"\\path\u00e9");
+
+		Assert.That (LlvmIrWriter.QuoteBytes (bytes, nullTerminated: true), Is.EqualTo ("c\"c/D\\22\\5Cpath\\C3\\A9\\00\""));
+		Assert.That (LlvmIrWriter.QuoteBytes (bytes, nullTerminated: false), Is.EqualTo ("c\"c/D\\22\\5Cpath\\C3\\A9\""));
+	}
+
+	[Test]
+	public void StringBlobDeduplicatesStringsByOffset ()
+	{
+		var blob = new LlvmIrStringBlob ();
+
+		Assert.That (blob.Add ("a"), Is.EqualTo (0));
+		Assert.That (blob.Add ("\u00e9"), Is.EqualTo (2));
+		Assert.That (blob.Add ("a"), Is.EqualTo (0));
+		Assert.That (blob.Size, Is.EqualTo (5));
+		Assert.That (blob.Value (), Is.EqualTo ("c\"a\\00\\C3\\A9\\00\""));
+	}
+
+	[Test]
+	public void CommentsCannotInjectLinesIntoIr ()
+	{
+		using var output = new StringWriter ();
+		var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments: true);
+
+		Assert.That (writer.Comment (" first\nsecond"), Does.Not.Contain ("\n"));
+		Assert.That (writer.TrailingComment (" first\rsecond"), Does.Not.Contain ("\r"));
+		writer.WriteCommentLine (" first\nsecond");
+		Assert.That (output.ToString ().Split ('\n'), Has.Length.EqualTo (2));
+	}
+
+	[Test]
+	public void NativeAotJniInitDeduplicatesHandlers ()
+	{
+		var log = new TaskLoggingHelper (new MockBuildEngine (TestContext.Out), "test");
+		var generator = new NativeAotJniInitNativeAssemblyGenerator (
+			log,
+			["AndroidCryptoNative_InitLibraryOnLoad"],
+			["AndroidCryptoNative_InitLibraryOnLoad", "My_OnLoad"]
+		);
+
+		foreach (AndroidTargetArch arch in new [] { AndroidTargetArch.Arm, AndroidTargetArch.Arm64, AndroidTargetArch.X86, AndroidTargetArch.X86_64 }) {
+			using var writer = new StringWriter ();
+			generator.Generate (arch, writer, "jni_init_funcs.ll");
+			string output = writer.ToString ();
+
+			Assert.That (output, Does.Contain ("@__jni_on_load_handler_count = dso_local local_unnamed_addr constant i32 2"), arch.ToString ());
+			Assert.That (output, Does.Contain ("@__jni_on_load_handlers = dso_local local_unnamed_addr constant [2 x ptr]"), arch.ToString ());
+			Assert.That (output, Does.Contain ("@__jni_on_load_handler_names = dso_local local_unnamed_addr constant [2 x ptr]"), arch.ToString ());
+			Assert.That (Regex.Matches (output, "declare void @AndroidCryptoNative_InitLibraryOnLoad\\(\\)").Count, Is.EqualTo (1), arch.ToString ());
+			Assert.That (Regex.Matches (output, "declare void @My_OnLoad\\(\\)").Count, Is.EqualTo (1), arch.ToString ());
+		}
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
index dc3128a68da..ba548184277 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
@@ -935,9 +935,8 @@ static byte ConvertFieldToByte (string fieldName, string llvmAssemblerEnvFile, s
 			return fv;
 		}
 
-		// These fields are always uint32_t/uint64_t and the generator (LlvmIrGenerator/MonoAndroidHelper.CultureInvariantToString)
-		// writes them via uint/ulong.ToString(), which is always an unsigned decimal representation - there's no signed form to
-		// account for here, so parse directly as unsigned.
+		// These fields are always uint32_t/uint64_t and LlvmIrWriter.Number writes unsigned decimal values,
+		// so parse them directly as unsigned.
 		static bool TryParseInteger (string value, out uint fv)
 		{
 			if (value.StartsWith ("0x", StringComparison.Ordinal)) {
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs b/src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs
new file mode 100644
index 00000000000..bd9c32791ab
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs
@@ -0,0 +1,79 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Utilities;
+
+namespace Xamarin.Android.Tasks;
+
+/// <summary>
+/// Name:value pairs (environment variables or system properties) stored in an array of
+/// <c>AppEnvironmentVariable</c> structures, which refer to NUL-terminated strings in a
+/// separate character array.
+/// </summary>
+sealed class AppEnvironmentVariableTable
+{
+	// Must be identical to the AppEnvironmentVariable structure in src/native/clr/include/xamarin-app.hh
+	const ulong StructureSize = 8;
+	const ulong StructureAlignment = 4;
+
+	readonly List<(string Name, string Value, int NameIndex, int ValueIndex)> entries = new ();
+	readonly LlvmIrStringBlob contents = new ();
+
+	public int Count => entries.Count;
+
+	public AppEnvironmentVariableTable (TaskLoggingHelper log, IDictionary<string, string>? variables)
+	{
+		if (variables == null) {
+			return;
+		}
+
+		foreach (var kvp in variables) {
+			string name = kvp.Key.Trim ();
+			if (name.Length == 0) {
+				log.LogDebugMessage ($"Not adding environment variable without a name. Value: '{kvp.Value}'");
+				continue;
+			}
+
+			int nameIndex = contents.Add (name);
+			int valueIndex = contents.Add (kvp.Value);
+			entries.Add ((name, kvp.Value, nameIndex, valueIndex));
+		}
+	}
+
+	public static void WriteDeclaration (LlvmIrWriter w)
+	{
+		w.Write ($$"""
+
+			%struct.AppEnvironmentVariable = type {
+				i32, {{w.Comment (" uint32_t name_index")}}
+				i32 {{w.Comment (" uint32_t value_index")}}
+			}
+
+			""");
+	}
+
+	public void Write (LlvmIrWriter w, string arrayName, string contentsName, string comment)
+	{
+		var elements = new List<string> (entries.Count);
+		foreach (var e in entries) {
+			elements.Add ($$"""
+					%struct.AppEnvironmentVariable {
+						i32 {{LlvmIrWriter.Number (e.NameIndex)}}, {{w.Comment ($" '{e.Name}'")}}
+						i32 {{LlvmIrWriter.Number (e.ValueIndex)}}{{w.Comment ($" '{e.Value}'")}}
+					}
+				""");
+		}
+
+		w.WriteGlobal (
+			arrayName,
+			LlvmIrWriter.GlobalConstant,
+			$"[{LlvmIrWriter.Number (elements.Count)} x %struct.AppEnvironmentVariable]",
+			w.ArrayValue (elements, LlvmIrWriter.IndexComment),
+			w.GetAggregateAlignment (StructureAlignment, (ulong)elements.Count * StructureSize),
+			comment
+		);
+		contents.Write (w, contentsName);
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs
index ec788e1f126..c2b64601ba0 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs
@@ -4,7 +4,8 @@
 namespace Xamarin.Android.Tasks;
 
 // Declaration order of fields and their types must correspond *exactly* to that in
-// src/native/clr/xamarin-app-stub/xamarin-app.hh ApplicationConfig structure
+// src/native/clr/include/xamarin-app.hh ApplicationConfig structure, as well as to the
+// %struct.ApplicationConfig LLVM IR declaration written by ApplicationConfigNativeAssemblyGenerator
 //
 // Type mappings:
 //
@@ -21,8 +22,7 @@ namespace Xamarin.Android.Tasks;
 //   int64_t  |  long
 //   char*    |  string
 //
-// Names should be the same as in the above struct, but it's not a requirement
-// (they will be used only to generate comments in the native code)
+// Names should be the same as in the above struct
 sealed class ApplicationConfig
 {
 	public bool   uses_assembly_preload;
@@ -37,13 +37,8 @@ sealed class ApplicationConfig
 	public uint   number_of_dso_cache_entries;
 	public uint   number_of_shared_libraries;
 
-	[NativeAssembler (NumberFormat = LLVMIR.LlvmIrVariableNumberFormat.Hexadecimal)]
 	public uint   android_runtime_jnienv_class_token;
-
-	[NativeAssembler (NumberFormat = LLVMIR.LlvmIrVariableNumberFormat.Hexadecimal)]
 	public uint   jnienv_initialize_method_token;
-
-	[NativeAssembler (NumberFormat = LLVMIR.LlvmIrVariableNumberFormat.Hexadecimal)]
 	public uint   jni_remapping_replacement_type_count;
 	public uint   jni_remapping_replacement_method_index_entry_count;
 	public string android_package_name = String.Empty;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
index 7bf0427a1bb..d2bf8dcc9e4 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
@@ -8,11 +8,11 @@
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
-using Xamarin.Android.Tasks.LLVMIR;
+using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Tasks;
 
-class ApplicationConfigNativeAssemblyGenerator : LlvmIrComposer
+class ApplicationConfigNativeAssemblyGenerator
 {
 	// From host_runtime_contract.h in dotnet/runtime
 	const string HOST_PROPERTY_RUNTIME_CONTRACT   = "HOST_RUNTIME_CONTRACT";
@@ -21,142 +21,47 @@ class ApplicationConfigNativeAssemblyGenerator : LlvmIrComposer
 	const string HOST_PROPERTY_RUNTIME_IDENTIFIER = "RUNTIME_IDENTIFIER";
 	const string HOST_PROPERTY_APP_CONTEXT_BASE_DIRECTORY = "APP_CONTEXT_BASE_DIRECTORY";
 
-	sealed class DSOCacheEntryContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override string GetComment (object data, string fieldName)
-		{
-			var dso_entry = EnsureType<DSOCacheEntry> (data);
-			if (MonoAndroidHelper.StringEquals ("hash", fieldName)) {
-				return $" from name: {dso_entry.HashedName}";
-			}
-
-			if (MonoAndroidHelper.StringEquals ("name_index", fieldName)) {
-				return $" name: {dso_entry.RealName}";
-			}
-
-			return String.Empty;
-		}
-	}
-
-	// Disable "Field 'X' is never assigned to, and will always have its default value Y"
-	// Classes below are used in native code generation, thus all the fields must be present
-	// but they aren't always assigned values (which is fine).
-	#pragma warning disable CS0649
+	// The structure declarations written by this class must be identical to the structures in
+	// src/native/clr/include/xamarin-app.hh.  Data sizes are the sums of sizes of all the non-pointer
+	// members (see LlvmIrTarget.GetAggregateAlignment).  All of the structures contain pointers, and
+	// their non-pointer members don't need alignment higher than NonPointerMemberAlignment
+	const ulong ApplicationConfigDataSize = 52;
+	const ulong AssemblyStoreRuntimeDataDataSize = 8;
+	const ulong AssemblyStoreSingleAssemblyRuntimeDataDataSize = 0;
+	const ulong DSOCacheEntryDataSize = 10;
+	const ulong XamarinAndroidBundledAssemblyDataSize = 16;
+	const ulong NonPointerMemberAlignment = 4;
 
-	// Order of fields and their type must correspond *exactly* (with exception of the
-	// ignored managed members) to that in
-	// src/native/clr/include/xamarin-app.hh DSOCacheEntry structure
-	[NativeAssemblerStructContextDataProvider (typeof (DSOCacheEntryContextDataProvider))]
 	sealed class DSOCacheEntry
 	{
-		[NativeAssembler (Ignore = true)]
-		public string? HashedName;
+		public string HashedName = "";
+		public string RealName = "";
 
-		[NativeAssembler (Ignore = true)]
-		public string? RealName;
-
-		[NativeAssembler (UsesDataProvider = true, NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
 		public uint hash;
-
 		public bool ignore;
 		public bool is_jni_library;
-
-		[NativeAssembler (UsesDataProvider = true)]
 		public uint name_index;
-		public IntPtr handle = IntPtr.Zero;
 	}
 
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/monodroid/jni/xamarin-app.hh AssemblyStoreAssemblyDescriptor structure
-	sealed class AssemblyStoreAssemblyDescriptor
+	sealed class State
 	{
-		public uint data_offset;
-		public uint data_size;
-
-		public uint debug_data_offset;
-		public uint debug_data_size;
-
-		public uint config_data_offset;
-		public uint config_data_size;
-	}
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/monodroid/jni/xamarin-app.hh AssemblyStoreSingleAssemblyRuntimeData structure
-	sealed class AssemblyStoreSingleAssemblyRuntimeData
-	{
-		[NativePointer]
-		public byte image_data;
-
-		[NativePointer]
-		public byte debug_info_data;
-
-		[NativePointer]
-		public byte config_data;
-
-		[NativePointer]
-		public AssemblyStoreAssemblyDescriptor? descriptor;
-	}
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh AssemblyStoreRuntimeData structure
-	sealed class AssemblyStoreRuntimeData
-	{
-		[NativePointer (IsNull = true)]
-		public byte data_start;
-		public uint assembly_count;
-		public uint index_entry_count;
-
-		[NativePointer (IsNull = true)]
-		public AssemblyStoreAssemblyDescriptor? assemblies;
-	}
+		public readonly AppEnvironmentVariableTable EnvironmentVariables;
+		public readonly AppEnvironmentVariableTable SystemProperties;
+		public ApplicationConfig ApplicationConfig = new ();
+		public readonly List<DSOCacheEntry> DsoCache = [];
+		public readonly List<DSOCacheEntry> JniPreloadDSOs = [];
+		public readonly LlvmIrStringBlob NamesBlob = new ();
+		public uint NameMutationsCount = 1;
+		public readonly List<string> RuntimePropertyNames = [];
+		public readonly List<string?> RuntimePropertyValues = [];
 
-	sealed class XamarinAndroidBundledAssemblyContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override ulong GetBufferSize (object data, string fieldName)
+		public State (AppEnvironmentVariableTable environmentVariables, AppEnvironmentVariableTable systemProperties)
 		{
-			var xaba = EnsureType<XamarinAndroidBundledAssembly> (data);
-			if (MonoAndroidHelper.StringEquals ("name", fieldName)) {
-				return xaba.name_length;
-			}
-
-			if (MonoAndroidHelper.StringEquals ("file_name", fieldName)) {
-				return xaba.name_length + MonoAndroidHelper.GetMangledAssemblyNameSizeOverhead ();
-			}
-
-			return 0;
+			EnvironmentVariables = environmentVariables;
+			SystemProperties = systemProperties;
 		}
 	}
 
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/monodroid/jni/xamarin-app.hh XamarinAndroidBundledAssembly structure
-	[NativeAssemblerStructContextDataProvider (typeof (XamarinAndroidBundledAssemblyContextDataProvider))]
-	sealed class XamarinAndroidBundledAssembly
-	{
-		public int  file_fd;
-
-		[NativeAssembler (UsesDataProvider = true), NativePointer (PointsToPreAllocatedBuffer = true)]
-		public string? file_name;
-		public uint data_offset;
-		public uint data_size;
-
-		[NativePointer]
-		public byte data;
-		public uint name_length;
-
-		[NativeAssembler (UsesDataProvider = true), NativePointer (PointsToPreAllocatedBuffer = true)]
-		public string? name;
-	}
-#pragma warning restore CS0649
-
-	sealed class DsoCacheState
-	{
-		public List<StructureInstance<DSOCacheEntry>> DsoCache = [];
-		public List<DSOCacheEntry> JniPreloadDSOs = [];
-		public List<string> JniPreloadNames = [];
-		public LlvmIrStringBlob NamesBlob = null!;
-		public uint NameMutationsCount = 1;
-	}
-
 	// Keep in sync with FORMAT_TAG in src/monodroid/jni/xamarin-app.hh
 	const ulong FORMAT_TAG = 0x00025E6972616D58; // 'Xmari^XY' where XY is the format version
 
@@ -165,21 +70,17 @@ sealed class DsoCacheState
 		"libmonodroid.so",
 	};
 
-	SortedDictionary <string, string>? environmentVariables;
-	SortedDictionary <string, string>? systemProperties;
-	SortedDictionary <string, string>? runtimeProperties;
-	StructureInstance? application_config;
-
-#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value - assigned conditionally by build process
-	List<StructureInstance<XamarinAndroidBundledAssembly>>? xamarinAndroidBundledAssemblies;
-#pragma warning restore CS0649
+	readonly TaskLoggingHelper Log;
+	readonly SortedDictionary <string, string>? environmentVariables;
+	readonly SortedDictionary <string, string>? systemProperties;
+	readonly SortedDictionary <string, string> runtimeProperties;
+	State? state;
 
-	StructureInfo? applicationConfigStructureInfo;
-	StructureInfo? dsoCacheEntryStructureInfo;
-	StructureInfo? xamarinAndroidBundledAssemblyStructureInfo;
-	StructureInfo? assemblyStoreSingleAssemblyRuntimeDataStructureinfo;
-	StructureInfo? assemblyStoreRuntimeDataStructureInfo;
-	StructureInfo? appEnvironmentVariableStructureInfo;
+	/// <summary>
+	/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+	/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
+	/// </summary>
+	public bool EmitComments { get; set; }
 
 	public bool UsesAssemblyPreload { get; set; }
 	public string AndroidPackageName { get; set; } = "";
@@ -199,8 +100,9 @@ sealed class DsoCacheState
 
 	public ApplicationConfigNativeAssemblyGenerator (IDictionary<string, string> environmentVariables, IDictionary<string, string> systemProperties,
 		IDictionary<string, string>? runtimeProperties, TaskLoggingHelper log)
-	: base (log)
 	{
+		Log = log ?? throw new ArgumentNullException (nameof (log));
+
 		if (environmentVariables != null) {
 			this.environmentVariables = new SortedDictionary<string, string> (environmentVariables, StringComparer.Ordinal);
 		}
@@ -225,56 +127,36 @@ public ApplicationConfigNativeAssemblyGenerator (IDictionary<string, string> env
 		this.runtimeProperties.Remove (HOST_PROPERTY_BUNDLE_PROBE);
 	}
 
-	protected override void Construct (LlvmIrModule module)
-	{
-		MapStructures (module);
+	/// <summary>
+	/// Performs the architecture independent part of the work (e.g. scanning native libraries), which
+	/// may fail on invalid input.  Called by <see cref="Generate"/> if not called explicitly before.
+	/// </summary>
+	public void Initialize () => EnsureState ();
 
-		module.AddGlobalVariable ("format_tag", FORMAT_TAG, comment: $" 0x{FORMAT_TAG:x}");
+	State EnsureState () => state ??= Init ();
 
-		var envVarsBlob = new LlvmIrStringBlob ();
-		List<StructureInstance<LlvmIrHelpers.AppEnvironmentVariable>> appEnvVars = LlvmIrHelpers.MakeEnvironmentVariableList (
-			Log,
-			environmentVariables,
-			envVarsBlob,
-			appEnvironmentVariableStructureInfo
-		);
-
-		var envVars = new LlvmIrGlobalVariable (appEnvVars, "app_environment_variables") {
-			Comment = " Application environment variables array, name:value",
-			Options = LlvmIrVariableOptions.GlobalConstant,
-		};
-		module.Add (envVars);
-		module.AddGlobalVariable ("app_environment_variable_contents", envVarsBlob, LlvmIrVariableOptions.GlobalConstant);
+	State Init ()
+	{
+		var envVars = new AppEnvironmentVariableTable (Log, environmentVariables);
 
 		// We reuse the same structure as for environment variables, there's no point in adding a new, identical, one
-		var sysPropsBlob = new LlvmIrStringBlob ();
-		List<StructureInstance<LlvmIrHelpers.AppEnvironmentVariable>> appSysProps = LlvmIrHelpers.MakeEnvironmentVariableList (
-			Log,
-			systemProperties,
-			sysPropsBlob,
-			appEnvironmentVariableStructureInfo
-		);
+		var sysProps = new AppEnvironmentVariableTable (Log, systemProperties);
 
-		var sysProps = new LlvmIrGlobalVariable (appSysProps, "app_system_properties") {
-			Comment = " System properties defined by the application",
-			Options = LlvmIrVariableOptions.GlobalConstant,
-		};
-		module.Add (sysProps);
-		module.AddGlobalVariable ("app_system_property_contents", sysPropsBlob, LlvmIrVariableOptions.GlobalConstant);
+		var ret = new State (envVars, sysProps);
+		InitDSOCache (ret);
 
-		DsoCacheState dsoState = InitDSOCache ();
-		var app_cfg = new ApplicationConfig {
+		ret.ApplicationConfig = new ApplicationConfig {
 			uses_assembly_preload = UsesAssemblyPreload,
 			marshal_methods_enabled = MarshalMethodsEnabled,
 			ignore_split_configs = IgnoreSplitConfigs,
-			number_of_runtime_properties = (uint)(runtimeProperties == null ? 0 : runtimeProperties.Count),
+			number_of_runtime_properties = (uint)runtimeProperties.Count,
 			package_naming_policy = (uint)PackageNamingPolicy,
 			environment_variable_count = (uint)(environmentVariables == null ? 0 : environmentVariables.Count),
-			system_property_count = (uint)(appSysProps.Count),
+			system_property_count = (uint)sysProps.Count,
 			number_of_assemblies_in_apk = (uint)NumberOfAssembliesInApk,
 			number_of_shared_libraries = (uint)NativeLibraries.Count,
 			bundled_assembly_name_width = (uint)BundledAssemblyNameWidth,
-			number_of_dso_cache_entries = (uint)dsoState.DsoCache.Count,
+			number_of_dso_cache_entries = (uint)ret.DsoCache.Count,
 			android_runtime_jnienv_class_token = (uint)AndroidRuntimeJNIEnvToken,
 			jnienv_initialize_method_token = (uint)JNIEnvInitializeToken,
 			jni_remapping_replacement_type_count = (uint)JniRemappingReplacementTypeCount,
@@ -282,168 +164,238 @@ protected override void Construct (LlvmIrModule module)
 			android_package_name = AndroidPackageName,
 			have_assembly_store = HaveAssemblyStore,
 		};
-		application_config = new StructureInstance<ApplicationConfig> (applicationConfigStructureInfo, app_cfg);
-		module.AddGlobalVariable ("application_config", application_config);
-
-		var dso_cache = new LlvmIrGlobalVariable (dsoState.DsoCache, "dso_cache", LlvmIrVariableOptions.GlobalWritable) {
-			Comment = " DSO cache entries",
-			BeforeWriteCallback = HashAndSortDSOCache,
-		};
-		module.Add (dso_cache);
-
-		module.AddGlobalVariable ("dso_jni_preloads_idx_stride", dsoState.NameMutationsCount);
-
-		// This variable MUST be written after `dso_cache` since it relies on sorting performed by HashAndSortDSOCache
-		var dso_jni_preloads_idx = new LlvmIrGlobalVariable (typeof (List<uint>), "dso_jni_preloads_idx", LlvmIrVariableOptions.GlobalConstant) {
-			Comment = " Indices into dso_cache[] of DSO libraries to preload because of JNI use",
-			ArrayItemCount = (uint)dsoState.JniPreloadDSOs.Count,
-			GetArrayItemCommentCallback = GetPreloadIndicesLibraryName,
-			GetArrayItemCommentCallbackCallerState = dsoState,
-			BeforeWriteCallback = PopulatePreloadIndices,
-			BeforeWriteCallbackCallerState = dsoState,
-		};
-		module.AddGlobalVariable ("dso_jni_preloads_idx_count", dso_jni_preloads_idx.ArrayItemCount);
-		module.Add (dso_jni_preloads_idx);
-
-		module.AddGlobalVariable ("dso_names_data", dsoState.NamesBlob, LlvmIrVariableOptions.GlobalConstant);
-
-		string bundledBuffersSize = xamarinAndroidBundledAssemblies == null ? "empty (unused when assembly stores are enabled)" : $"{BundledAssemblyNameWidth} bytes long";
-		var bundled_assemblies = new LlvmIrGlobalVariable (typeof(List<StructureInstance<XamarinAndroidBundledAssembly>>), "bundled_assemblies", LlvmIrVariableOptions.GlobalWritable) {
-			Value = xamarinAndroidBundledAssemblies,
-			Comment = $" Bundled assembly name buffers, all {bundledBuffersSize}",
-		};
-		module.Add (bundled_assemblies);
 
 		// HOST_PROPERTY_RUNTIME_CONTRACT, HOST_PROPERTY_RUNTIME_IDENTIFIER and
 		// HOST_PROPERTY_APP_CONTEXT_BASE_DIRECTORY will come first, in that order, our native runtime
 		// requires that since it needs to set their values in the values array and we don't want to
 		// spend time searching for the indices, nor we want to add yet another variable storing the
 		// index to the entry. KISS.
-		var runtime_property_names = new List<string> {
-			HOST_PROPERTY_RUNTIME_CONTRACT,
-			HOST_PROPERTY_RUNTIME_IDENTIFIER,
-			HOST_PROPERTY_APP_CONTEXT_BASE_DIRECTORY,
-		};
-		var runtime_property_values = new List<string?> {
-			null,
-			null,
-			null,
-		};
-
-		if (runtimeProperties != null) {
-			foreach (var kvp in runtimeProperties) {
-				if (MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_RUNTIME_CONTRACT) ||
-						MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_RUNTIME_IDENTIFIER) ||
-						MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_APP_CONTEXT_BASE_DIRECTORY)) {
-					continue;
-				}
-				runtime_property_names.Add (kvp.Key);
-				runtime_property_values.Add (kvp.Value);
+		ret.RuntimePropertyNames.Add (HOST_PROPERTY_RUNTIME_CONTRACT);
+		ret.RuntimePropertyNames.Add (HOST_PROPERTY_RUNTIME_IDENTIFIER);
+		ret.RuntimePropertyNames.Add (HOST_PROPERTY_APP_CONTEXT_BASE_DIRECTORY);
+		ret.RuntimePropertyValues.Add (null);
+		ret.RuntimePropertyValues.Add (null);
+		ret.RuntimePropertyValues.Add (null);
+
+		foreach (var kvp in runtimeProperties) {
+			if (MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_RUNTIME_CONTRACT) ||
+					MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_RUNTIME_IDENTIFIER) ||
+					MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_APP_CONTEXT_BASE_DIRECTORY)) {
+				continue;
 			}
+			ret.RuntimePropertyNames.Add (kvp.Key);
+			ret.RuntimePropertyValues.Add (kvp.Value);
 		}
 
-		var init_runtime_property_names = new LlvmIrGlobalVariable (runtime_property_names, "init_runtime_property_names", LlvmIrVariableOptions.GlobalConstant) {
-			Comment = "Names of properties passed to coreclr_initialize",
-		};
-		module.Add (init_runtime_property_names);
-
-		var init_runtime_property_values = new LlvmIrGlobalVariable (runtime_property_values, "init_runtime_property_values", LlvmIrVariableOptions.GlobalWritable) {
-			Comment = "Values of properties passed to coreclr_initialize",
-		};
-		module.Add (init_runtime_property_values);
-
-		AddAssemblyStores (module);
+		return ret;
 	}
 
-	void AddAssemblyStores (LlvmIrModule module)
+	public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 	{
-		ulong itemCount = (ulong)(NumberOfAssembliesInApk);
-		var assembly_store_bundled_assemblies = new LlvmIrGlobalVariable (typeof(List<StructureInstance<AssemblyStoreSingleAssemblyRuntimeData>>), "assembly_store_bundled_assemblies", LlvmIrVariableOptions.GlobalWritable) {
-			ZeroInitializeArray = true,
-			ArrayItemCount = itemCount,
-		};
-		module.Add (assembly_store_bundled_assemblies);
+		State data = EnsureState ();
+
+		var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		var strings = new LlvmIrStringPool ();
+		ulong structAlignment = Math.Max (w.Target.PointerSize, NonPointerMemberAlignment);
+
+		w.WriteHeader (fileName);
+		AppEnvironmentVariableTable.WriteDeclaration (w);
+		w.Write ($$"""
+
+			%struct.ApplicationConfig = type {
+				i1, {{w.Comment (" bool uses_assembly_preload")}}
+				i1, {{w.Comment (" bool marshal_methods_enabled")}}
+				i1, {{w.Comment (" bool ignore_split_configs")}}
+				i32, {{w.Comment (" uint32_t number_of_runtime_properties")}}
+				i32, {{w.Comment (" uint32_t package_naming_policy")}}
+				i32, {{w.Comment (" uint32_t environment_variable_count")}}
+				i32, {{w.Comment (" uint32_t system_property_count")}}
+				i32, {{w.Comment (" uint32_t number_of_assemblies_in_apk")}}
+				i32, {{w.Comment (" uint32_t bundled_assembly_name_width")}}
+				i32, {{w.Comment (" uint32_t number_of_dso_cache_entries")}}
+				i32, {{w.Comment (" uint32_t number_of_shared_libraries")}}
+				i32, {{w.Comment (" uint32_t android_runtime_jnienv_class_token")}}
+				i32, {{w.Comment (" uint32_t jnienv_initialize_method_token")}}
+				i32, {{w.Comment (" uint32_t jni_remapping_replacement_type_count")}}
+				i32, {{w.Comment (" uint32_t jni_remapping_replacement_method_index_entry_count")}}
+				ptr, {{w.Comment (" char* android_package_name")}}
+				i1 {{w.Comment (" bool have_assembly_store")}}
+			}
 
-		var storeRuntimeData = new AssemblyStoreRuntimeData {
-			data_start = 0,
-			assembly_count = 0,
-		};
+			%struct.AssemblyStoreAssemblyDescriptor = type {
+				i32, {{w.Comment (" uint32_t data_offset")}}
+				i32, {{w.Comment (" uint32_t data_size")}}
+				i32, {{w.Comment (" uint32_t debug_data_offset")}}
+				i32, {{w.Comment (" uint32_t debug_data_size")}}
+				i32, {{w.Comment (" uint32_t config_data_offset")}}
+				i32 {{w.Comment (" uint32_t config_data_size")}}
+			}
 
-		var assembly_store = new LlvmIrGlobalVariable (
-			new StructureInstance<AssemblyStoreRuntimeData>(assemblyStoreRuntimeDataStructureInfo, storeRuntimeData),
-			"assembly_store",
-			LlvmIrVariableOptions.GlobalWritable
-		);
-		module.Add (assembly_store);
-	}
+			%struct.AssemblyStoreRuntimeData = type {
+				ptr, {{w.Comment (" uint8_t data_start")}}
+				i32, {{w.Comment (" uint32_t assembly_count")}}
+				i32, {{w.Comment (" uint32_t index_entry_count")}}
+				ptr {{w.Comment (" AssemblyStoreAssemblyDescriptor assemblies")}}
+			}
 
-	string? GetPreloadIndicesLibraryName (LlvmIrVariable v, LlvmIrModuleTarget target, ulong index, object? value, object? callerState)
-	{
-		// Instead of throwing for such a triviality like a comment, we will return error messages as comments instead
-		var dsoState = callerState as DsoCacheState;
-		if (dsoState == null) {
-			return " Internal error: DSO state not present.";
-		}
+			%struct.AssemblyStoreSingleAssemblyRuntimeData = type {
+				ptr, {{w.Comment (" uint8_t image_data")}}
+				ptr, {{w.Comment (" uint8_t debug_info_data")}}
+				ptr, {{w.Comment (" uint8_t config_data")}}
+				ptr {{w.Comment (" AssemblyStoreAssemblyDescriptor descriptor")}}
+			}
 
-		if (index >= (ulong)dsoState.JniPreloadNames.Count) {
-			return $" Invalid index {index}";
-		}
+			%struct.DSOCacheEntry = type {
+				i32, {{w.Comment (" uint32_t hash")}}
+				i1, {{w.Comment (" bool ignore")}}
+				i1, {{w.Comment (" bool is_jni_library")}}
+				i32, {{w.Comment (" uint32_t name_index")}}
+				ptr {{w.Comment (" void* handle")}}
+			}
 
-		return $" {dsoState.JniPreloadNames[(int)index]}";
-	}
+			%struct.XamarinAndroidBundledAssembly = type {
+				i32, {{w.Comment (" int32_t file_fd")}}
+				ptr, {{w.Comment (" char* file_name")}}
+				i32, {{w.Comment (" uint32_t data_offset")}}
+				i32, {{w.Comment (" uint32_t data_size")}}
+				ptr, {{w.Comment (" uint8_t data")}}
+				i32, {{w.Comment (" uint32_t name_length")}}
+				ptr {{w.Comment (" char* name")}}
+			}
 
-	void PopulatePreloadIndices (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
-	{
-		var dsoState = state as DsoCacheState;
-		if (dsoState == null) {
-			throw new InvalidOperationException ("Internal error: DSO state not present.");
-		}
+			""");
+
+		w.WriteGlobal ("format_tag", LlvmIrWriter.GlobalConstant, "i64", LlvmIrWriter.Number (FORMAT_TAG), 8, $" 0x{FORMAT_TAG:x}");
+
+		data.EnvironmentVariables.Write (w, "app_environment_variables", "app_environment_variable_contents", " Application environment variables array, name:value");
+		data.SystemProperties.Write (w, "app_system_properties", "app_system_property_contents", " System properties defined by the application");
+
+		ApplicationConfig cfg = data.ApplicationConfig;
+		w.WriteGlobal ("application_config", LlvmIrWriter.GlobalConstant, "%struct.ApplicationConfig", $$"""
+			{
+				i1 {{LlvmIrWriter.Bool (cfg.uses_assembly_preload)}}, {{w.Comment (" bool uses_assembly_preload")}}
+				i1 {{LlvmIrWriter.Bool (cfg.marshal_methods_enabled)}}, {{w.Comment (" bool marshal_methods_enabled")}}
+				i1 {{LlvmIrWriter.Bool (cfg.ignore_split_configs)}}, {{w.Comment (" bool ignore_split_configs")}}
+				i32 {{LlvmIrWriter.Number (cfg.number_of_runtime_properties)}}, {{w.Comment (" uint32_t number_of_runtime_properties")}}
+				i32 {{LlvmIrWriter.Number (cfg.package_naming_policy)}}, {{w.Comment (" uint32_t package_naming_policy")}}
+				i32 {{LlvmIrWriter.Number (cfg.environment_variable_count)}}, {{w.Comment (" uint32_t environment_variable_count")}}
+				i32 {{LlvmIrWriter.Number (cfg.system_property_count)}}, {{w.Comment (" uint32_t system_property_count")}}
+				i32 {{LlvmIrWriter.Number (cfg.number_of_assemblies_in_apk)}}, {{w.Comment (" uint32_t number_of_assemblies_in_apk")}}
+				i32 {{LlvmIrWriter.Number (cfg.bundled_assembly_name_width)}}, {{w.Comment (" uint32_t bundled_assembly_name_width")}}
+				i32 {{LlvmIrWriter.Number (cfg.number_of_dso_cache_entries)}}, {{w.Comment (" uint32_t number_of_dso_cache_entries")}}
+				i32 {{LlvmIrWriter.Number (cfg.number_of_shared_libraries)}}, {{w.Comment (" uint32_t number_of_shared_libraries")}}
+				i32 {{LlvmIrWriter.Hex (cfg.android_runtime_jnienv_class_token)}}, {{w.Comment (" uint32_t android_runtime_jnienv_class_token")}}
+				i32 {{LlvmIrWriter.Hex (cfg.jnienv_initialize_method_token)}}, {{w.Comment (" uint32_t jnienv_initialize_method_token")}}
+				i32 {{LlvmIrWriter.Hex (cfg.jni_remapping_replacement_type_count)}}, {{w.Comment (" uint32_t jni_remapping_replacement_type_count")}}
+				i32 {{LlvmIrWriter.Number (cfg.jni_remapping_replacement_method_index_entry_count)}}, {{w.Comment (" uint32_t jni_remapping_replacement_method_index_entry_count")}}
+				ptr {{strings.GetPointer (cfg.android_package_name, "ApplicationConfig", "android_package_name")}}, {{w.Comment (" char* android_package_name")}}
+				i1 {{LlvmIrWriter.Bool (cfg.have_assembly_store)}}{{w.Comment (" bool have_assembly_store")}}
+			}
+			""", w.GetAggregateAlignment (structAlignment, ApplicationConfigDataSize));
 
-		var dsoNames = new List<string> ();
+		WriteDsoCache (w, data, structAlignment);
 
-		// Indices array MUST NOT be sorted, since it groups alias entries together with the main entry
-		var indices = new List<uint> ();
-		variable.Value = indices;
-		foreach (DSOCacheEntry preload in dsoState.JniPreloadDSOs) {
-			int dsoIdx = dsoState.DsoCache.FindIndex (entry => ReferenceEquals (entry.Instance, preload));
+		w.WriteGlobal ("bundled_assemblies", LlvmIrWriter.GlobalWritable, "[0 x %struct.XamarinAndroidBundledAssembly]", "zeroinitializer", w.GetAggregateAlignment (structAlignment, 0 * XamarinAndroidBundledAssemblyDataSize), " Bundled assembly name buffers, all empty (unused when assembly stores are enabled)");
 
-			if (dsoIdx == -1) {
-				throw new InvalidOperationException ($"Internal error: DSO entry in JNI preload list not found in the DSO cache list.");
-			}
+		var names = new List<string> (data.RuntimePropertyNames.Count);
+		foreach (string name in data.RuntimePropertyNames) {
+			names.Add ($"\tptr {strings.GetPointer (name)}");
+		}
+		w.WriteGlobal (
+			"init_runtime_property_names",
+			LlvmIrWriter.GlobalConstant,
+			$"[{LlvmIrWriter.Number (names.Count)} x ptr]",
+			w.ArrayValue (names, i => $" {LlvmIrWriter.Number (i)} ('{data.RuntimePropertyNames [i]}')"),
+			w.GetPointerArrayAlignment (names.Count),
+			"Names of properties passed to coreclr_initialize"
+		);
 
-			indices.Add ((uint)dsoIdx);
-			dsoNames.Add (preload.HashedName ?? String.Empty);
+		var values = new List<string> (data.RuntimePropertyValues.Count);
+		foreach (string? value in data.RuntimePropertyValues) {
+			values.Add ($"\tptr {strings.GetPointer (value)}");
 		}
-		dsoState.JniPreloadNames = dsoNames;
+		w.WriteGlobal (
+			"init_runtime_property_values",
+			LlvmIrWriter.GlobalWritable,
+			$"[{LlvmIrWriter.Number (values.Count)} x ptr]",
+			w.ArrayValue (values, i => $" {LlvmIrWriter.Number (i)} ('{data.RuntimePropertyValues [i]}')"),
+			w.GetPointerArrayAlignment (values.Count),
+			"Values of properties passed to coreclr_initialize"
+		);
+
+		ulong assemblyCount = (ulong)NumberOfAssembliesInApk;
+		w.WriteGlobal ("assembly_store_bundled_assemblies", LlvmIrWriter.GlobalWritable, $"[{LlvmIrWriter.Number (assemblyCount)} x %struct.AssemblyStoreSingleAssemblyRuntimeData]", "zeroinitializer", w.GetAggregateAlignment (w.Target.PointerSize, assemblyCount * AssemblyStoreSingleAssemblyRuntimeDataDataSize));
+		w.WriteGlobal ("assembly_store", LlvmIrWriter.GlobalWritable, "%struct.AssemblyStoreRuntimeData", $$"""
+			{
+				ptr null, {{w.Comment (" uint8_t* data_start")}}
+				i32 0, {{w.Comment (" uint32_t assembly_count")}}
+				i32 0, {{w.Comment (" uint32_t index_entry_count")}}
+				ptr null{{w.Comment (" AssemblyStoreAssemblyDescriptor* assemblies")}}
+			}
+			""", w.GetAggregateAlignment (structAlignment, AssemblyStoreRuntimeDataDataSize));
+
+		strings.Write (w);
+		w.WriteMetadata ();
+		output.Flush ();
 	}
 
-	void HashAndSortDSOCache (LlvmIrVariable variable, LlvmIrModuleTarget target, object? state)
+	void WriteDsoCache (LlvmIrWriter w, State state, ulong structAlignment)
 	{
-		var cache = variable.Value as List<StructureInstance<DSOCacheEntry>>;
-		if (cache == null) {
-			throw new InvalidOperationException ($"Internal error: DSO cache must not be empty");
+		// Hashes are architecture independent, but the sort is repeated for every architecture as it
+		// determines the order of entries with identical hashes
+		state.DsoCache.Sort ((DSOCacheEntry a, DSOCacheEntry b) => a.hash.CompareTo (b.hash));
+
+		var entries = new List<string> (state.DsoCache.Count);
+		foreach (DSOCacheEntry entry in state.DsoCache) {
+			entries.Add ($$"""
+					%struct.DSOCacheEntry {
+						i32 {{LlvmIrWriter.Hex (entry.hash)}}, {{w.Comment ($" from name: {entry.HashedName}")}}
+						i1 {{LlvmIrWriter.Bool (entry.ignore)}}, {{w.Comment (" bool ignore")}}
+						i1 {{LlvmIrWriter.Bool (entry.is_jni_library)}}, {{w.Comment (" bool is_jni_library")}}
+						i32 {{LlvmIrWriter.Number (entry.name_index)}}, {{w.Comment ($" name: {entry.RealName}")}}
+						ptr null{{w.Comment (" void* handle")}}
+					}
+				""");
 		}
+		w.WriteGlobal (
+			"dso_cache",
+			LlvmIrWriter.GlobalWritable,
+			$"[{LlvmIrWriter.Number (entries.Count)} x %struct.DSOCacheEntry]",
+			w.ArrayValue (entries, LlvmIrWriter.IndexComment),
+			w.GetAggregateAlignment (structAlignment, (ulong)entries.Count * DSOCacheEntryDataSize),
+			" DSO cache entries"
+		);
 
-		foreach (StructureInstance instance in cache) {
-			if (instance.Obj == null) {
-				throw new InvalidOperationException ("Internal error: DSO cache must not contain null entries");
-			}
+		w.WriteGlobal ("dso_jni_preloads_idx_stride", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (state.NameMutationsCount), 4);
 
-			var entry = instance.Obj as DSOCacheEntry;
-			if (entry == null) {
-				throw new InvalidOperationException ($"Internal error: DSO cache entry has unexpected type {instance.Obj.GetType ()}");
+		// Indices array MUST NOT be sorted, since it groups alias entries together with the main entry
+		var indices = new List<string> (state.JniPreloadDSOs.Count);
+		var indexNames = new List<string> (state.JniPreloadDSOs.Count);
+		foreach (DSOCacheEntry preload in state.JniPreloadDSOs) {
+			int dsoIdx = state.DsoCache.FindIndex (entry => ReferenceEquals (entry, preload));
+			if (dsoIdx == -1) {
+				throw new InvalidOperationException ($"Internal error: DSO entry in JNI preload list not found in the DSO cache list.");
 			}
 
-			entry.hash = TypeMapHelper.HashNameForCLR (entry.HashedName ?? "");
+			indices.Add ($"\ti32 {LlvmIrWriter.Number (dsoIdx)}");
+			indexNames.Add (preload.HashedName);
 		}
 
-		cache.Sort ((StructureInstance<DSOCacheEntry> a, StructureInstance<DSOCacheEntry> b) => {
-			if (a.Instance == null || b.Instance == null) return 0;
-			return a.Instance.hash.CompareTo (b.Instance.hash);
-		});
+		// Historically, the count has always been a 64-bit integer
+		w.WriteGlobal ("dso_jni_preloads_idx_count", LlvmIrWriter.GlobalConstant, "i64", LlvmIrWriter.Number (indices.Count), 8);
+		w.WriteGlobal (
+			"dso_jni_preloads_idx",
+			LlvmIrWriter.GlobalConstant,
+			$"[{LlvmIrWriter.Number (indices.Count)} x i32]",
+			w.ArrayValue (indices, i => $" {indexNames [i]}"),
+			w.GetAggregateAlignment (4, (ulong)indices.Count * 4),
+			" Indices into dso_cache[] of DSO libraries to preload because of JNI use"
+		);
+
+		state.NamesBlob.Write (w, "dso_names_data");
 	}
 
-	DsoCacheState InitDSOCache ()
+	void InitDSOCache (State state)
 	{
 		var dsos = new List<(string name, ITaskItem item)> ();
 		var nameCache = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
@@ -462,17 +414,14 @@ DsoCacheState InitDSOCache ()
 			dsos.Add ((name, item));
 		}
 
-		var dsoCache = new List<StructureInstance<DSOCacheEntry>> ();
-		var jniPreloads = new List<DSOCacheEntry> ();
 		var nameMutations = new List<string> ();
-		var dsoNamesBlob = new LlvmIrStringBlob ();
 		int nameMutationsCount = -1;
 		ICollection<string> ignorePreload = MakeJniPreloadIgnoreCollection (Log, NativeLibrariesAlwaysJniPreload, NativeLibrariesNoJniPreload);
 
 		for (int i = 0; i < dsos.Count; i++) {
 			string name = dsos[i].name;
 
-			(int nameOffset, _) = dsoNamesBlob.Add (name);
+			int nameOffset = state.NamesBlob.Add (name);
 
 			bool isJniLibrary = ELFHelper.IsJniLibrary (Log, dsos[i].item.ItemSpec);
 			bool ignore_for_preload = ShouldIgnoreForJniPreload (Log, ignorePreload, dsos[i].item);
@@ -489,30 +438,23 @@ DsoCacheState InitDSOCache ()
 					HashedName = entryName,
 					RealName = name,
 
-					hash = 0, // Hash is arch-specific, we compute it before writing
+					hash = TypeMapHelper.HashNameForCLR (entryName),
 					ignore = false,
 					is_jni_library = isJniLibrary,
 					name_index = (uint)nameOffset,
 				};
 
-				var item = new StructureInstance<DSOCacheEntry> (dsoCacheEntryStructureInfo, entry);
-
 				// We must add all aliases to the preloads indices array so that all of them have their handle
 				// set when the library is preloaded.
 				if (entry.is_jni_library && !ignore_for_preload) {
-					jniPreloads.Add (entry);
+					state.JniPreloadDSOs.Add (entry);
 				}
 
-				dsoCache.Add (item);
+				state.DsoCache.Add (entry);
 			}
 		}
 
-		return new DsoCacheState {
-			DsoCache = dsoCache,
-			JniPreloadDSOs = jniPreloads,
-			NamesBlob = dsoNamesBlob,
-			NameMutationsCount = (uint)(nameMutationsCount <= 0 ? 1 : nameMutationsCount),
-		};
+		state.NameMutationsCount = (uint)(nameMutationsCount <= 0 ? 1 : nameMutationsCount);
 
 		void AddNameMutations (string name)
 		{
@@ -521,11 +463,11 @@ void AddNameMutations (string name)
 			// src/native/clr/include/runtime-base/monodroid-dl.hh). Keep the two in sync.
 			nameMutations.Add (name);
 			if (name.EndsWith (".dll.so", StringComparison.OrdinalIgnoreCase)) {
-				string nameNoExt = Path.GetFileNameWithoutExtension (Path.GetFileNameWithoutExtension (name))!;
+				string nameNoExt = Path.GetFileNameWithoutExtension (Path.GetFileNameWithoutExtension (name));
 				nameMutations.Add (nameNoExt);
 				nameMutations.Add ($"{nameNoExt}.so");
 			} else {
-				nameMutations.Add (Path.GetFileNameWithoutExtension (name)!);
+				nameMutations.Add (Path.GetFileNameWithoutExtension (name));
 			}
 
 			const string libPrefix = "lib";
@@ -535,17 +477,6 @@ void AddNameMutations (string name)
 		}
 	}
 
-	void MapStructures (LlvmIrModule module)
-	{
-		applicationConfigStructureInfo = module.MapStructure<ApplicationConfig> ();
-		module.MapStructure<AssemblyStoreAssemblyDescriptor> ();
-		assemblyStoreSingleAssemblyRuntimeDataStructureinfo = module.MapStructure<AssemblyStoreSingleAssemblyRuntimeData> ();
-		assemblyStoreRuntimeDataStructureInfo = module.MapStructure<AssemblyStoreRuntimeData> ();
-		xamarinAndroidBundledAssemblyStructureInfo = module.MapStructure<XamarinAndroidBundledAssembly> ();
-		dsoCacheEntryStructureInfo = module.MapStructure<DSOCacheEntry> ();
-		appEnvironmentVariableStructureInfo = module.MapStructure<LlvmIrHelpers.AppEnvironmentVariable> ();
-	}
-
 	internal static bool ShouldIgnoreForJniPreload (TaskLoggingHelper log, ICollection<string> libsToIgnore, ITaskItem libItem)
 	{
 		if (libsToIgnore.Count == 0) {
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
index 93b695662b6..d209f3d1245 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
@@ -2,197 +2,146 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using Microsoft.Build.Utilities;
 
-using Xamarin.Android.Tasks.LLVMIR;
 using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Tasks
 {
-	partial class CompressedAssembliesNativeAssemblyGenerator : LlvmIrComposer
+	class CompressedAssembliesNativeAssemblyGenerator
 	{
 		const string DescriptorsArraySymbolName = "compressed_assembly_descriptors";
 		const string CompressedAssemblyCountSymbolName = "compressed_assembly_count";
 		const string UncompressedAssembliesBufferSymbolName = "uncompressed_assemblies_data_buffer";
 		const string UncompressedAssembliesBufferSizeSymbolName = "uncompressed_assemblies_data_size";
 
-		// Order of fields and their type must correspond *exactly* to that in:
-		//
-		// src/native/clr/include/xamarin-app.hh CompressedAssemblyDescriptor structure
-		//
-		//[NativeAssemblerStructContextDataProvider (typeof (CompressedAssemblyDescriptorContextDataProvider))]
+		// The %struct.CompressedAssemblyDescriptor declaration below must be identical to the
+		// CompressedAssemblyDescriptor structure in src/native/clr/include/xamarin-app.hh
+		// See LlvmIrTarget.GetAggregateAlignment for the meaning of the "data size"
+		const ulong DescriptorDataSize = 9;
+		const ulong DescriptorAlignment = 4;
+
 		sealed class CompressedAssemblyDescriptor
 		{
-			[NativeAssembler (Ignore = true)]
 			public uint Index;
+			public string AssemblyName = "";
 
-			[NativeAssembler (Ignore = true)]
-			public string? AssemblyName;
+			public uint uncompressed_file_size;
+			public uint buffer_offset;
+		}
 
-			public uint   uncompressed_file_size;
-			public bool   loaded;
-			public uint   buffer_offset;
-		};
+		readonly Dictionary<AndroidTargetArch, List<CompressedAssemblyDescriptor>> archDescriptors = new ();
+		readonly Dictionary<AndroidTargetArch, uint> archBufferSizes = new ();
 
-		IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>? archAssemblies;
-		StructureInfo? compressedAssemblyDescriptorStructureInfo;
-		Dictionary<AndroidTargetArch, List<StructureInstance<CompressedAssemblyDescriptor>>> archData = new Dictionary<AndroidTargetArch, List<StructureInstance<CompressedAssemblyDescriptor>>> ();
+		/// <summary>
+		/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+		/// </summary>
+		public bool EmitComments { get; set; }
 
 		public CompressedAssembliesNativeAssemblyGenerator (TaskLoggingHelper log, IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>? archAssemblies)
-			: base (log)
 		{
-			this.archAssemblies = archAssemblies;
-		}
+			if (log == null) {
+				throw new ArgumentNullException (nameof (log));
+			}
 
-		void InitCompressedAssemblies (out List<LlvmIrGlobalVariable>? compressedAssemblies,
-		                               out List<LlvmIrGlobalVariable>? compressedAssemblyDescriptors,
-		                               out List<LlvmIrGlobalVariable>? buffers)
-		{
 			if (archAssemblies == null || archAssemblies.Count == 0) {
-				compressedAssemblies = null;
-				compressedAssemblyDescriptors = null;
-				buffers = null;
 				return;
 			}
 
-			buffers = new ();
 			foreach (var kvpArch in archAssemblies) {
 				uint bufferSize = 0;
 
 				foreach (var kvp in kvpArch.Value) {
 					CompressedAssemblyInfo info = kvp.Value;
 
-					if (!archData.TryGetValue (info.TargetArch, out List<StructureInstance<CompressedAssemblyDescriptor>> descriptors)) {
-						descriptors = new List<StructureInstance<CompressedAssemblyDescriptor>> ();
-						archData.Add (info.TargetArch, descriptors);
+					if (!archDescriptors.TryGetValue (info.TargetArch, out List<CompressedAssemblyDescriptor>? descriptors)) {
+						descriptors = new List<CompressedAssemblyDescriptor> ();
+						archDescriptors.Add (info.TargetArch, descriptors);
 					}
 
-					var descriptor = new CompressedAssemblyDescriptor {
+					descriptors.Add (new CompressedAssemblyDescriptor {
 						Index = info.DescriptorIndex,
 						AssemblyName = info.AssemblyName,
 						uncompressed_file_size = info.FileSize,
-						loaded = false,
 						buffer_offset = bufferSize,
-					};
+					});
 					bufferSize += info.FileSize;
-					descriptors.Add (new StructureInstance<CompressedAssemblyDescriptor> (compressedAssemblyDescriptorStructureInfo, descriptor));
 				}
 
-				var variable = new LlvmIrGlobalVariable (typeof(uint), UncompressedAssembliesBufferSizeSymbolName) {
-					Options = LlvmIrVariableOptions.GlobalConstant,
-					TargetArch = kvpArch.Key,
-					Value = bufferSize,
-				};
-				buffers.Add (variable);
-
-				variable = new LlvmIrGlobalVariable (typeof(List<byte>), UncompressedAssembliesBufferSymbolName, LlvmIrVariableOptions.GlobalWritable) {
-					ArrayItemCount = bufferSize,
-					TargetArch = kvpArch.Key,
-					ZeroInitializeArray = true,
-				};
-				buffers.Add (variable);
+				archBufferSizes [kvpArch.Key] = bufferSize;
 			}
 
-			compressedAssemblies = new List<LlvmIrGlobalVariable> ();
-			compressedAssemblyDescriptors = new List<LlvmIrGlobalVariable> ();
-			foreach (var kvp in archData) {
-				List<StructureInstance<CompressedAssemblyDescriptor>> descriptors = kvp.Value;
-				descriptors.Sort ((StructureInstance<CompressedAssemblyDescriptor> a, StructureInstance<CompressedAssemblyDescriptor> b) => {
-					if (a.Instance == null || b.Instance == null) return 0;
-					return a.Instance.Index.CompareTo (b.Instance.Index);
-				});
-
-				var variable = new LlvmIrGlobalVariable (typeof(uint), CompressedAssemblyCountSymbolName) {
-					Options = LlvmIrVariableOptions.GlobalConstant,
-					TargetArch = kvp.Key,
-					Value = (uint)descriptors.Count,
-				};
-				compressedAssemblies.Add (variable);
-
-				variable = new LlvmIrGlobalVariable (typeof(List<StructureInstance<CompressedAssemblyDescriptor>>), DescriptorsArraySymbolName) {
-					GetArrayItemCommentCallback = GetCompressedAssemblyDescriptorsItemComment,
-					Options = LlvmIrVariableOptions.GlobalWritable,
-					TargetArch = kvp.Key,
-					Value = descriptors,
-				};
-				compressedAssemblyDescriptors.Add (variable);
+			foreach (var kvp in archDescriptors) {
+				kvp.Value.Sort ((CompressedAssemblyDescriptor a, CompressedAssemblyDescriptor b) => a.Index.CompareTo (b.Index));
 			}
 		}
 
-		protected override void Construct (LlvmIrModule module)
+		public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 		{
-			module.DefaultStringGroup = "cas";
+			var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+			w.WriteHeader (fileName);
+			w.Write ($$"""
+
+				%struct.CompressedAssemblyDescriptor = type {
+					i32, {{w.Comment (" uint32_t uncompressed_file_size")}}
+					i1, {{w.Comment (" bool loaded")}}
+					i32 {{w.Comment (" uint32_t buffer_offset")}}
+				}
 
-			MapStructures (module);
+				""");
 
-			InitCompressedAssemblies (
-				out List<LlvmIrGlobalVariable>? compressedAssemblies,
-				out List<LlvmIrGlobalVariable>? compressedAssemblyDescriptors,
-				out List<LlvmIrGlobalVariable>? buffers
-			);
+			if (archDescriptors.Count == 0) {
+				WriteCount (w, 0);
+				WriteDescriptors (w, []);
+				WriteBuffer (w, 0);
+			} else {
+				if (archDescriptors.TryGetValue (arch, out List<CompressedAssemblyDescriptor>? descriptors)) {
+					WriteCount (w, (uint)descriptors.Count);
+					WriteDescriptors (w, descriptors);
+				}
 
-			if (archData.Count == 0) {
-				var emptyCountVar = new LlvmIrGlobalVariable (typeof(uint), CompressedAssemblyCountSymbolName) {
-					Options = LlvmIrVariableOptions.GlobalConstant,
-					Value = 0u,
-				};
-				module.Add (emptyCountVar);
-
-				var emptyDescriptorsVar = new LlvmIrGlobalVariable (typeof(List<StructureInstance<CompressedAssemblyDescriptor>>), DescriptorsArraySymbolName) {
-					Options = LlvmIrVariableOptions.GlobalWritable,
-					Value = new List<StructureInstance<CompressedAssemblyDescriptor>> (),
-				};
-				module.Add (emptyDescriptorsVar);
-
-				var emptyBufferSizeVar = new LlvmIrGlobalVariable (typeof(uint), UncompressedAssembliesBufferSizeSymbolName) {
-					Options = LlvmIrVariableOptions.GlobalConstant,
-					Value = 0u,
-				};
-				module.Add (emptyBufferSizeVar);
-
-				var emptyBufferVar = new LlvmIrGlobalVariable (typeof(List<byte>), UncompressedAssembliesBufferSymbolName, LlvmIrVariableOptions.GlobalWritable) {
-					ArrayItemCount = 0,
-					ZeroInitializeArray = true,
-				};
-				module.Add (emptyBufferVar);
-				return;
+				if (archBufferSizes.TryGetValue (arch, out uint bufferSize)) {
+					WriteBuffer (w, bufferSize);
+				}
 			}
 
-			if (compressedAssemblies != null) {
-				module.Add (compressedAssemblies);
-			}
-			if (compressedAssemblyDescriptors != null) {
-				module.Add (compressedAssemblyDescriptors);
-			}
-			if (buffers != null) {
-				module.Add (buffers);
-			}
+			w.WriteMetadata ();
+			output.Flush ();
 		}
 
-		string? GetCompressedAssemblyDescriptorsItemComment (LlvmIrVariable v, LlvmIrModuleTarget target, ulong index, object? value, object? callerState)
+		static void WriteCount (LlvmIrWriter w, uint count)
 		{
-			List<StructureInstance<CompressedAssemblyDescriptor>> descriptors = GetArchDescriptors (target);
-			if ((int)index >= descriptors.Count) {
-				throw new InvalidOperationException ($"Internal error: index {index} is too big for variable '{v.Name}'");
-			}
-			StructureInstance<CompressedAssemblyDescriptor> desc = descriptors[(int)index];
-
-			return $" {index}: {desc.Instance?.AssemblyName ?? ""}";
+			w.WriteGlobal (CompressedAssemblyCountSymbolName, LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (count), 4);
 		}
 
-		List<StructureInstance<CompressedAssemblyDescriptor>> GetArchDescriptors (LlvmIrModuleTarget target)
+		static void WriteDescriptors (LlvmIrWriter w, List<CompressedAssemblyDescriptor> descriptors)
 		{
-			if (!archData.TryGetValue (target.TargetArch, out List<StructureInstance<CompressedAssemblyDescriptor>> descriptors)) {
-				throw new InvalidOperationException ($"Internal error: missing compressed descriptors data for architecture '{target.TargetArch}'");
+			var elements = new List<string> (descriptors.Count);
+			foreach (CompressedAssemblyDescriptor d in descriptors) {
+				elements.Add ($$"""
+						%struct.CompressedAssemblyDescriptor {
+							i32 {{LlvmIrWriter.Number (d.uncompressed_file_size)}}, {{w.Comment (" uint32_t uncompressed_file_size")}}
+							i1 false, {{w.Comment (" bool loaded")}}
+							i32 {{LlvmIrWriter.Number (d.buffer_offset)}}{{w.Comment (" uint32_t buffer_offset")}}
+						}
+					""");
 			}
 
-			return descriptors;
+			w.WriteGlobal (
+				DescriptorsArraySymbolName,
+				LlvmIrWriter.GlobalWritable,
+				$"[{LlvmIrWriter.Number (descriptors.Count)} x %struct.CompressedAssemblyDescriptor]",
+				w.ArrayValue (elements, i => $" {LlvmIrWriter.Number (i)}: {descriptors [i].AssemblyName}"),
+				w.GetAggregateAlignment (DescriptorAlignment, (ulong)descriptors.Count * DescriptorDataSize)
+			);
 		}
 
-		void MapStructures (LlvmIrModule module)
+		static void WriteBuffer (LlvmIrWriter w, uint bufferSize)
 		{
-			compressedAssemblyDescriptorStructureInfo = module.MapStructure<CompressedAssemblyDescriptor> ();
+			w.WriteGlobal (UncompressedAssembliesBufferSizeSymbolName, LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (bufferSize), 4);
+			w.WriteGlobal (UncompressedAssembliesBufferSymbolName, LlvmIrWriter.GlobalWritable, $"[{LlvmIrWriter.Number (bufferSize)} x i8]", "zeroinitializer", w.GetAggregateAlignment (1, bufferSize));
 		}
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JniOnLoadNativeAssemblerHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JniOnLoadNativeAssemblerHelper.cs
deleted file mode 100644
index fda10f12f2a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JniOnLoadNativeAssemblerHelper.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-using Xamarin.Android.Tasks.LLVMIR;
-
-namespace Xamarin.Android.Tasks;
-
-class JniOnLoadNativeAssemblerHelper
-{
-	public static void GenerateJniOnLoadHandlerCode (ICollection<string> jniOnLoadNames, LlvmIrModule module)
-	{
-		module.AddGlobalVariable ("__jni_on_load_handler_count", (uint)jniOnLoadNames.Count, LlvmIrVariableOptions.GlobalConstant);
-		var jniOnLoadPointers = new List<LlvmIrVariableReference> ();
-		foreach (string name in jniOnLoadNames) {
-			var symref = new LlvmIrGlobalVariableReference (name);
-			jniOnLoadPointers.Add (symref);
-			LlvmIrHelpers.DeclareDummyFunction (module, symref);
-		}
-		module.AddGlobalVariable ("__jni_on_load_handlers", jniOnLoadPointers, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable ("__jni_on_load_handler_names", jniOnLoadNames, LlvmIrVariableOptions.GlobalConstant);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
index c79f4855a58..90817da13a1 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
@@ -1,12 +1,13 @@
-#nullable disable
+#nullable enable
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 
 using Microsoft.Build.Utilities;
 
-using Xamarin.Android.Tasks.LLVMIR;
+using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Tasks
 {
@@ -46,289 +47,244 @@ public JniRemappingMethodReplacement (string sourceType, string sourceMethod, st
 		}
 	}
 
-	class JniRemappingAssemblyGenerator : LlvmIrComposer
+	class JniRemappingAssemblyGenerator
 	{
 		const string TypeReplacementsVariableName = "jni_remapping_type_replacements";
 		const string MethodReplacementIndexVariableName = "jni_remapping_method_replacement_index";
 
-		sealed class JniRemappingTypeReplacementEntryContextDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var entry = EnsureType<JniRemappingTypeReplacementEntry>(data);
-
-				if (MonoAndroidHelper.StringEquals ("name", fieldName)) {
-					return $" name: {entry.name.str}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("replacement", fieldName)) {
-					return $" replacement: {entry.replacement}";
-				}
+		// The structure declarations written by this class must be identical to the structures in
+		// src/native/clr/include/xamarin-app.hh.  Data sizes are the sums of sizes of all the
+		// non-pointer members (see LlvmIrTarget.GetAggregateAlignment), alignments don't include
+		// the pointer members either (those are accounted for in GetAlignment below)
+		const ulong JniRemappingIndexMethodEntryDataSize = 9;
+		const ulong JniRemappingIndexTypeEntryDataSize = 8;
+		const ulong JniRemappingTypeReplacementEntryDataSize = 4;
+		const ulong NonPointerMemberAlignment = 4;
 
-				return String.Empty;
-			}
-		}
-
-		sealed class JniRemappingIndexTypeEntryContextDataProvider : NativeAssemblerStructContextDataProvider
+		sealed class JniRemappingString
 		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var entry = EnsureType<JniRemappingIndexTypeEntry> (data);
-
-				if (MonoAndroidHelper.StringEquals ("name", fieldName)) {
-					return $" name: {entry.name.str}";
-				}
-
-				return String.Empty;
-			}
-
-			public override string GetPointedToSymbolName (object data, string fieldName)
-			{
-				var entry = EnsureType<JniRemappingIndexTypeEntry> (data);
-
-				if (MonoAndroidHelper.StringEquals ("methods", fieldName)) {
-					return entry.MethodsArraySymbolName;
-				}
-
-				return base.GetPointedToSymbolName (data, fieldName);
-			}
+			public readonly uint length;
+			public readonly string str;
 
-			public override ulong GetBufferSize (object data, string fieldName)
+			public JniRemappingString (string str)
 			{
-				var entry = EnsureType<JniRemappingIndexTypeEntry> (data);
-				if (MonoAndroidHelper.StringEquals ("methods", fieldName)) {
-					return (ulong)entry.TypeMethods.Count;
-				}
-
-				return 0;
+				this.str = str;
+				length = String.IsNullOrEmpty (str) ? 0 : (uint)Encoding.UTF8.GetBytes (str).Length;
 			}
 		}
 
-		sealed class JniRemappingIndexMethodEntryContextDataProvider : NativeAssemblerStructContextDataProvider
+		sealed class JniRemappingIndexMethodEntry
 		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var entry = EnsureType<JniRemappingIndexMethodEntry> (data);
-
-				if (MonoAndroidHelper.StringEquals ("name", fieldName)) {
-					return $" name: {entry.name.str}";
-				}
+			public readonly JniRemappingString name;
+			public readonly JniRemappingString signature;
+			public readonly string target_type;
+			public readonly string target_name;
+			public readonly bool is_static;
 
-				if (MonoAndroidHelper.StringEquals ("replacement", fieldName)) {
-					return $" replacement: {entry.replacement.target_type}.{entry.replacement.target_name}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("signature", fieldName)) {
-					if (entry.signature.length == 0) {
-						return String.Empty;
-					}
-
-					return $"signature: {entry.signature.str}";
-				}
-
-				return String.Empty;
+			public JniRemappingIndexMethodEntry (JniRemappingMethodReplacement mmr)
+			{
+				name = new JniRemappingString (mmr.SourceMethod);
+				signature = new JniRemappingString (mmr.SourceMethodSignature);
+				target_type = mmr.TargetType;
+				target_name = mmr.TargetMethod;
+				is_static = mmr.TargetIsStatic;
 			}
 		}
 
-		sealed class JniRemappingString
-		{
-			public uint   length;
-			public string str;
-		};
-
-		sealed class JniRemappingReplacementMethod
-		{
-			public string  target_type;
-			public string  target_name;
-			public bool    is_static;
-		};
-
-		[NativeAssemblerStructContextDataProvider (typeof(JniRemappingIndexMethodEntryContextDataProvider))]
-		sealed class JniRemappingIndexMethodEntry
-		{
-			[NativeAssembler (UsesDataProvider = true)]
-			public JniRemappingString            name;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public JniRemappingString            signature;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public JniRemappingReplacementMethod replacement;
-		};
-
-		[NativeAssemblerStructContextDataProvider (typeof(JniRemappingIndexTypeEntryContextDataProvider))]
 		sealed class JniRemappingIndexTypeEntry
 		{
-			[NativeAssembler (UsesDataProvider = true)]
-			public JniRemappingString           name;
-			public uint                method_count;
-
-			[NativeAssembler (UsesDataProvider = true), NativePointer (PointsToSymbol = "")]
-#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value - populated during native code generation
-			public JniRemappingIndexMethodEntry methods;
-#pragma warning restore CS0649
+			public readonly JniRemappingString name;
+			public readonly string MethodsArraySymbolName;
+			public readonly List<JniRemappingIndexMethodEntry> TypeMethods = new ();
 
-			[NativeAssembler (Ignore = true)]
-			public string MethodsArraySymbolName;
-
-			[NativeAssembler (Ignore = true)]
-			public List<StructureInstance<JniRemappingIndexMethodEntry>> TypeMethods;
-		};
+			public JniRemappingIndexTypeEntry (string typeName)
+			{
+				name = new JniRemappingString (typeName);
+				MethodsArraySymbolName = $"mm_{typeName.Replace ('/', '_')}";
+			}
+		}
 
-		[NativeAssemblerStructContextDataProvider (typeof(JniRemappingTypeReplacementEntryContextDataProvider))]
 		sealed class JniRemappingTypeReplacementEntry
 		{
-			[NativeAssembler (UsesDataProvider = true)]
-			public JniRemappingString name;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public string    replacement;
-		};
+			public readonly JniRemappingString name;
+			public readonly string replacement;
 
-		List<JniRemappingTypeReplacement> typeReplacementsInput;
-		List<JniRemappingMethodReplacement> methodReplacementsInput;
+			public JniRemappingTypeReplacementEntry (JniRemappingTypeReplacement mtr)
+			{
+				name = new JniRemappingString (mtr.From);
+				replacement = mtr.To;
+			}
+		}
 
-		StructureInfo jniRemappingStringStructureInfo;
-		StructureInfo jniRemappingReplacementMethodStructureInfo;
-		StructureInfo jniRemappingIndexMethodEntryStructureInfo;
-		StructureInfo jniRemappingIndexTypeEntryStructureInfo;
-		StructureInfo jniRemappingTypeReplacementEntryStructureInfo;
+		readonly List<JniRemappingTypeReplacementEntry>? typeReplacements;
+		readonly List<JniRemappingIndexTypeEntry>? methodIndexTypes;
 
 		public int ReplacementMethodIndexEntryCount { get; private set; } = 0;
 
-		public JniRemappingAssemblyGenerator (TaskLoggingHelper log)
-			: base (log)
-		{}
+		/// <summary>
+		/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+		/// </summary>
+		public bool EmitComments { get; set; }
 
-		public JniRemappingAssemblyGenerator (TaskLoggingHelper log, List<JniRemappingTypeReplacement> typeReplacements, List<JniRemappingMethodReplacement> methodReplacements)
-			: base (log)
+		public JniRemappingAssemblyGenerator (TaskLoggingHelper log)
 		{
-			this.typeReplacementsInput = typeReplacements ?? throw new ArgumentNullException (nameof (typeReplacements));
-			this.methodReplacementsInput = methodReplacements ?? throw new ArgumentNullException (nameof (methodReplacements));
+			if (log == null) {
+				throw new ArgumentNullException (nameof (log));
+			}
 		}
 
-		(List<StructureInstance<JniRemappingTypeReplacementEntry>>? typeReplacements, List<StructureInstance<JniRemappingIndexTypeEntry>>? methodIndexTypes) Init ()
+		public JniRemappingAssemblyGenerator (TaskLoggingHelper log, List<JniRemappingTypeReplacement> typeReplacements, List<JniRemappingMethodReplacement> methodReplacements)
+			: this (log)
 		{
-			if (typeReplacementsInput == null) {
-				return (null, null);
+			if (typeReplacements == null) {
+				throw new ArgumentNullException (nameof (typeReplacements));
 			}
 
-			var typeReplacements = new List<StructureInstance<JniRemappingTypeReplacementEntry>> ();
-			foreach (JniRemappingTypeReplacement mtr in typeReplacementsInput) {
-				var entry = new JniRemappingTypeReplacementEntry {
-					name = MakeJniRemappingString (mtr.From),
-					replacement = mtr.To,
-				};
-
-				typeReplacements.Add (new StructureInstance<JniRemappingTypeReplacementEntry> (jniRemappingTypeReplacementEntryStructureInfo, entry));
+			if (methodReplacements == null) {
+				throw new ArgumentNullException (nameof (methodReplacements));
 			}
-			typeReplacements.Sort ((StructureInstance<JniRemappingTypeReplacementEntry> l, StructureInstance<JniRemappingTypeReplacementEntry> r) => l.Instance.name.str.CompareTo (r.Instance.name.str));
 
-			var methodIndexTypes = new List<StructureInstance<JniRemappingIndexTypeEntry>> ();
-			var types = new Dictionary<string, StructureInstance<JniRemappingIndexTypeEntry>> (StringComparer.Ordinal);
+			this.typeReplacements = new List<JniRemappingTypeReplacementEntry> ();
+			foreach (JniRemappingTypeReplacement mtr in typeReplacements) {
+				this.typeReplacements.Add (new JniRemappingTypeReplacementEntry (mtr));
+			}
+			this.typeReplacements.Sort ((JniRemappingTypeReplacementEntry l, JniRemappingTypeReplacementEntry r) => l.name.str.CompareTo (r.name.str));
 
-			foreach (JniRemappingMethodReplacement mmr in methodReplacementsInput) {
-				if (!types.TryGetValue (mmr.SourceType, out StructureInstance<JniRemappingIndexTypeEntry> typeEntry)) {
-					var entry = new JniRemappingIndexTypeEntry {
-						name = MakeJniRemappingString (mmr.SourceType),
-						MethodsArraySymbolName = MakeMethodsArrayName (mmr.SourceType),
-						TypeMethods = new List<StructureInstance<JniRemappingIndexMethodEntry>> (),
-					};
+			methodIndexTypes = new List<JniRemappingIndexTypeEntry> ();
+			var types = new Dictionary<string, JniRemappingIndexTypeEntry> (StringComparer.Ordinal);
 
-					typeEntry = new StructureInstance<JniRemappingIndexTypeEntry> (jniRemappingIndexTypeEntryStructureInfo, entry);
+			foreach (JniRemappingMethodReplacement mmr in methodReplacements) {
+				if (!types.TryGetValue (mmr.SourceType, out JniRemappingIndexTypeEntry? typeEntry)) {
+					typeEntry = new JniRemappingIndexTypeEntry (mmr.SourceType);
 					methodIndexTypes.Add (typeEntry);
 					types.Add (mmr.SourceType, typeEntry);
 				}
 
-				var method = new JniRemappingIndexMethodEntry {
-					name = MakeJniRemappingString (mmr.SourceMethod),
-					signature = MakeJniRemappingString (mmr.SourceMethodSignature),
-					replacement = new JniRemappingReplacementMethod {
-						target_type = mmr.TargetType,
-						target_name = mmr.TargetMethod,
-						is_static = mmr.TargetIsStatic,
-					},
-				};
-
-				typeEntry.Instance.TypeMethods.Add (new StructureInstance<JniRemappingIndexMethodEntry> (jniRemappingIndexMethodEntryStructureInfo, method));
+				typeEntry.TypeMethods.Add (new JniRemappingIndexMethodEntry (mmr));
 			}
 
 			foreach (var kvp in types) {
-				kvp.Value.Instance.method_count = (uint)kvp.Value.Instance.TypeMethods.Count;
-				kvp.Value.Instance.TypeMethods.Sort ((StructureInstance<JniRemappingIndexMethodEntry> l, StructureInstance<JniRemappingIndexMethodEntry> r) => l.Instance.name.str.CompareTo (r.Instance.name.str));
+				kvp.Value.TypeMethods.Sort ((JniRemappingIndexMethodEntry l, JniRemappingIndexMethodEntry r) => l.name.str.CompareTo (r.name.str));
 			}
 
-			methodIndexTypes.Sort ((StructureInstance<JniRemappingIndexTypeEntry> l, StructureInstance<JniRemappingIndexTypeEntry> r) => l.Instance.name.str.CompareTo (r.Instance.name.str));
+			methodIndexTypes.Sort ((JniRemappingIndexTypeEntry l, JniRemappingIndexTypeEntry r) => l.name.str.CompareTo (r.name.str));
 			ReplacementMethodIndexEntryCount = methodIndexTypes.Count;
+		}
 
-			return (typeReplacements, methodIndexTypes);
+		public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
+		{
+			var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+			var strings = new LlvmIrStringPool ();
+			ulong alignment = GetAlignment (w);
 
-			string MakeMethodsArrayName (string typeName)
-			{
-				return $"mm_{typeName.Replace ('/', '_')}";
-			}
+			w.WriteHeader (fileName);
+			w.Write ($$"""
 
-			JniRemappingString MakeJniRemappingString (string str)
-			{
-				return new JniRemappingString {
-					length = GetLength (str),
-					str = str,
-				};
-			}
+				%struct.JniRemappingIndexMethodEntry = type {
+					%struct.JniRemappingString, {{w.Comment (" JniRemappingString name")}}
+					%struct.JniRemappingString, {{w.Comment (" JniRemappingString signature")}}
+					%struct.JniRemappingReplacementMethod {{w.Comment (" JniRemappingReplacementMethod replacement")}}
+				}
 
-			uint GetLength (string str)
-			{
-				if (String.IsNullOrEmpty (str)) {
-					return 0;
+				%struct.JniRemappingIndexTypeEntry = type {
+					%struct.JniRemappingString, {{w.Comment (" JniRemappingString name")}}
+					i32, {{w.Comment (" uint32_t method_count")}}
+					ptr {{w.Comment (" JniRemappingIndexMethodEntry methods")}}
 				}
 
-				return (uint)Encoding.UTF8.GetBytes (str).Length;
-			}
-		}
+				%struct.JniRemappingReplacementMethod = type {
+					ptr, {{w.Comment (" char* target_type")}}
+					ptr, {{w.Comment (" char* target_name")}}
+					i1 {{w.Comment (" bool is_static")}}
+				}
 
-		protected override void Construct (LlvmIrModule module)
-		{
-			module.DefaultStringGroup = "jremap";
+				%struct.JniRemappingString = type {
+					i32, {{w.Comment (" uint32_t length")}}
+					ptr {{w.Comment (" char* str")}}
+				}
 
-			MapStructures (module);
-			List<StructureInstance<JniRemappingTypeReplacementEntry>>? typeReplacements;
-			List<StructureInstance<JniRemappingIndexTypeEntry>>? methodIndexTypes;
+				%struct.JniRemappingTypeReplacementEntry = type {
+					%struct.JniRemappingString, {{w.Comment (" JniRemappingString name")}}
+					ptr {{w.Comment (" char* replacement")}}
+				}
 
-			(typeReplacements, methodIndexTypes) = Init ();
+				""");
+
+			if (typeReplacements == null || methodIndexTypes == null) {
+				w.WriteGlobal (TypeReplacementsVariableName, LlvmIrWriter.GlobalConstant, "%struct.JniRemappingTypeReplacementEntry", "zeroinitializer", w.GetAggregateAlignment (alignment, JniRemappingTypeReplacementEntryDataSize));
+				w.WriteGlobal (MethodReplacementIndexVariableName, LlvmIrWriter.GlobalConstant, "%struct.JniRemappingIndexTypeEntry", "zeroinitializer", w.GetAggregateAlignment (alignment, JniRemappingIndexTypeEntryDataSize));
+			} else {
+				var elements = new List<string> (typeReplacements.Count);
+				foreach (JniRemappingTypeReplacementEntry entry in typeReplacements) {
+					elements.Add ($$"""
+							%struct.JniRemappingTypeReplacementEntry {
+								{{RenderString (w, strings, entry.name)}}, {{w.Comment ($" name: {entry.name.str}")}}
+								ptr {{strings.GetPointer (entry.replacement, "JniRemappingTypeReplacementEntry", "replacement")}}{{w.Comment ($" replacement: {entry.replacement}")}}
+							}
+						""");
+				}
+				WriteArray (w, TypeReplacementsVariableName, LlvmIrWriter.GlobalConstant, "JniRemappingTypeReplacementEntry", elements, alignment, JniRemappingTypeReplacementEntryDataSize);
+
+				foreach (JniRemappingIndexTypeEntry type in methodIndexTypes) {
+					elements = new List<string> (type.TypeMethods.Count);
+					foreach (JniRemappingIndexMethodEntry method in type.TypeMethods) {
+						string signatureComment = method.signature.length == 0 ? " JniRemappingString signature" : $"signature: {method.signature.str}";
+						elements.Add ($$"""
+								%struct.JniRemappingIndexMethodEntry {
+									{{RenderString (w, strings, method.name)}}, {{w.Comment ($" name: {method.name.str}")}}
+									{{RenderString (w, strings, method.signature)}}, {{w.Comment (signatureComment)}}
+									%struct.JniRemappingReplacementMethod {
+										ptr {{strings.GetPointer (method.target_type, "JniRemappingReplacementMethod", "target_type")}}, {{w.Comment (" char* target_type")}}
+										ptr {{strings.GetPointer (method.target_name, "JniRemappingReplacementMethod", "target_name")}}, {{w.Comment (" char* target_name")}}
+										i1 {{LlvmIrWriter.Bool (method.is_static)}}{{w.Comment (" bool is_static")}}
+									}{{w.Comment ($" replacement: {method.target_type}.{method.target_name}")}}
+								}
+							""");
+					}
+					WriteArray (w, type.MethodsArraySymbolName, LlvmIrWriter.LocalConstant, "JniRemappingIndexMethodEntry", elements, alignment, JniRemappingIndexMethodEntryDataSize);
+				}
 
-			if (typeReplacements == null) {
-				module.AddGlobalVariable (
-					typeof(StructureInstance<JniRemappingTypeReplacementEntry>),
-					TypeReplacementsVariableName,
-					new StructureInstance<JniRemappingTypeReplacementEntry> (jniRemappingTypeReplacementEntryStructureInfo, new JniRemappingTypeReplacementEntry ()) { IsZeroInitialized = true },
-					LlvmIrVariableOptions.GlobalConstant
-				);
-
-				module.AddGlobalVariable (
-					typeof(StructureInstance<JniRemappingIndexTypeEntry>),
-					MethodReplacementIndexVariableName,
-					new StructureInstance<JniRemappingIndexTypeEntry> (jniRemappingIndexTypeEntryStructureInfo, new JniRemappingIndexTypeEntry ()) { IsZeroInitialized = true },
-					LlvmIrVariableOptions.GlobalConstant
-				);
-				return;
+				elements = new List<string> (methodIndexTypes.Count);
+				foreach (JniRemappingIndexTypeEntry type in methodIndexTypes) {
+					elements.Add ($$"""
+							%struct.JniRemappingIndexTypeEntry {
+								{{RenderString (w, strings, type.name)}}, {{w.Comment ($" name: {type.name.str}")}}
+								i32 {{LlvmIrWriter.Number (type.TypeMethods.Count)}}, {{w.Comment (" uint32_t method_count")}}
+								ptr @{{type.MethodsArraySymbolName}}{{w.Comment (" JniRemappingIndexMethodEntry* methods")}}
+							}
+						""");
+				}
+				WriteArray (w, MethodReplacementIndexVariableName, LlvmIrWriter.GlobalConstant, "JniRemappingIndexTypeEntry", elements, alignment, JniRemappingIndexTypeEntryDataSize);
 			}
 
-			module.AddGlobalVariable (TypeReplacementsVariableName, typeReplacements, LlvmIrVariableOptions.GlobalConstant);
+			strings.Write (w);
+			w.WriteMetadata ();
+			output.Flush ();
+		}
 
-			foreach (StructureInstance<JniRemappingIndexTypeEntry> entry in methodIndexTypes) {
-				module.AddGlobalVariable (entry.Instance.MethodsArraySymbolName, entry.Instance.TypeMethods, LlvmIrVariableOptions.LocalConstant);
-			}
+		// All the structures written here either contain pointers or no members with alignment requirements higher than 4
+		static ulong GetAlignment (LlvmIrWriter w) => Math.Max (w.Target.PointerSize, NonPointerMemberAlignment);
 
-			module.AddGlobalVariable (MethodReplacementIndexVariableName, methodIndexTypes, LlvmIrVariableOptions.GlobalConstant);
+		// Renders a JniRemappingString structure embedded in another structure, at the second level of indentation
+		static string RenderString (LlvmIrWriter w, LlvmIrStringPool strings, JniRemappingString s)
+		{
+			return $$"""
+				%struct.JniRemappingString {
+							i32 {{LlvmIrWriter.Number (s.length)}}, {{w.Comment (" uint32_t length")}}
+							ptr {{strings.GetPointer (s.str, "JniRemappingString", "str")}}{{w.Comment (" char* str")}}
+						}
+				""";
 		}
 
-		void MapStructures (LlvmIrModule module)
+		static void WriteArray (LlvmIrWriter w, string name, string attributes, string structName, List<string> elements, ulong alignment, ulong dataSize)
 		{
-			jniRemappingStringStructureInfo = module.MapStructure<JniRemappingString> ();
-			jniRemappingReplacementMethodStructureInfo = module.MapStructure<JniRemappingReplacementMethod> ();
-			jniRemappingIndexMethodEntryStructureInfo = module.MapStructure<JniRemappingIndexMethodEntry> ();
-			jniRemappingIndexTypeEntryStructureInfo = module.MapStructure<JniRemappingIndexTypeEntry> ();
-			jniRemappingTypeReplacementEntryStructureInfo = module.MapStructure<JniRemappingTypeReplacementEntry> ();
+			w.WriteGlobal (
+				name,
+				attributes,
+				$"[{LlvmIrWriter.Number (elements.Count)} x %struct.{structName}]",
+				w.ArrayValue (elements, LlvmIrWriter.IndexComment),
+				w.GetAggregateAlignment (alignment, (ulong)elements.Count * dataSize)
+			);
 		}
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/KnownMetadata.cs b/src/Xamarin.Android.Build.Tasks/Utilities/KnownMetadata.cs
index 49bb679683e..9d6d341f2b2 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/KnownMetadata.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/KnownMetadata.cs
@@ -5,7 +5,6 @@ static class KnownMetadata
 {
 	public const string Abi = "Abi";
 	public const string NativeDontExportSymbols = "DontExportSymbols";
-	public const string NativeLinkItemSet = "NativeLinkItemSet";
 	public const string NativeLinkWholeArchive = "LinkWholeArchive";
 	public const string NativeSharedLibrary = "NativeSharedLibrary";
 	public const string RuntimeIdentifier = "RuntimeIdentifier";
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/FunctionAttributes.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/FunctionAttributes.cs
deleted file mode 100644
index 8eaaca45e5c..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/FunctionAttributes.cs
+++ /dev/null
@@ -1,1282 +0,0 @@
-using System;
-using System.Text;
-using System.Globalization;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	// Not all attributes are currently used throughout the code, but we define them call for potential future use.
-	// Documentation can be found here: https://llvm.org/docs/LangRef.html#function-attributes
-	/// <summary>
-	/// Abstract base class for LLVM IR function attributes. Function attributes specify properties
-	/// and optimizations that apply to functions in LLVM IR.
-	/// See: https://llvm.org/docs/LangRef.html#function-attributes
-	/// </summary>
-	abstract class LlvmIrFunctionAttribute : IComparable, IComparable<LlvmIrFunctionAttribute>, IEquatable<LlvmIrFunctionAttribute>
-	{
-		/// <summary>
-		/// Gets the name of the function attribute.
-		/// </summary>
-		public string Name { get; }
-		/// <summary>
-		/// Gets a value indicating whether the attribute name should be quoted in output.
-		/// </summary>
-		public bool Quoted { get; }
-		/// <summary>
-		/// Gets a value indicating whether this attribute supports parameters.
-		/// </summary>
-		public bool SupportsParams { get; }
-		/// <summary>
-		/// Gets a value indicating whether parameters are optional for this attribute.
-		/// </summary>
-		public bool ParamsAreOptional { get; }
-		/// <summary>
-		/// Gets a value indicating whether this attribute has a value assignment.
-		/// </summary>
-		public bool HasValueAsignment { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="LlvmIrFunctionAttribute"/> class.
-		/// </summary>
-		/// <param name="name">The name of the function attribute.</param>
-		/// <param name="quoted">Whether the attribute name should be quoted in output.</param>
-		/// <param name="supportsParams">Whether this attribute supports parameters.</param>
-		/// <param name="optionalParams">Whether parameters are optional for this attribute.</param>
-		/// <param name="hasValueAssignment">Whether this attribute has a value assignment.</param>
-		/// <exception cref="InvalidOperationException">Thrown when both parameters and value assignment are specified.</exception>
-		protected LlvmIrFunctionAttribute (string name, bool quoted, bool supportsParams, bool optionalParams, bool hasValueAssignment)
-		{
-			Name = EnsureNonEmptyParameter (nameof (name), name);
-
-			if (supportsParams && hasValueAssignment) {
-				throw new InvalidOperationException ($"Function attribute '{name}' cannot have both parameters and an assigned value");
-			}
-
-			ParamsAreOptional = optionalParams;
-			SupportsParams = supportsParams;
-			HasValueAsignment = hasValueAssignment;
-			Quoted = quoted;
-		}
-
-		/// <summary>
-		/// Renders this function attribute to its string representation.
-		/// </summary>
-		/// <returns>The string representation of the function attribute.</returns>
-		public string Render ()
-		{
-			var sb = new StringBuilder ();
-
-			if (Quoted) {
-				sb.Append ('"');
-			}
-
-			sb.Append (Name);
-
-			if (Quoted) {
-				sb.Append ('"');
-			}
-
-			if (SupportsParams) {
-				if (!ParamsAreOptional || HasOptionalParams ()) {
-					sb.Append ('(');
-					RenderParams (sb);
-					sb.Append (')');
-				}
-			} else if (HasValueAsignment) {
-				sb.Append ('=');
-				if (Quoted) {
-					sb.Append ('"');
-				}
-
-				var value = new StringBuilder ();
-				RenderAssignedValue (value);
-
-				// LLVM IR escapes characters as \xx where xx is hexadecimal ASCII code
-				value.Replace ("\"", "\\22");
-				sb.Append (value);
-
-				if (Quoted) {
-					sb.Append ('"');
-				}
-
-			}
-
-			return sb.ToString ();
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, renders the parameters for this function attribute.
-		/// </summary>
-		/// <param name="sb">The string builder to render parameters to.</param>
-		protected virtual void RenderParams (StringBuilder sb)
-		{}
-
-		/// <summary>
-		/// When overridden in a derived class, renders the assigned value for this function attribute.
-		/// </summary>
-		/// <param name="sb">The string builder to render the assigned value to.</param>
-		protected virtual void RenderAssignedValue (StringBuilder sb)
-		{}
-
-		/// <summary>
-		/// When overridden in a derived class, determines whether this attribute has optional parameters.
-		/// </summary>
-		/// <returns>true if the attribute has optional parameters; otherwise, false.</returns>
-		protected virtual bool HasOptionalParams ()
-		{
-			return false;
-		}
-
-		/// <summary>
-		/// Ensures that a parameter value is not null or empty.
-		/// </summary>
-		/// <param name="name">The name of the parameter.</param>
-		/// <param name="value">The value of the parameter.</param>
-		/// <returns>The validated parameter value.</returns>
-		/// <exception cref="ArgumentException">Thrown when the parameter name is null or empty.</exception>
-		protected string EnsureNonEmptyParameter (string name, string value)
-		{
-			if (String.IsNullOrEmpty (name)) {
-				throw new ArgumentException ("must not be null or empty", name);
-			}
-
-			return value;
-		}
-
-		public int CompareTo (object obj)
-		{
-			var attr = obj as LlvmIrFunctionAttribute;
-			if (obj == null) {
-				return 1;
-			}
-
-			return CompareTo (attr);
-		}
-
-		public int CompareTo (LlvmIrFunctionAttribute? other)
-		{
-			return Name.CompareTo (other?.Name);
-		}
-
-		public override int GetHashCode()
-		{
-			int hc = 0;
-			if (Name != null) {
-				hc ^= Name.GetHashCode ();
-			}
-
-			return
-				hc ^
-				Quoted.GetHashCode () ^
-				SupportsParams.GetHashCode () ^
-				ParamsAreOptional.GetHashCode () ^
-				HasValueAsignment.GetHashCode ();
-		}
-
-		public override bool Equals (object obj)
-		{
-			var attr = obj as LlvmIrFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return Equals (attr);
-		}
-
-		public virtual bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (other == null) {
-				return false;
-			}
-
-			if (!MonoAndroidHelper.StringEquals (Name, other.Name)) {
-				return false;
-			}
-
-			return
-				Quoted == other.Quoted &&
-				SupportsParams == other.SupportsParams &&
-				ParamsAreOptional == other.ParamsAreOptional &&
-				HasValueAsignment == other.HasValueAsignment;
-		}
-
-		public static bool operator > (LlvmIrFunctionAttribute a, LlvmIrFunctionAttribute b)
-		{
-			return a.CompareTo (b) > 0;
-		}
-
-		public static bool operator < (LlvmIrFunctionAttribute a, LlvmIrFunctionAttribute b)
-		{
-			return a.CompareTo (b) < 0;
-		}
-
-		public static bool operator >= (LlvmIrFunctionAttribute a, LlvmIrFunctionAttribute b)
-		{
-			return a.CompareTo (b) >= 0;
-		}
-
-		public static bool operator <= (LlvmIrFunctionAttribute a, LlvmIrFunctionAttribute b)
-		{
-			return a.CompareTo (b) <= 0;
-		}
-	}
-
-	abstract class LlvmIrFlagFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		protected LlvmIrFlagFunctionAttribute (string name, bool quoted = false)
-			: base (name, quoted, supportsParams: false, optionalParams: false, hasValueAssignment: false)
-		{}
-	}
-
-	class AlignstackFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		uint alignment;
-
-		public AlignstackFunctionAttribute (uint powerOfTwoAlignment)
-			: base ("alignstack", quoted: false, supportsParams: true, optionalParams: false, hasValueAssignment: false)
-		{
-			if ((powerOfTwoAlignment % 2) != 0) {
-				throw new ArgumentException ("must be power of two", nameof (powerOfTwoAlignment));
-			}
-
-			alignment = powerOfTwoAlignment;
-		}
-
-		protected override void RenderParams (StringBuilder sb)
-		{
-			sb.Append (alignment.ToString (CultureInfo.InvariantCulture));
-		}
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as AlignstackFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return alignment == attr.alignment;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ alignment.GetHashCode ();
-		}
-	}
-
-	class AllocFamilyFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		string family;
-
-		public AllocFamilyFunctionAttribute (string familyName)
-			: base ("alloc-family", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			family = EnsureNonEmptyParameter (nameof (familyName), familyName);
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb)
-		{
-			sb.Append (family);
-		}
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as AllocFamilyFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return MonoAndroidHelper.StringEquals (family, attr.family);
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ (family?.GetHashCode () ?? 0);
-		}
-	}
-
-	class AllockindFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		string kind;
-
-		public AllockindFunctionAttribute (string allocKind)
-			: base ("allockind", quoted: false, supportsParams: true, optionalParams: false, hasValueAssignment: false)
-		{
-			kind = EnsureNonEmptyParameter (nameof (allocKind), allocKind);
-		}
-
-		protected override void RenderParams (StringBuilder sb)
-		{
-			sb.Append ('"');
-			sb.Append (kind);
-			sb.Append ('"');
-		}
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as AllockindFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return MonoAndroidHelper.StringEquals (kind, attr.kind);
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ (kind?.GetHashCode () ?? 0);
-		}
-	}
-
-	class AllocsizeFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		uint elementSize;
-		uint? numberOfElements;
-
-		public AllocsizeFunctionAttribute (uint elementSize, uint? numberOfElements = null)
-			: base ("allocsize", quoted: false, supportsParams: true, optionalParams: false, hasValueAssignment: false)
-		{
-			this.elementSize = elementSize;
-			this.numberOfElements = numberOfElements;
-		}
-
-		protected override void RenderParams (StringBuilder sb)
-		{
-			sb.Append (elementSize.ToString (CultureInfo.InvariantCulture));
-			if (!numberOfElements.HasValue) {
-				return;
-			}
-
-			sb.Append (", ");
-			sb.Append (numberOfElements.Value.ToString (CultureInfo.InvariantCulture));
-		}
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as AllocsizeFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return elementSize == attr.elementSize && numberOfElements == attr.numberOfElements;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ elementSize.GetHashCode () ^ (numberOfElements?.GetHashCode () ?? 0);
-		}
-	}
-
-	class AlwaysinlineFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public AlwaysinlineFunctionAttribute ()
-			: base ("alwaysinline")
-		{}
-	}
-
-	class ArgmemonlyFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ArgmemonlyFunctionAttribute ()
-			: base ("argmemonly")
-		{}
-	}
-
-	class BuiltinFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public BuiltinFunctionAttribute ()
-			: base ("builtin")
-		{}
-	}
-
-	class ColdFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ColdFunctionAttribute ()
-			: base ("cold")
-		{}
-	}
-
-	class ConvergentFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ConvergentFunctionAttribute ()
-			: base ("convergent")
-		{}
-	}
-
-	class DisableSanitizerInstrumentationFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public DisableSanitizerInstrumentationFunctionAttribute ()
-			: base ("disable_sanitizer_instrumentation")
-		{}
-	}
-
-	class DontcallErrorFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public DontcallErrorFunctionAttribute ()
-			: base ("dontcall-error", quoted: true)
-		{}
-	}
-
-	class DontcallWarnFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public DontcallWarnFunctionAttribute ()
-			: base ("dontcall-warn", quoted: true)
-		{}
-	}
-
-	class FramePointerFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		string fpMode;
-
-		public FramePointerFunctionAttribute (string fpMode = "none")
-			: base ("frame-pointer", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			switch (fpMode) {
-				case "none":
-				case "non-leaf":
-				case "all":
-					this.fpMode = fpMode;
-					break;
-
-				default:
-					throw new ArgumentException ($"unsupported mode value '{fpMode}'", nameof (fpMode));
-			}
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (fpMode);
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as FramePointerFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return MonoAndroidHelper.StringEquals (fpMode, attr.fpMode);
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ (fpMode?.GetHashCode () ?? 0);
-		}
-	}
-
-	class HotFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public HotFunctionAttribute ()
-			: base ("hot")
-		{}
-	}
-
-	class InaccessiblememonlyFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public InaccessiblememonlyFunctionAttribute ()
-			: base ("inaccessiblememonly")
-		{}
-	}
-
-	class InaccessiblememOrArgmemonlyFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public InaccessiblememOrArgmemonlyFunctionAttribute ()
-			: base ("inaccessiblemem_or_argmemonly")
-		{}
-	}
-
-	class InlinehintFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public InlinehintFunctionAttribute ()
-			: base ("inlinehint")
-		{}
-	}
-
-	class JumptableFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public JumptableFunctionAttribute ()
-			: base ("jumptable")
-		{}
-	}
-
-	enum MemoryAttributeAccessKind
-	{
-		None,
-		Read,
-		Write,
-		ReadWrite,
-	}
-
-	class MemoryFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		public MemoryAttributeAccessKind? Default         { get; set; }
-		public MemoryAttributeAccessKind? Argmem          { get; set; }
-		public MemoryAttributeAccessKind? InaccessibleMem { get; set; }
-
-		public MemoryFunctionAttribute ()
-			: base ("memory", quoted: false, supportsParams: true, optionalParams: true, hasValueAssignment: false)
-		{}
-
-		protected override bool HasOptionalParams ()
-		{
-			// All of them are optional, but at least one of them must be specified
-			bool ret = Default.HasValue || Argmem.HasValue || InaccessibleMem.HasValue;
-			if (!ret) {
-				throw new InvalidOperationException ("Internal error: at least one access kind must be specified");
-			}
-
-			return ret;
-		}
-
-		protected override void RenderParams (StringBuilder sb)
-		{
-			bool haveSomething = false;
-
-			if (Default.HasValue) {
-				AppendParam (GetAccessKindString (Default.Value));
-			}
-
-			if (Argmem.HasValue) {
-				AppendParam ($"argmem: {GetAccessKindString (Argmem.Value)}");
-			}
-
-			if (InaccessibleMem.HasValue) {
-				AppendParam ($"inaccessiblemem: {GetAccessKindString (InaccessibleMem.Value)}");
-			}
-
-			void AppendParam (string text)
-			{
-				if (haveSomething) {
-					sb.Append (", ");
-				}
-				sb.Append (text);
-				haveSomething = true;
-			}
-		}
-
-		string GetAccessKindString (MemoryAttributeAccessKind kind)
-		{
-			return kind switch {
-				MemoryAttributeAccessKind.None      => "none",
-				MemoryAttributeAccessKind.Read      => "read",
-				MemoryAttributeAccessKind.Write     => "write",
-				MemoryAttributeAccessKind.ReadWrite => "readwrite",
-				_ => throw new InvalidOperationException ($"Internal error: unsupported access kind {kind}")
-			};
-		}
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as MemoryFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return Default == attr.Default && Argmem == attr.Argmem && InaccessibleMem == attr.InaccessibleMem;
-		}
-	}
-
-	class MinsizeFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public MinsizeFunctionAttribute ()
-			: base ("minsize")
-		{}
-	}
-
-	class NakedFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NakedFunctionAttribute ()
-			: base ("naked")
-		{}
-	}
-
-	class NoInlineLineTablesFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoInlineLineTablesFunctionAttribute ()
-			: base ("no-inline-line-tables", quoted: true)
-		{}
-	}
-
-	class NoJumpTablesFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoJumpTablesFunctionAttribute ()
-			: base ("no-jump-tables")
-		{}
-	}
-
-	class NobuiltinFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NobuiltinFunctionAttribute ()
-			: base ("nobuiltin")
-		{}
-	}
-
-	class NocallbackFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NocallbackFunctionAttribute ()
-			: base ("nocallback")
-		{}
-	}
-
-	class NoduplicateFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoduplicateFunctionAttribute ()
-			: base ("noduplicate")
-		{}
-	}
-
-	class NofreeFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NofreeFunctionAttribute ()
-			: base ("nofree")
-		{}
-	}
-
-	class NoimplicitfloatFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoimplicitfloatFunctionAttribute ()
-			: base ("noimplicitfloat")
-		{}
-	}
-
-	class NoinlineFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoinlineFunctionAttribute ()
-			: base ("noinline")
-		{}
-	}
-
-	class NomergeFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NomergeFunctionAttribute ()
-			: base ("nomerge")
-		{}
-	}
-
-	class NonlazybindFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NonlazybindFunctionAttribute ()
-			: base ("nonlazybind")
-		{}
-	}
-
-	class NoprofileFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoprofileFunctionAttribute ()
-			: base ("noprofile")
-		{}
-	}
-
-	class NoredzoneFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoredzoneFunctionAttribute ()
-			: base ("noredzone")
-		{}
-	}
-
-	class IndirectTlsSegRefsFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public IndirectTlsSegRefsFunctionAttribute ()
-			: base ("indirect-tls-seg-refs")
-		{}
-	}
-
-	class NoreturnFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoreturnFunctionAttribute ()
-			: base ("noreturn")
-		{}
-	}
-
-	class NorecurseFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NorecurseFunctionAttribute ()
-			: base ("norecurse")
-		{}
-	}
-
-	class WillreturnFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public WillreturnFunctionAttribute ()
-			: base ("willreturn")
-		{}
-	}
-
-	class NosyncFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NosyncFunctionAttribute ()
-			: base ("nosync")
-		{}
-	}
-
-	class NounwindFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NounwindFunctionAttribute ()
-			: base ("nounwind")
-		{}
-	}
-
-	class NosanitizeBoundsFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NosanitizeBoundsFunctionAttribute ()
-			: base ("nosanitize_bounds")
-		{}
-	}
-
-	class NosanitizeCoverageFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NosanitizeCoverageFunctionAttribute ()
-			: base ("nosanitize_coverage")
-		{}
-	}
-
-	class NullPointerIsValidFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NullPointerIsValidFunctionAttribute ()
-			: base ("null_pointer_is_valid")
-		{}
-	}
-
-	class OptforfuzzingFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public OptforfuzzingFunctionAttribute ()
-			: base ("optforfuzzing")
-		{}
-	}
-
-	class OptnoneFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public OptnoneFunctionAttribute ()
-			: base ("optnone")
-		{}
-	}
-
-	class OptsizeFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public OptsizeFunctionAttribute ()
-			: base ("optsize")
-		{}
-	}
-
-	class PatchableFunctionFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public PatchableFunctionFunctionAttribute ()
-			: base ("patchable-function", quoted: true)
-		{}
-	}
-
-	class ProbeStackFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ProbeStackFunctionAttribute ()
-			: base ("probe-stack")
-		{}
-	}
-
-	class ReadnoneFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ReadnoneFunctionAttribute ()
-			: base ("readnone")
-		{}
-	}
-
-	class ReadonlyFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ReadonlyFunctionAttribute ()
-			: base ("readonly")
-		{}
-	}
-
-	class StackProbeSizeFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public StackProbeSizeFunctionAttribute ()
-			: base ("stack-probe-size", quoted: true)
-		{}
-	}
-
-	class NoStackArgProbeFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NoStackArgProbeFunctionAttribute ()
-			: base ("no-stack-arg-probe")
-		{}
-	}
-
-	class WriteonlyFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public WriteonlyFunctionAttribute ()
-			: base ("writeonly")
-		{}
-	}
-
-	class ReturnsTwiceFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ReturnsTwiceFunctionAttribute ()
-			: base ("returns_twice")
-		{}
-	}
-
-	class SafestackFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SafestackFunctionAttribute ()
-			: base ("safestack")
-		{}
-	}
-
-	class SanitizeAddressFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SanitizeAddressFunctionAttribute ()
-			: base ("sanitize_address")
-		{}
-	}
-
-	class SanitizeMemoryFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SanitizeMemoryFunctionAttribute ()
-			: base ("sanitize_memory")
-		{}
-	}
-
-	class SanitizeThreadFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SanitizeThreadFunctionAttribute ()
-			: base ("sanitize_thread")
-		{}
-	}
-
-	class SanitizeHwaddressFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SanitizeHwaddressFunctionAttribute ()
-			: base ("sanitize_hwaddress")
-		{}
-	}
-
-	class SanitizeMemtagFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SanitizeMemtagFunctionAttribute ()
-			: base ("sanitize_memtag")
-		{}
-	}
-
-	class SpeculativeLoadHardeningFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SpeculativeLoadHardeningFunctionAttribute ()
-			: base ("speculative_load_hardening")
-		{}
-	}
-
-	class SpeculatableFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SpeculatableFunctionAttribute ()
-			: base ("speculatable")
-		{}
-	}
-
-	class SspFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SspFunctionAttribute ()
-			: base ("ssp")
-		{}
-	}
-
-	class SspstrongFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SspstrongFunctionAttribute ()
-			: base ("sspstrong")
-		{}
-	}
-
-	class SspreqFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public SspreqFunctionAttribute ()
-			: base ("sspreq")
-		{}
-	}
-
-	class StrictfpFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public StrictfpFunctionAttribute ()
-			: base ("strictfp")
-		{}
-	}
-
-	class DenormalFpMathFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public DenormalFpMathFunctionAttribute ()
-			: base ("denormal-fp-math", quoted: true)
-		{}
-	}
-
-	class DenormalFpMathF32FunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public DenormalFpMathF32FunctionAttribute ()
-			: base ("denormal-fp-math-f32", quoted: true)
-		{}
-	}
-
-	class ThunkFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ThunkFunctionAttribute ()
-			: base ("thunk", quoted: true)
-		{}
-	}
-
-	class TlsLoadHoistFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public TlsLoadHoistFunctionAttribute ()
-			: base ("tls-load-hoist")
-		{}
-	}
-
-	class UwtableFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		bool? isSync;
-
-		public UwtableFunctionAttribute (bool? sync = null)
-			: base ("uwtable", quoted: false, supportsParams: true, optionalParams: true, hasValueAssignment: false)
-		{
-			isSync = sync;
-		}
-
-		protected override bool HasOptionalParams () => isSync.HasValue;
-
-		protected override void RenderParams (StringBuilder sb)
-		{
-			if (!isSync.HasValue) {
-				throw new InvalidOperationException ("Unable to render parameters, none given");
-			}
-
-			sb.Append (isSync.Value ? "sync" : "async");
-		}
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as UwtableFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return isSync == attr.isSync;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ (isSync?.GetHashCode () ?? 0);
-		}
-	}
-
-	class NocfCheckFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public NocfCheckFunctionAttribute ()
-			: base ("nocf_check")
-		{}
-	}
-
-	class ShadowcallstackFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public ShadowcallstackFunctionAttribute ()
-			: base ("shadowcallstack")
-		{}
-	}
-
-	class MustprogressFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public MustprogressFunctionAttribute ()
-			: base ("mustprogress")
-		{}
-	}
-
-	class WarnStackSizeFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		uint threshold;
-
-		public WarnStackSizeFunctionAttribute (uint threshold)
-			: base ("warn-stack-size", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			this.threshold = threshold;
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (threshold);
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as WarnStackSizeFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return threshold == attr.threshold;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ threshold.GetHashCode ();
-		}
-	}
-
-	class VscaleRangeFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		uint min;
-		uint? max;
-
-		public VscaleRangeFunctionAttribute (uint min, uint? max = null)
-			: base ("vscale_range", quoted: false, supportsParams: true, optionalParams: false, hasValueAssignment: false)
-		{
-			this.min = min;
-			this.max = max;
-		}
-
-		protected override void RenderParams (StringBuilder sb)
-		{
-			sb.Append (min.ToString (CultureInfo.InvariantCulture));
-			if (!max.HasValue) {
-				return;
-			}
-
-			sb.Append (", ");
-			sb.Append (max.Value.ToString (CultureInfo.InvariantCulture));
-		}
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as VscaleRangeFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return min == attr.min && max == attr.max;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ min.GetHashCode () ^ (max?.GetHashCode () ?? 0);
-		}
-	}
-
-	class MinLegalVectorWidthFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		uint size;
-
-		public MinLegalVectorWidthFunctionAttribute (uint size)
-			: base ("min-legal-vector-width", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			this.size = size;
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (size.ToString (CultureInfo.InvariantCulture));
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as MinLegalVectorWidthFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return size == attr.size;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ size.GetHashCode ();
-		}
-	}
-
-	class StackProtectorBufferSizeFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		uint size;
-
-		public StackProtectorBufferSizeFunctionAttribute (uint size)
-			: base ("stack-protector-buffer-size", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			this.size = size;
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (size.ToString (CultureInfo.InvariantCulture));
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as StackProtectorBufferSizeFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return size == attr.size;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ size.GetHashCode ();
-		}
-	}
-
-	class TargetCpuFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		string cpu;
-
-		public TargetCpuFunctionAttribute (string cpu)
-			: base ("target-cpu", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			this.cpu = EnsureNonEmptyParameter (nameof (cpu), cpu);
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (cpu);
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as TargetCpuFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return MonoAndroidHelper.StringEquals (cpu, attr.cpu);
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ (cpu?.GetHashCode () ?? 0);
-		}
-	}
-
-	class TuneCpuFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		string cpu;
-
-		public TuneCpuFunctionAttribute (string cpu)
-			: base ("tune-cpu", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			this.cpu = EnsureNonEmptyParameter (nameof (cpu), cpu);
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (cpu);
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as TuneCpuFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return MonoAndroidHelper.StringEquals (cpu, attr.cpu);
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ (cpu?.GetHashCode () ?? 0);
-		}
-	}
-
-	class TargetFeaturesFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		string features;
-
-		public TargetFeaturesFunctionAttribute (string features)
-			: base ("target-features", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			this.features = EnsureNonEmptyParameter (nameof (features), features);
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (features);
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as TargetFeaturesFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return MonoAndroidHelper.StringEquals (features, attr.features);
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ (features?.GetHashCode () ?? 0);
-		}
-	}
-
-	class NoTrappingMathFunctionAttribute : LlvmIrFunctionAttribute
-	{
-		bool yesno;
-
-		public NoTrappingMathFunctionAttribute (bool yesno)
-			: base ("no-trapping-math", quoted: true, supportsParams: false, optionalParams: false, hasValueAssignment: true)
-		{
-			this.yesno = yesno;
-		}
-
-		protected override void RenderAssignedValue (StringBuilder sb) => sb.Append (yesno.ToString ().ToLowerInvariant ());
-
-		public override bool Equals (LlvmIrFunctionAttribute other)
-		{
-			if (!base.Equals (other)) {
-				return false;
-			}
-
-			var attr = other as NoTrappingMathFunctionAttribute;
-			if (attr == null) {
-				return false;
-			}
-
-			return yesno == attr.yesno;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () ^ yesno.GetHashCode ();
-		}
-	}
-
-	class StackrealignFunctionAttribute : LlvmIrFlagFunctionAttribute
-	{
-		public StackrealignFunctionAttribute ()
-			: base ("stackrealign", quoted: true)
-		{}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrAddressSignificance.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrAddressSignificance.cs
deleted file mode 100644
index 7616a39084f..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrAddressSignificance.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-#nullable enable
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Address significance, see https://llvm.org/docs/LangRef.html#global-variables
-	/// </summary>
-	[Flags]
-	enum LlvmIrAddressSignificance
-	{
-		/// <summary>
-		/// Default address significance.
-		/// </summary>
-		Default      = 1 << 0,
-		/// <summary>
-		/// Unnamed address significance - the address of the global is not significant.
-		/// </summary>
-		Unnamed      = 1 << 1,
-		/// <summary>
-		/// Local unnamed address significance - the address is not significant within the module.
-		/// </summary>
-		LocalUnnamed = 1 << 2,
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrArraySection.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrArraySection.cs
deleted file mode 100644
index 7ddce37a369..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrArraySection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Base class for array sections used in sectioned arrays. Provides common functionality
-/// for organizing array data into named sections with optional headers.
-/// </summary>
-abstract class LlvmIrArraySectionBase
-{
-	/// <summary>
-	/// Gets the type of data stored in this array section.
-	/// </summary>
-	public Type DataType     { get; }
-	/// <summary>
-	/// Gets the list of data objects stored in this section.
-	/// </summary>
-	public List<object> Data { get; } = [];
-	/// <summary>
-	/// Gets the optional header comment for this section.
-	/// </summary>
-	public string? Header    { get; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrArraySectionBase"/> class.
-	/// </summary>
-	/// <param name="type">The type of data that will be stored in this section.</param>
-	/// <param name="header">Optional header comment for the section.</param>
-	protected LlvmIrArraySectionBase (Type type, string? header = null)
-	{
-		DataType = type;
-		Header = header;
-	}
-
-	/// <summary>
-	/// Adds a data object to this section.
-	/// </summary>
-	/// <param name="data">The data object to add to the section.</param>
-	protected void Add (object data) => Data.Add (data);
-}
-
-/// <summary>
-/// Represents a typed array section that stores elements of type <typeparamref name="T"/>.
-/// </summary>
-/// <typeparam name="T">The type of elements stored in this array section.</typeparam>
-class LlvmIrArraySection<T> : LlvmIrArraySectionBase
-{
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrArraySection{T}"/> class.
-	/// </summary>
-	/// <param name="header">Optional header comment for the section.</param>
-	public LlvmIrArraySection (string? header = null)
-		: base (typeof(T), header)
-	{}
-
-	/// <summary>
-	/// Adds a typed data element to this section.
-	/// </summary>
-	/// <param name="data">The data element to add to the section.</param>
-	public void Add (T data) => base.Add (data!);
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrBufferManager.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrBufferManager.cs
deleted file mode 100644
index 221f763b5dd..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrBufferManager.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-partial class LlvmIrModule
-{
-	/// <summary>
-	/// Manages allocation and naming of buffer variables for structure members that require
-	/// preallocated buffer space. This class ensures unique buffer names and tracks
-	/// buffer allocations across structure instances.
-	/// </summary>
-	sealed class LlvmIrBufferManager
-	{
-		Dictionary<string, ulong> counters;
-		Dictionary<object, Dictionary<string, string>> bufferVariableNames;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="LlvmIrBufferManager"/> class.
-		/// </summary>
-		public LlvmIrBufferManager ()
-		{
-			counters = new Dictionary<string, ulong> (StringComparer.Ordinal);
-			bufferVariableNames = new Dictionary<object, Dictionary<string, string>> ();
-		}
-
-		/// <summary>
-		/// Allocates a new buffer with a unique name for the specified structure member.
-		/// </summary>
-		/// <param name="structure">The structure instance that contains the member.</param>
-		/// <param name="smi">The structure member information that requires a buffer.</param>
-		/// <param name="size">The size of the buffer to allocate.</param>
-		/// <returns>The unique name assigned to the allocated buffer variable.</returns>
-		public string Allocate (StructureInstance structure, StructureMemberInfo smi, ulong size)
-		{
-			string baseName = $"_{structure.Info.Name}_{smi.Info.Name}";
-
-			if (!counters.TryGetValue (baseName, out ulong count)) {
-				count = 0;
-				counters.Add (baseName, count);
-			} else {
-				count++;
-				counters[baseName] = count;
-			}
-
-			return Register (structure, smi, $"{baseName}_{count:x}_{structure.IndexInArray:x}");
-		}
-
-		/// <summary>
-		/// Gets the buffer variable name for the specified structure member, if one has been allocated.
-		/// </summary>
-		/// <param name="structure">The structure instance containing the member.</param>
-		/// <param name="smi">The structure member information to look up.</param>
-		/// <returns>The buffer variable name if found; otherwise, <c>null</c>.</returns>
-		public string? GetBufferVariableName (StructureInstance structure, StructureMemberInfo smi)
-		{
-			if (bufferVariableNames == null || bufferVariableNames.Count == 0 || structure.Obj == null) {
-				return null;
-			}
-
-			if (!bufferVariableNames.TryGetValue (structure.Obj, out Dictionary<string, string> members)) {
-				return null;
-			}
-
-			if (!members.TryGetValue (MakeUniqueMemberId (structure, smi), out string bufferVariableName)) {
-				return null;
-			}
-
-			return bufferVariableName;
-		}
-
-		/// <summary>
-		/// Registers a buffer variable name for the specified structure member.
-		/// </summary>
-		/// <param name="structure">The structure instance containing the member.</param>
-		/// <param name="smi">The structure member information.</param>
-		/// <param name="bufferVariableName">The buffer variable name to register.</param>
-		/// <returns>The registered buffer variable name.</returns>
-		string Register (StructureInstance structure, StructureMemberInfo smi, string bufferVariableName)
-		{
-			if (bufferVariableNames == null) {
-				bufferVariableNames = new Dictionary<object, Dictionary<string, string>> ();
-			}
-
-			if (structure.Obj == null) {
-				throw new ArgumentException ("Structure instance object cannot be null", nameof (structure));
-			}
-
-			if (!bufferVariableNames.TryGetValue (structure.Obj, out Dictionary<string, string> members)) {
-				members = new Dictionary<string, string> (StringComparer.Ordinal);
-				bufferVariableNames.Add (structure.Obj, members);
-			}
-
-			members.Add (MakeUniqueMemberId (structure, smi), bufferVariableName);
-			return bufferVariableName;
-		}
-
-		/// <summary>
-		/// Creates a unique member identifier combining the member name and structure array index.
-		/// </summary>
-		/// <param name="structure">The structure instance.</param>
-		/// <param name="smi">The structure member information.</param>
-		/// <returns>A unique identifier for the member within the structure array.</returns>
-		string MakeUniqueMemberId (StructureInstance structure, StructureMemberInfo smi) => $"{smi.Info.Name}_{structure.IndexInArray}";
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallMarkers.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallMarkers.cs
deleted file mode 100644
index a9c2fb2bb27..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallMarkers.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Represents call markers for LLVM IR call instructions that control tail call optimization.
-	/// </summary>
-	enum LlvmIrCallMarker
-	{
-		/// <summary>
-		/// No call marker specified.
-		/// </summary>
-		None,
-		/// <summary>
-		/// Tail call marker - suggests tail call optimization.
-		/// </summary>
-		Tail,
-		/// <summary>
-		/// Must tail call marker - requires tail call optimization.
-		/// </summary>
-		MustTail,
-		/// <summary>
-		/// No tail call marker - prevents tail call optimization.
-		/// </summary>
-		NoTail,
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallingConvention.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallingConvention.cs
deleted file mode 100644
index c9abcc34a0b..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrCallingConvention.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Function calling convention, see https://llvm.org/docs/LangRef.html#callingconv for more detailed docs.
-/// Not all conventions are included in this enumeration, only those we may potentially need.
-/// </summary>
-enum LlvmIrCallingConvention
-{
-	/// <summary>
-	/// Outputs no keyword, making function use whatever is the compiler's default calling convention.
-	/// </summary>
-	Default,
-
-	/// <summary>
-	/// The C calling convention (`ccc`)
-	/// </summary>
-	Ccc,
-
-	/// <summary>
-	/// The fast calling convention (`fastcc`). This calling convention attempts to make calls as fast
-	/// as possible (e.g. by passing things in registers).
-	/// </summary>
-	Fastcc,
-
-	/// <summary>
-	/// Tail callable calling convention (`tailcc`). This calling convention ensures that calls in tail
-	/// position will always be tail call optimized. This calling convention is equivalent to fastcc,
-	/// except for an additional guarantee that tail calls will be produced whenever possible.
-	/// </summary>
-	Tailcc,
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs
deleted file mode 100644
index bcfecf35df6..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.IO;
-
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Abstract base class for composing LLVM IR modules. Provides a framework for constructing and generating LLVM IR code.
-	/// </summary>
-	abstract class LlvmIrComposer
-	{
-		bool constructed;
-		readonly LlvmIrTypeCache cache = new();
-
-		protected readonly TaskLoggingHelper Log;
-
-		/// <summary>
-		/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to
-		/// <c>false</c>; see <see cref="LlvmIrGenerator.EmitComments" />.
-		/// </summary>
-		public bool EmitComments { get; set; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="LlvmIrComposer"/> class.
-		/// </summary>
-		/// <param name="log">The task logging helper for logging messages.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="log"/> is null.</exception>
-		protected LlvmIrComposer (TaskLoggingHelper log)
-		{
-			this.Log = log ?? throw new ArgumentNullException (nameof (log));
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, constructs the LLVM IR module by adding the necessary structures, functions, and variables.
-		/// </summary>
-		/// <param name="module">The LLVM IR module to construct.</param>
-		protected abstract void Construct (LlvmIrModule module);
-
-		/// <summary>
-		/// Constructs the LLVM IR module by calling the derived class implementation and performing necessary finalization.
-		/// </summary>
-		/// <returns>The constructed LLVM IR module.</returns>
-		public LlvmIrModule Construct ()
-		{
-			var module = new LlvmIrModule (cache, Log);
-			Construct (module);
-			module.AfterConstruction ();
-			constructed = true;
-
-			return module;
-		}
-
-		/// <summary>
-		/// Generates LLVM IR code for the specified target architecture and writes it to the output stream.
-		/// </summary>
-		/// <param name="module">The LLVM IR module to generate code from.</param>
-		/// <param name="arch">The target Android architecture.</param>
-		/// <param name="output">The stream writer to write the generated LLVM IR code to.</param>
-		/// <param name="fileName">The name of the file being generated.</param>
-		/// <exception cref="InvalidOperationException">Thrown when the module has not been constructed yet.</exception>
-		public void Generate (LlvmIrModule module, AndroidTargetArch arch, StreamWriter output, string fileName)
-		{
-			if (!constructed) {
-				throw new InvalidOperationException ($"Internal error: module not constructed yet. Was Construct () called?");
-			}
-
-			LlvmIrGenerator generator = LlvmIrGenerator.Create (arch, fileName);
-			generator.EmitComments = EmitComments;
-			generator.Generate (output, module);
-			output.Flush ();
-
-			CleanupAfterGeneration (arch);
-		}
-
-		/// <summary>
-		/// Performs any necessary cleanup after code generation for the specified architecture.
-		/// </summary>
-		/// <param name="arch">The target Android architecture that was used for generation.</param>
-		protected virtual void CleanupAfterGeneration (AndroidTargetArch arch)
-		{}
-
-		/// <summary>
-		/// Ensures that the specified variable is a global variable and returns it as such.
-		/// </summary>
-		/// <param name="variable">The variable to check and cast.</param>
-		/// <returns>The variable cast as a global variable.</returns>
-		/// <exception cref="InvalidOperationException">Thrown when the variable is not a global variable.</exception>
-		protected LlvmIrGlobalVariable EnsureGlobalVariable (LlvmIrVariable variable)
-		{
-			var gv = variable as LlvmIrGlobalVariable;
-			if (gv == null) {
-				throw new InvalidOperationException ("Internal error: global variable expected");
-			}
-
-			return gv;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrDataLayout.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrDataLayout.cs
deleted file mode 100644
index 5f312026256..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrDataLayout.cs
+++ /dev/null
@@ -1,492 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Abstract base class for LLVM IR data layout fields. Data layout fields specify
-/// alignment and size information for various data types in LLVM IR.
-/// See: https://llvm.org/docs/LangRef.html#data-layout
-/// </summary>
-abstract class LlvmIrDataLayoutField
-{
-	/// <summary>
-	/// The separator character used between data layout field components.
-	/// </summary>
-	public const char Separator = ':';
-
-	/// <summary>
-	/// Gets the identifier for this data layout field.
-	/// </summary>
-	public string Id { get; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrDataLayoutField"/> class.
-	/// </summary>
-	/// <param name="id">The identifier for the data layout field.</param>
-	/// <exception cref="ArgumentException">Thrown when id is null or empty.</exception>
-	protected LlvmIrDataLayoutField (string id)
-	{
-		if (String.IsNullOrEmpty (id)) {
-			throw new ArgumentException (nameof (id), "must not be null or empty");
-		}
-
-		Id = id;
-	}
-
-	/// <summary>
-	/// Renders this data layout field to a string builder.
-	/// </summary>
-	/// <param name="sb">The string builder to render to.</param>
-	public virtual void Render (StringBuilder sb)
-	{
-		sb.Append (Id);
-	}
-
-	/// <summary>
-	/// Converts an unsigned integer to its string representation using invariant culture.
-	/// </summary>
-	/// <param name="v">The value to convert.</param>
-	/// <returns>The string representation of the value.</returns>
-	public static string ConvertToString (uint v)
-	{
-		return v.ToString (CultureInfo.InvariantCulture);
-	}
-
-	/// <summary>
-	/// Appends an unsigned integer value to the string builder with optional separator.
-	/// </summary>
-	/// <param name="sb">The string builder to append to.</param>
-	/// <param name="v">The value to append.</param>
-	/// <param name="needSeparator">Whether to prepend the separator character.</param>
-	protected void Append (StringBuilder sb, uint v, bool needSeparator = true)
-	{
-		if (needSeparator) {
-			sb.Append (Separator);
-		}
-
-		sb.Append (ConvertToString (v));
-	}
-
-	/// <summary>
-	/// Appends a nullable unsigned integer value to the string builder with optional separator.
-	/// If the value is null, nothing is appended.
-	/// </summary>
-	/// <param name="sb">The string builder to append to.</param>
-	/// <param name="v">The nullable value to append.</param>
-	/// <param name="needSeparator">Whether to prepend the separator character.</param>
-	protected void Append (StringBuilder sb, uint? v, bool needSeparator = true)
-	{
-		if (!v.HasValue) {
-			return;
-		}
-
-		Append (sb, v.Value, needSeparator);
-	}
-}
-
-/// <summary>
-/// Represents pointer size and alignment information in LLVM IR data layout.
-/// Specifies the size and alignment of pointers for a given address space.
-/// </summary>
-class LlvmIrDataLayoutPointerSize : LlvmIrDataLayoutField
-{
-	/// <summary>
-	/// Gets or sets the address space for this pointer specification. If null, applies to address space 0.
-	/// </summary>
-	public uint? AddressSpace { get; set; }
-	/// <summary>
-	/// Gets the ABI alignment for pointers in bits.
-	/// </summary>
-	public uint Abi           { get; }
-	/// <summary>
-	/// Gets the size of pointers in bits.
-	/// </summary>
-	public uint Size          { get; }
-	/// <summary>
-	/// Gets or sets the preferred alignment for pointers in bits.
-	/// </summary>
-	public uint? Pref         { get; set; }
-	/// <summary>
-	/// Gets or sets the index size for GEP operations in bits.
-	/// </summary>
-	public uint? Idx          { get; set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrDataLayoutPointerSize"/> class.
-	/// </summary>
-	/// <param name="size">The size of pointers in bits.</param>
-	/// <param name="abi">The ABI alignment for pointers in bits.</param>
-	public LlvmIrDataLayoutPointerSize (uint size, uint abi)
-		: base ("p")
-	{
-		Size = size;
-		Abi = abi;
-	}
-
-	/// <summary>
-	/// Renders this pointer specification to the string builder.
-	/// </summary>
-	/// <param name="sb">The string builder to render to.</param>
-	public override void Render (StringBuilder sb)
-	{
-		base.Render (sb);
-
-		if (AddressSpace.HasValue && AddressSpace.Value > 0) {
-			Append (sb, AddressSpace.Value, needSeparator: false);
-		}
-		Append (sb, Size);
-		Append (sb, Abi);
-		Append (sb, Pref);
-		Append (sb, Idx);
-	}
-}
-
-/// <summary>
-/// Abstract base class for LLVM IR data layout type alignment specifications.
-/// Defines common properties for type alignment including size, ABI alignment, and preferred alignment.
-/// </summary>
-abstract class LlvmIrDataLayoutTypeAlignment : LlvmIrDataLayoutField
-{
-	/// <summary>
-	/// Gets the size of the type in bits.
-	/// </summary>
-	public uint Size  { get; }
-	/// <summary>
-	/// Gets the ABI alignment for the type in bits.
-	/// </summary>
-	public uint Abi   { get; }
-	/// <summary>
-	/// Gets or sets the preferred alignment for the type in bits.
-	/// </summary>
-	public uint? Pref { get; set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrDataLayoutTypeAlignment"/> class.
-	/// </summary>
-	/// <param name="id">The identifier for the alignment specification.</param>
-	/// <param name="size">The size of the type in bits.</param>
-	/// <param name="abi">The ABI alignment for the type in bits.</param>
-	protected LlvmIrDataLayoutTypeAlignment (string id, uint size, uint abi)
-		: base (id)
-	{
-		Size = size;
-		Abi = abi;
-	}
-
-	/// <summary>
-	/// Renders this type alignment specification to the string builder.
-	/// </summary>
-	/// <param name="sb">The string builder to render to.</param>
-	public override void Render (StringBuilder sb)
-	{
-		base.Render (sb);
-
-		Append (sb, Size, needSeparator: false);
-		Append (sb, Abi);
-		Append (sb, Pref);
-	}
-}
-
-/// <summary>
-/// Represents integer type alignment specification for LLVM IR data layout.
-/// Specifies alignment requirements for integer types of various sizes.
-/// </summary>
-class LlvmIrDataLayoutIntegerAlignment : LlvmIrDataLayoutTypeAlignment
-{
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrDataLayoutIntegerAlignment"/> class.
-	/// </summary>
-	/// <param name="size">The size of the integer type in bits.</param>
-	/// <param name="abi">The ABI alignment for the integer type in bits.</param>
-	/// <param name="pref">The preferred alignment for the integer type in bits.</param>
-	/// <exception cref="ArgumentOutOfRangeException">Thrown when ABI alignment for i8 is not 8.</exception>
-	public LlvmIrDataLayoutIntegerAlignment (uint size, uint abi, uint? pref = null)
-		: base ("i", size, abi)
-	{
-		if (size == 8 && abi != 8) {
-			throw new ArgumentOutOfRangeException (nameof (abi), "Must equal 8 for i8");
-		}
-
-		Pref = pref;
-	}
-}
-
-/// <summary>
-/// Represents vector type alignment specification for LLVM IR data layout.
-/// Specifies alignment requirements for vector types of various sizes.
-/// </summary>
-class LlvmIrDataLayoutVectorAlignment : LlvmIrDataLayoutTypeAlignment
-{
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrDataLayoutVectorAlignment"/> class.
-	/// </summary>
-	/// <param name="size">The size of the vector type in bits.</param>
-	/// <param name="abi">The ABI alignment for the vector type in bits.</param>
-	/// <param name="pref">The preferred alignment for the vector type in bits.</param>
-	public LlvmIrDataLayoutVectorAlignment (uint size, uint abi, uint? pref = null)
-		: base ("v", size, abi)
-	{
-		Pref = pref;
-	}
-}
-
-/// <summary>
-/// Represents floating-point type alignment specification for LLVM IR data layout.
-/// Specifies alignment requirements for floating-point types of various sizes.
-/// </summary>
-class LlvmIrDataLayoutFloatAlignment : LlvmIrDataLayoutTypeAlignment
-{
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrDataLayoutFloatAlignment"/> class.
-	/// </summary>
-	/// <param name="size">The size of the floating-point type in bits.</param>
-	/// <param name="abi">The ABI alignment for the floating-point type in bits.</param>
-	/// <param name="pref">The preferred alignment for the floating-point type in bits.</param>
-	public LlvmIrDataLayoutFloatAlignment (uint size, uint abi, uint? pref = null)
-		: base ("f", size, abi)
-	{
-		Pref = pref;
-	}
-}
-
-/// <summary>
-/// Represents aggregate object alignment specification for LLVM IR data layout.
-/// Specifies alignment requirements for aggregate objects (structures, arrays, etc.).
-/// </summary>
-class LlvmIrDataLayoutAggregateObjectAlignment : LlvmIrDataLayoutField
-{
-	/// <summary>
-	/// Gets the ABI alignment for aggregate objects in bits.
-	/// </summary>
-	public uint Abi   { get; }
-	/// <summary>
-	/// Gets or sets the preferred alignment for aggregate objects in bits.
-	/// </summary>
-	public uint? Pref { get; set; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrDataLayoutAggregateObjectAlignment"/> class.
-	/// </summary>
-	/// <param name="abi">The ABI alignment for aggregate objects in bits.</param>
-	/// <param name="pref">The preferred alignment for aggregate objects in bits.</param>
-	public LlvmIrDataLayoutAggregateObjectAlignment (uint abi, uint? pref = null)
-		: base ("a")
-	{
-		Abi = abi;
-		Pref = pref;
-	}
-
-	/// <summary>
-	/// Renders this aggregate object alignment specification to the string builder.
-	/// </summary>
-	/// <param name="sb">The string builder to render to.</param>
-	public override void Render (StringBuilder sb)
-	{
-		base.Render (sb);
-
-		Append (sb, Abi);
-		Append (sb, Pref);
-	}
-}
-
-enum LlvmIrDataLayoutFunctionPointerAlignmentType
-{
-	Independent,
-	Multiple,
-}
-
-class LlvmIrDataLayoutFunctionPointerAlignment : LlvmIrDataLayoutField
-{
-	public uint Abi                                          { get; }
-	public LlvmIrDataLayoutFunctionPointerAlignmentType Type { get; }
-
-	public LlvmIrDataLayoutFunctionPointerAlignment (LlvmIrDataLayoutFunctionPointerAlignmentType type, uint abi)
-		: base ("F")
-	{
-		Type = type;
-		Abi = abi;
-	}
-
-	public override void Render (StringBuilder sb)
-	{
-		base.Render (sb);
-
-		char type = Type switch {
-			LlvmIrDataLayoutFunctionPointerAlignmentType.Independent => 'i',
-			LlvmIrDataLayoutFunctionPointerAlignmentType.Multiple => 'n',
-			_ => throw new InvalidOperationException ($"Unsupported function pointer alignment type '{Type}'")
-		};
-		sb.Append (type);
-		Append (sb, Abi, needSeparator: false);
-	}
-}
-
-enum LlvmIrDataLayoutManglingOption
-{
-	ELF,
-	GOFF,
-	MIPS,
-	MachO,
-	WindowsX86COFF,
-	WindowsCOFF,
-	XCOFF
-}
-
-class LlvmIrDataLayoutMangling : LlvmIrDataLayoutField
-{
-	public LlvmIrDataLayoutManglingOption Option { get; }
-
-	public LlvmIrDataLayoutMangling (LlvmIrDataLayoutManglingOption option)
-		: base ("m")
-	{
-		Option = option;
-	}
-
-	public override void Render (StringBuilder sb)
-	{
-		base.Render (sb);
-
-		sb.Append (Separator);
-
-		char opt = Option switch {
-			LlvmIrDataLayoutManglingOption.ELF => 'e',
-			LlvmIrDataLayoutManglingOption.GOFF => 'l',
-			LlvmIrDataLayoutManglingOption.MIPS => 'm',
-			LlvmIrDataLayoutManglingOption.MachO => 'o',
-			LlvmIrDataLayoutManglingOption.WindowsX86COFF => 'x',
-			LlvmIrDataLayoutManglingOption.WindowsCOFF => 'w',
-			LlvmIrDataLayoutManglingOption.XCOFF => 'a',
-			_ => throw new InvalidOperationException ($"Unsupported mangling option '{Option}'")
-		};
-
-		sb.Append (opt);
-	}
-}
-
-// See: https://llvm.org/docs/LangRef.html#data-layout
-class LlvmIrDataLayout
-{
-	bool bigEndian;
-	bool littleEndian = true;
-
-	public bool BigEndian {
-		get => bigEndian;
-		set {
-			bigEndian = value;
-			littleEndian = !bigEndian;
-		}
-	}
-
-	public bool LittleEndian {
-		get => littleEndian;
-		set {
-			littleEndian = value;
-			bigEndian = !littleEndian;
-		}
-	}
-
-	public uint? AllocaAddressSpaceId                                         { get; set; }
-	public uint? GlobalsAddressSpaceId                                        { get; set; }
-	public LlvmIrDataLayoutMangling? Mangling                                 { get; set; }
-	public uint? ProgramAddressSpaceId                                        { get; set; }
-	public uint? StackAlignment                                               { get; set; }
-
-	public LlvmIrDataLayoutAggregateObjectAlignment? AggregateObjectAlignment { get; set; }
-	public List<LlvmIrDataLayoutFloatAlignment>? FloatAlignment               { get; set; }
-	public LlvmIrDataLayoutFunctionPointerAlignment? FunctionPointerAlignment { get; set; }
-	public List<LlvmIrDataLayoutIntegerAlignment>? IntegerAlignment           { get; set; }
-	public List<LlvmIrDataLayoutVectorAlignment>? VectorAlignment             { get; set; }
-	public List<LlvmIrDataLayoutPointerSize>? PointerSize                     { get; set; }
-
-	public List<uint>? NativeIntegerWidths                                    { get; set; }
-	public List<uint>? NonIntegralPointerTypeAddressSpaces                    { get; set; }
-
-	public string Render ()
-	{
-		var sb = new StringBuilder ();
-
-		sb.Append ("target datalayout = \"");
-
-		sb.Append (LittleEndian ? 'e' : 'E');
-
-		if (Mangling != null) {
-			sb.Append ('-');
-			Mangling.Render (sb);
-		}
-
-		AppendFieldList (PointerSize);
-
-		if (FunctionPointerAlignment != null) {
-			sb.Append ('-');
-			FunctionPointerAlignment.Render (sb);
-		}
-
-		AppendFieldList (IntegerAlignment);
-		AppendFieldList (FloatAlignment);
-		AppendFieldList (VectorAlignment);
-
-		Append ('P', ProgramAddressSpaceId);
-		Append ('G', GlobalsAddressSpaceId);
-		Append ('A', AllocaAddressSpaceId);
-
-		if (AggregateObjectAlignment != null) {
-			sb.Append ('-');
-			AggregateObjectAlignment.Render (sb);
-		}
-
-		AppendList ("n", NativeIntegerWidths);
-		AppendList ("ni", NonIntegralPointerTypeAddressSpaces);
-		Append ('S', StackAlignment);
-
-		sb.Append ('"');
-
-		return sb.ToString ();
-
-		void AppendFieldList<T> (List<T>? list) where T: LlvmIrDataLayoutField
-		{
-			if (list == null || list.Count == 0) {
-				return;
-			}
-
-			foreach (LlvmIrDataLayoutField field in list) {
-				sb.Append ('-');
-				field.Render (sb);
-			}
-		}
-
-		void AppendList (string id, List<uint>? list)
-		{
-			if (list == null || list.Count == 0) {
-				return;
-			}
-
-			sb.Append ('-');
-			sb.Append (id);
-
-			bool first = true;
-			foreach (uint v in list) {
-				if (first) {
-					first = false;
-				} else {
-					sb.Append (LlvmIrDataLayoutField.Separator);
-				}
-
-				sb.Append (LlvmIrDataLayoutField.ConvertToString (v));
-			}
-		}
-
-		void Append (char id, uint? v)
-		{
-			if (!v.HasValue) {
-				return;
-			}
-
-			sb.Append ('-');
-			sb.Append (id);
-			sb.Append (LlvmIrDataLayoutField.ConvertToString (v.Value));
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunction.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunction.cs
deleted file mode 100644
index cdeacd342fb..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunction.cs
+++ /dev/null
@@ -1,533 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	interface ILlvmIrSavedFunctionParameterState {}
-
-	class LlvmIrFunctionParameter : LlvmIrLocalVariable
-	{
-		sealed class SavedParameterState : ILlvmIrSavedFunctionParameterState
-		{
-			public readonly LlvmIrFunctionParameter Owner;
-
-			public uint? Align;
-			public bool? AllocPtr;
-			public uint? Dereferenceable;
-			public bool? ImmArg;
-			public bool? NoCapture;
-			public bool? NonNull;
-			public bool? NoUndef;
-			public bool? ReadNone;
-			public bool? SignExt;
-			public bool? ZeroExt;
-			public bool? WriteOnly;
-			public bool? IsCplusPlusReference;
-			public bool IsVarArgs;
-
-			public SavedParameterState (LlvmIrFunctionParameter owner, SavedParameterState? previousState = null)
-			{
-				Owner = owner;
-				if (previousState == null) {
-					return;
-				}
-
-				Align = previousState.Align;
-				AllocPtr = previousState.AllocPtr;
-				Dereferenceable = previousState.Dereferenceable;
-				ImmArg = previousState.ImmArg;
-				NoCapture = previousState.NoCapture;
-				NonNull = previousState.NonNull;
-				ReadNone = previousState.ReadNone;
-				SignExt = previousState.SignExt;
-				ZeroExt = previousState.ZeroExt;
-				WriteOnly = previousState.WriteOnly;
-				IsCplusPlusReference = previousState.IsCplusPlusReference;
-				IsVarArgs = previousState.IsVarArgs;
-			}
-		}
-
-		SavedParameterState state;
-
-		// To save on time, we declare only attributes that are actually used in our generated code.  More will be added, as needed.
-
-		/// <summary>
-		/// <c>align(n)</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1239"/>.
-		/// As a special case for us, a value of <c>0</c> means use the natural target pointer alignment.
-		/// </summary>
-		public uint? Align {
-			get => state.Align;
-			set => state.Align = value;
-		}
-
-		/// <summary>
-		/// <c>allocptr</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1413"/>
-		/// </summary>
-		public bool? AllocPtr {
-			get => state.AllocPtr;
-			set => state.AllocPtr = value;
-		}
-
-		/// <summary>
-		/// <c>dereferenceable(n)</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1324"/>.
-		/// As a special case for us, a value of <c>0</c> means use the natural target pointer alignment.
-		/// </summary>
-		public uint? Dereferenceable {
-			get => state.Dereferenceable;
-			set => state.Dereferenceable = value;
-		}
-
-		/// <summary>
-		/// <c>immarg</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1383"/>
-		/// </summary>
-		public bool? ImmArg {
-			get => state.ImmArg;
-			set => state.ImmArg = value;
-		}
-
-		/// <summary>
-		/// <c>nocapture</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1279"/>
-		/// </summary>
-		public bool? NoCapture {
-			get => state.NoCapture;
-			set => state.NoCapture = value;
-		}
-
-		/// <summary>
-		/// <c>nonnull</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1316"/>
-		/// </summary>
-		public bool? NonNull {
-			get => state.NonNull;
-			set => state.NonNull = value;
-		}
-
-		/// <summary>
-		/// <c>noundef</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1390"/>
-		/// </summary>
-		public bool? NoUndef {
-			get => state.NoUndef;
-			set => state.NoUndef = value;
-		}
-
-		/// <summary>
-		/// <c>readnone</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1420"/>
-		/// </summary>
-		public bool? ReadNone {
-			get => state.ReadNone;
-			set => state.ReadNone = value;
-		}
-
-		/// <summary>
-		/// <c>signext</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1094"/>
-		/// </summary>
-		public bool? SignExt {
-			get => state.SignExt;
-			set => state.SignExt = value;
-		}
-
-		/// <summary>
-		/// <c>zeroext</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1090"/>
-		/// </summary>
-		public bool? ZeroExt {
-			get => state.ZeroExt;
-			set => state.ZeroExt = value;
-		}
-
-		/// <summary>
-		/// <c>writeonly</c> attribute, see <see href="https://github.com/llvm/llvm-project/blob/5729e63ac7b47c6ad40f904fedafad3c07cf71ea/llvm/docs/LangRef.rst#L1436"/>
-		/// </summary>
-		public bool? WriteOnly {
-			get => state.WriteOnly;
-			set => state.WriteOnly = value;
-		}
-		/// <summary>
-		/// This serves a purely documentational purpose, when generating comments about types.  It describes a parameter that is a C++ reference, something we can't
-		/// reflect on the managed side.
-		/// </summary>
-		public bool? IsCplusPlusReference {
-			get => state.IsCplusPlusReference;
-			set => state.IsCplusPlusReference = value;
-		}
-
-		/// <summary>
-		/// Indicates that the argument is a C variable arguments placeholder (`...`)
-		/// </summary>
-		public bool IsVarArgs {
-			get => state.IsVarArgs;
-			set => state.IsVarArgs = value;
-		}
-
-		public LlvmIrFunctionParameter (Type type, string? name = null)
-			: base (type, name)
-		{
-			NameMatters = false;
-			state = new SavedParameterState (this);
-
-			// TODO: check why it doesn't work as expected - can't see the flags set in the output
-			if (type == typeof(sbyte) || type == typeof (short)) {
-				SignExt = true;
-			} else if (type == typeof(byte) || type == typeof (ushort)) {
-				ZeroExt = true;
-			}
-		}
-
-		/// <summary>
-		/// Save (opaque) parameter state.  This is necessary because we generate code from the same model (module) for different
-		/// targets.  At the same time, function, signature and parameter instances are shared between the different code generation
-		/// sessions, so we must sure the state as set by the model is properly preserved. NOTE: it does NOT make the code thread-safe!
-		/// Instances are **still** shared and thus different threads would step on each other's toes should they saved and restored
-		/// state without synchronization.
-		/// </summary>
-		public ILlvmIrSavedFunctionParameterState SaveState ()
-		{
-			SavedParameterState ret = state;
-			state = new SavedParameterState (this, ret);
-			return ret;
-		}
-
-		/// <summary>
-		/// Restore (opaque) state. <see cref="SaveState()"/> for more info
-		/// </summary>
-		public void RestoreState (ILlvmIrSavedFunctionParameterState savedState)
-		{
-			var oldState = savedState as SavedParameterState;
-			if (oldState == null) {
-				throw new InvalidOperationException ("Internal error: savedState not an instance of ParameterState");
-			}
-
-			if (oldState.Owner != this) {
-				throw new InvalidOperationException ("Internal error: savedState not saved by this instance");
-			}
-
-			state = oldState;
-		}
-	}
-
-	interface ILlvmIrSavedFunctionSignatureState {}
-
-	class LlvmIrFunctionSignature : IEquatable<LlvmIrFunctionSignature>
-	{
-		public sealed class ReturnTypeAttributes
-		{
-			public bool? InReg;
-			public bool? NoUndef;
-			public bool? SignExt;
-			public bool? ZeroExt;
-			public bool? NonNull;
-
-			public ReturnTypeAttributes ()
-			{}
-
-			public ReturnTypeAttributes (ReturnTypeAttributes other)
-			{
-				InReg = other.InReg;
-				NoUndef = other.NoUndef;
-				NonNull = other.NonNull;
-				SignExt = other.SignExt;
-				ZeroExt = other.ZeroExt;
-			}
-		}
-
-		sealed class SavedSignatureState : ILlvmIrSavedFunctionSignatureState
-		{
-			public readonly LlvmIrFunctionSignature Owner;
-			public readonly IList<ILlvmIrSavedFunctionParameterState> ParameterStates;
-			public readonly ReturnTypeAttributes ReturnAttributes;
-
-			public SavedSignatureState (LlvmIrFunctionSignature owner, IList<ILlvmIrSavedFunctionParameterState> parameterStates, ReturnTypeAttributes returnAttributes)
-			{
-				Owner = owner;
-				ParameterStates = parameterStates;
-				ReturnAttributes = returnAttributes;
-			}
-		}
-
-		ReturnTypeAttributes returnAttributes;
-
-		public string Name                               { get; }
-		public Type ReturnType                           { get; }
-		public ReturnTypeAttributes ReturnAttributes     => returnAttributes;
-		public IList<LlvmIrFunctionParameter> Parameters { get; }
-
-		public LlvmIrFunctionSignature (string name, Type returnType, IList<LlvmIrFunctionParameter>? parameters = null, ReturnTypeAttributes? returnAttributes = null)
-		{
-			if (String.IsNullOrEmpty (name)) {
-				throw new ArgumentException ("must not be null or empty", nameof (name));
-			}
-
-			Name = name;
-			ReturnType = returnType;
-			this.returnAttributes = returnAttributes ?? new ReturnTypeAttributes ();
-			Parameters = parameters ?? new List<LlvmIrFunctionParameter> ();
-		}
-
-		/// <summary>
-		/// Create new signature using data from the <see cref="templateSignature"/> one, with the exception of name.
-		/// Useful when there are several functions with different names but identical parameters and return types.
-		/// </summary>
-		public LlvmIrFunctionSignature (string name, LlvmIrFunctionSignature templateSignature)
-			: this (name, templateSignature.ReturnType, templateSignature.Parameters)
-		{}
-
-		/// <summary>
-		/// Save (opaque) signature state.  This includes states of all the parameters. <see cref="LlvmIrFunctionParameter.SaveState()"/>
-		/// for more information.
-		/// </summary>
-		public ILlvmIrSavedFunctionSignatureState SaveState ()
-		{
-			var list = new List<ILlvmIrSavedFunctionParameterState> ();
-
-			foreach (LlvmIrFunctionParameter parameter in Parameters) {
-				list.Add (parameter.SaveState ());
-			}
-
-			var ret = new SavedSignatureState (this, list.AsReadOnly (), returnAttributes);
-			returnAttributes = new ReturnTypeAttributes (returnAttributes);
-			return ret;
-		}
-
-		/// <summary>
-		/// Restore (opaque) signature state.  This includes states of all the parameters. <see cref="LlvmIrFunctionParameter.RestoreState(ILlvmIrSavedFunctionParameterState)"/>
-		/// for more information.
-		/// </summary>
-		public void RestoreState (ILlvmIrSavedFunctionSignatureState savedState)
-		{
-			var oldState = savedState as SavedSignatureState;
-			if (oldState == null) {
-				throw new InvalidOperationException ($"Internal error: savedState not an instance of {nameof(SavedSignatureState)}");
-			}
-
-			if (oldState.Owner != this) {
-				throw new InvalidOperationException ("Internal error: savedState not saved by this instance");
-			}
-
-			for (int i = 0; i < oldState.ParameterStates.Count; i++) {
-				ILlvmIrSavedFunctionParameterState parameterState = oldState.ParameterStates[i];
-				Parameters[i].RestoreState (parameterState);
-			}
-			returnAttributes = new ReturnTypeAttributes (oldState.ReturnAttributes);
-		}
-
-		public override int GetHashCode ()
-		{
-			int hc =
-				Name.GetHashCode () ^
-				Parameters.GetHashCode () ^
-				ReturnType.GetHashCode ();
-
-			foreach (LlvmIrFunctionParameter p in Parameters) {
-				hc ^= p.GetHashCode ();
-			}
-
-			return hc;
-		}
-
-		public override bool Equals (object obj)
-		{
-			var sig = obj as LlvmIrFunctionSignature;
-			if (sig == null) {
-				return false;
-			}
-
-			return Equals (sig);
-		}
-
-		public bool Equals (LlvmIrFunctionSignature other)
-		{
-			if (other == null) {
-				return false;
-			}
-
-			if (Parameters.Count != other.Parameters.Count ||
-			    ReturnType != other.ReturnType ||
-			    !MonoAndroidHelper.StringEquals (Name, other.Name)
-			) {
-				return false;
-			}
-
-			for (int i = 0; i < Parameters.Count; i++) {
-				if (Parameters[i] != other.Parameters[i]) {
-					return false;
-				}
-			}
-
-			return true;
-		}
-	}
-
-	interface ILlvmIrSavedFunctionState {}
-
-	/// <summary>
-	/// Describes a native function to be emitted or declared and keeps code emitting state between calls to various generator.
-	/// methods.
-	/// </summary>
-	class LlvmIrFunction : IEquatable<LlvmIrFunction>
-	{
-		public class FunctionState
-		{
-			// Counter shared by unnamed local variables (including function parameters) and unnamed labels.
-			ulong unnamedTemporaryCounter = 0;
-
-			// Implicit unnamed label at the start of the function
-			ulong? startingBlockNumber;
-
-			public ulong StartingBlockNumber {
-				get {
-					if (startingBlockNumber.HasValue) {
-						return startingBlockNumber.Value;
-					}
-
-					throw new InvalidOperationException ($"Internal error: starting block number not set");
-				}
-			}
-
-			public FunctionState ()
-			{}
-
-			public ulong NextTemporary ()
-			{
-				ulong ret = unnamedTemporaryCounter++;
-				return ret;
-			}
-
-			public void ConfigureStartingBlockNumber ()
-			{
-				if (startingBlockNumber.HasValue) {
-					return;
-				}
-
-				startingBlockNumber = unnamedTemporaryCounter++;
-			}
-		}
-
-		sealed class SavedFunctionState : ILlvmIrSavedFunctionState
-		{
-			public readonly LlvmIrFunction Owner;
-			public readonly ILlvmIrSavedFunctionSignatureState SignatureState;
-
-			public SavedFunctionState (LlvmIrFunction owner, ILlvmIrSavedFunctionSignatureState signatureState)
-			{
-				Owner = owner;
-				SignatureState = signatureState;
-			}
-		}
-
-		FunctionState functionState;
-
-		public LlvmIrFunctionSignature Signature             { get; }
-		public LlvmIrAddressSignificance AddressSignificance { get; set; } = LlvmIrAddressSignificance.LocalUnnamed;
-		public LlvmIrFunctionAttributeSet? AttributeSet      { get; set; }
-		public LlvmIrLinkage Linkage                         { get; set; } = LlvmIrLinkage.Default;
-		public LlvmIrRuntimePreemption RuntimePreemption     { get; set; } = LlvmIrRuntimePreemption.Default;
-		public LlvmIrVisibility Visibility                   { get; set; } = LlvmIrVisibility.Default;
-		public LlvmIrCallingConvention CallingConvention     { get; set; } = LlvmIrCallingConvention.Default;
-		public LlvmIrFunctionBody Body                       { get; }
-		public string? Comment                               { get; set; }
-		public bool ReturnsValue                             => Signature.ReturnType != typeof(void);
-		public bool UsesVarArgs                              { get; }
-
-		public LlvmIrFunction (LlvmIrFunctionSignature signature, LlvmIrFunctionAttributeSet? attributeSet = null)
-		{
-			Signature = signature;
-			AttributeSet = attributeSet;
-
-			functionState = new FunctionState ();
-			foreach (LlvmIrFunctionParameter parameter in signature.Parameters) {
-				if (UsesVarArgs) {
-					throw new InvalidOperationException ($"Internal error: function '{signature.Name}' uses variable arguments and it has at least one argument following the varargs (...) one. This is not allowed.");
-				}
-
-				if (parameter.IsVarArgs) {
-					UsesVarArgs = true;
-					continue;
-				}
-
-				if (!String.IsNullOrWhiteSpace (parameter.Name)) {
-					continue;
-				}
-
-				parameter.AssignNumber (functionState.NextTemporary ());
-			}
-			functionState.ConfigureStartingBlockNumber ();
-
-			Body = new LlvmIrFunctionBody (this, functionState);
-		}
-
-		/// <summary>
-		/// Create new function using data from the <see cref="templateSignature"/> signature, with the exception of name.
-		/// Useful when there are several functions with different names but identical parameters and return types.
-		/// </summary>
-		public LlvmIrFunction (string name, LlvmIrFunctionSignature templateSignature, LlvmIrFunctionAttributeSet? attributeSet = null)
-			: this (new LlvmIrFunctionSignature (name, templateSignature), attributeSet)
-		{}
-
-		public LlvmIrFunction (string name, Type returnType, List<LlvmIrFunctionParameter>? parameters = null, LlvmIrFunctionAttributeSet? attributeSet = null)
-			: this (new LlvmIrFunctionSignature (name, returnType, parameters), attributeSet)
-		{}
-
-		/// <summary>
-		/// Creates a local variable which, if <paramref name="name"/> is <c>null</c> or empty, is assinged the correct
-		/// name based on a counter local to the function.
-		/// </summary>
-		public LlvmIrLocalVariable CreateLocalVariable (Type type, string? name = null)
-		{
-			var ret = new LlvmIrLocalVariable (type, name);
-			if (String.IsNullOrEmpty (name)) {
-				ret.AssignNumber (functionState.NextTemporary ());
-			}
-
-			return ret;
-		}
-
-		/// <summary>
-		/// Save (opaque) function state.  This includes signature state. <see cref="LlvmIrFunctionSignature.SaveState()"/>
-		/// for more information.
-		/// </summary>
-		public ILlvmIrSavedFunctionState SaveState ()
-		{
-			return new SavedFunctionState (this, Signature.SaveState ());
-		}
-
-		/// <summary>
-		/// Restore (opaque) function state.  This includes signature state. <see cref="LlvmIrFunctionSignature.RestoreState(ILlvmIrSavedFunctionSignatureState)"/>
-		/// for more information.
-		/// </summary>
-		public void RestoreState (ILlvmIrSavedFunctionState savedState)
-		{
-			var oldState = savedState as SavedFunctionState;
-			if (oldState == null) {
-				throw new InvalidOperationException ($"Internal error: savedState not an instance of {nameof(SavedFunctionState)}");
-			}
-
-			if (oldState.Owner != this) {
-				throw new InvalidOperationException ("Internal error: savedState not saved by this instance");
-			}
-
-			Signature.RestoreState (oldState.SignatureState);
-		}
-
-		public override int GetHashCode ()
-		{
-			return Signature.GetHashCode ();
-		}
-
-		public override bool Equals (object obj)
-		{
-			var func = obj as LlvmIrFunction;
-			if (func == null) {
-				return false;
-			}
-
-			return Equals (func);
-		}
-
-	        public bool Equals (LlvmIrFunction other)
-		{
-			if (other == null) {
-				return false;
-			}
-
-			return Signature == other.Signature;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionAttributeSet.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionAttributeSet.cs
deleted file mode 100644
index 35ee7d0f25c..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionAttributeSet.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#nullable enable
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-class LlvmIrFunctionAttributeSet : IEnumerable<LlvmIrFunctionAttribute>, IEquatable<LlvmIrFunctionAttributeSet>
-{
-	public uint Number                           { get; set; } = 0;
-	public bool DoNotAddTargetSpecificAttributes { get; set; }
-
-	HashSet<LlvmIrFunctionAttribute> attributes;
-#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value - conditionally populated based on target architecture
-	Dictionary<AndroidTargetArch, List<LlvmIrFunctionAttribute>>? privateTargetSpecificAttributes;
-#pragma warning restore CS0649
-
-	public LlvmIrFunctionAttributeSet ()
-	{
-		attributes = new HashSet<LlvmIrFunctionAttribute> ();
-	}
-
-	public LlvmIrFunctionAttributeSet (LlvmIrFunctionAttributeSet other)
-	{
-		attributes = new HashSet<LlvmIrFunctionAttribute> (other);
-		Number = other.Number;
-	}
-
-	public IList<LlvmIrFunctionAttribute>? GetPrivateTargetAttributes (AndroidTargetArch targetArch)
-	{
-		if (privateTargetSpecificAttributes == null || !privateTargetSpecificAttributes.TryGetValue (targetArch, out List<LlvmIrFunctionAttribute> list)) {
-			return null;
-		}
-
-		return list.AsReadOnly ();
-	}
-
-	public void Add (LlvmIrFunctionAttribute attr)
-	{
-		if (attr == null) {
-			throw new ArgumentNullException (nameof (attr));
-		}
-
-		if (!attributes.Contains (attr)) {
-			attributes.Add (attr);
-		}
-	}
-
-	public void Add (IList<LlvmIrFunctionAttribute> attrList)
-	{
-		foreach (LlvmIrFunctionAttribute attr in attrList) {
-			Add (attr);
-		}
-	}
-
-	public string Render ()
-	{
-		List<LlvmIrFunctionAttribute> list = attributes.ToList ();
-		list.Sort ((LlvmIrFunctionAttribute a, LlvmIrFunctionAttribute b) => a.Name.CompareTo (b.Name));
-
-		return String.Join (" ", list.Select (a => a.Render ()));
-	}
-
-	public IEnumerator<LlvmIrFunctionAttribute> GetEnumerator () => attributes.GetEnumerator ();
-
-	IEnumerator IEnumerable.GetEnumerator () => GetEnumerator ();
-
-	public bool Equals (LlvmIrFunctionAttributeSet? other)
-	{
-		if (other == null) {
-			return false;
-		}
-
-		if (attributes.Count != other.attributes.Count) {
-			return false;
-		}
-
-		foreach (LlvmIrFunctionAttribute attr in attributes) {
-			if (!other.attributes.Contains (attr)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public override bool Equals (object? obj)
-	{
-		var attrSet = obj as LlvmIrFunctionAttributeSet;
-		if (attrSet == null) {
-			return false;
-		}
-
-		return Equals (attrSet);
-	}
-
-	public override int GetHashCode()
-	{
-		int hc = 0;
-
-		foreach (LlvmIrFunctionAttribute attr in attributes) {
-			hc ^= attr?.GetHashCode () ?? 0;
-		}
-
-		return hc;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionBody.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionBody.cs
deleted file mode 100644
index 2a33931edaf..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionBody.cs
+++ /dev/null
@@ -1,330 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Abstract class from which all of the items (labels, function parameters,
-/// local variables and instructions) derive.
-/// </summary>
-abstract class LlvmIrFunctionBodyItem
-{
-	/// <summary>
-	/// If an item has this property set to <c>true</c>, it won't be written to output when
-	/// code is generated.  This is used for implicit items that don't need to be part of
-	/// the generated code (e.g. the starting block label)
-	/// </summary>
-	public bool SkipInOutput { get; protected set; }
-	public string? Comment   { get; set; }
-
-	/// <summary>
-	/// Whether the item consists of nothing but a comment.  Such items produce no output at
-	/// all when <see cref="GeneratorWriteContext.EmitComments" /> is <c>false</c>, as opposed
-	/// to items which merely carry a trailing comment alongside real content.
-	/// </summary>
-	protected virtual bool IsCommentOnly => false;
-
-	public void Write (GeneratorWriteContext context, LlvmIrGenerator generator)
-	{
-		if (IsCommentOnly && !context.EmitComments) {
-			return;
-		}
-
-		DoWrite (context, generator);
-		if (context.EmitComments && !String.IsNullOrEmpty (Comment)) {
-			context.Output.Write (' ');
-			generator.WriteComment (context, Comment);
-		}
-		context.Output.WriteLine ();
-	}
-
-	protected abstract void DoWrite (GeneratorWriteContext context, LlvmIrGenerator generator);
-}
-
-/// <summary>
-/// Base class for function labels and local variables (including parameters), which
-/// obtain automatic names derived from a shared counter, unless explicitly named.
-/// </summary>
-abstract class LlvmIrFunctionLocalItem : LlvmIrFunctionBodyItem
-{
-	string? name;
-
-	public string Name {
-		get {
-			if (String.IsNullOrEmpty (name)) {
-				throw new InvalidOperationException ("Internal error: name hasn't been set yet");
-			}
-			return name;
-		}
-
-		protected set {
-			if (String.IsNullOrEmpty (value)) {
-				throw new InvalidOperationException ("Internal error: value must not be null or empty");
-			}
-			name = value;
-		}
-	}
-
-	protected LlvmIrFunctionLocalItem (string? name)
-	{
-		if (name != null) {
-			Name = name;
-		}
-	}
-
-	protected LlvmIrFunctionLocalItem (LlvmIrFunction.FunctionState state, string? name)
-	{
-		if (name != null) {
-			if (name.Length == 0) {
-				throw new ArgumentException ("must not be an empty string", nameof (name));
-			}
-
-			Name = name;
-			return;
-		}
-
-		SetName (state.NextTemporary ());
-	}
-
-	protected void SetName (ulong num)
-	{
-		Name = num.ToString (CultureInfo.InvariantCulture);
-	}
-
-	protected bool NameIsSet () => !String.IsNullOrEmpty (name);
-}
-
-class LlvmIrFunctionLabelItem : LlvmIrFunctionLocalItem
-{
-	/// <summary>
-	/// Labels are a bit peculiar in that they must not have their name set to the automatic value (based on
-	/// a counter shared with function parameters) at creation time, but only when they are actually added to
-	/// the function body.  The reason is that LLVM IR requires all the unnamed temporaries (function parameters and
-	/// labels) to be named sequentially, but sometimes a label must be referenced before it is added to the instruction
-	/// stream, e.g. in the <c>br</c> instruction.  On the other hand, it is perfectly fine to assign label a name that
-	/// isn't an integer at **instantiation** time, which is why we have the <paramref name="name"/> parameter here.
-	/// </summary>
-	public LlvmIrFunctionLabelItem (string? name = null)
-		: base (name)
-	{}
-
-	public void WillAddToBody (LlvmIrFunctionBody functionBody, LlvmIrFunction.FunctionState state)
-	{
-		if (NameIsSet ()) {
-			return;
-		}
-
-		SetName (state.NextTemporary ());
-	}
-
-	protected override void DoWrite (GeneratorWriteContext context, LlvmIrGenerator generator)
-	{
-		context.DecreaseIndent ();
-
-		context.Output.WriteLine ();
-		context.Output.Write (context.CurrentIndent);
-		context.Output.Write (Name);
-		context.Output.Write (':');
-
-		context.IncreaseIndent ();
-	}
-}
-
-class LlvmIrFunctionBodyComment : LlvmIrFunctionBodyItem
-{
-	public string Text     { get; }
-
-	protected override bool IsCommentOnly => true;
-
-	public LlvmIrFunctionBodyComment (string comment)
-	{
-		Text = comment;
-	}
-
-	protected override void DoWrite (GeneratorWriteContext context, LlvmIrGenerator generator)
-	{
-		context.Output.Write (context.CurrentIndent);
-		generator.WriteCommentLine (context, Text);
-	}
-}
-
-class LlvmIrFunctionBody
-{
-	sealed class LlvmIrFunctionImplicitStartLabel : LlvmIrFunctionLabelItem
-	{
-		public LlvmIrFunctionImplicitStartLabel (ulong num)
-		{
-			SetName (num);
-			SkipInOutput = true;
-		}
-	}
-
-	List<LlvmIrFunctionBodyItem> items;
-	HashSet<string> definedLabels;
-	LlvmIrFunction ownerFunction;
-	LlvmIrFunction.FunctionState functionState;
-	LlvmIrFunctionLabelItem implicitStartBlock;
-
-	LlvmIrFunctionLabelItem? precedingBlock1;
-	LlvmIrFunctionLabelItem? precedingBlock2;
-	LlvmIrFunctionLabelItem? previousLabel;
-
-	public IList<LlvmIrFunctionBodyItem> Items => items.AsReadOnly ();
-	public LlvmIrFunctionLabelItem? PrecedingBlock1 => precedingBlock1;
-	public LlvmIrFunctionLabelItem? PrecedingBlock2 => precedingBlock2;
-
-	public LlvmIrFunctionBody (LlvmIrFunction func, LlvmIrFunction.FunctionState functionState)
-	{
-		ownerFunction = func;
-		this.functionState = functionState;
-		definedLabels = new HashSet<string> (StringComparer.Ordinal);
-		items = new List<LlvmIrFunctionBodyItem> ();
-		previousLabel = implicitStartBlock = new LlvmIrFunctionImplicitStartLabel (functionState.StartingBlockNumber);
-	}
-
-	public void Add (LlvmIrFunctionLabelItem label, string? comment = null)
-	{
-		label.WillAddToBody (this, functionState);
-		if (definedLabels.Contains (label.Name)) {
-			throw new InvalidOperationException ($"Internal error: label with name '{label.Name}' already added to function '{ownerFunction.Signature.Name}' body");
-		}
-		items.Add (label);
-		definedLabels.Add (label.Name);
-
-		// Rotate preceding blocks
-		if (precedingBlock2 != null) {
-			precedingBlock2 = null;
-		}
-
-		precedingBlock2 = precedingBlock1;
-		precedingBlock1 = previousLabel;
-		previousLabel = label;
-
-		if (comment == null) {
-			var sb = new StringBuilder (" preds = %");
-			sb.Append (precedingBlock1.Name);
-			if (precedingBlock2 != null) {
-				sb.Append (", %");
-				sb.Append (precedingBlock2.Name);
-			}
-			comment = sb.ToString ();
-		}
-		label.Comment = comment;
-	}
-
-	public void Add (LlvmIrFunctionBodyItem item)
-	{
-		items.Add (item);
-	}
-
-	public void AddComment (string text)
-	{
-		Add (new LlvmIrFunctionBodyComment (text));
-	}
-
-	public LlvmIrInstructions.Alloca Alloca (LlvmIrVariable result)
-	{
-		var ret = new LlvmIrInstructions.Alloca (result);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Br Br (LlvmIrFunctionLabelItem label)
-	{
-		var ret = new LlvmIrInstructions.Br (label);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Br Br (LlvmIrVariable cond, LlvmIrFunctionLabelItem ifTrue, LlvmIrFunctionLabelItem ifFalse)
-	{
-		var ret = new LlvmIrInstructions.Br (cond, ifTrue, ifFalse);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Call Call (LlvmIrFunction function, LlvmIrVariable? result = null, ICollection<object?>? arguments = null, LlvmIrVariable? funcPointer = null)
-	{
-		var ret = new LlvmIrInstructions.Call (function, result, arguments, funcPointer);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Ext Ext (LlvmIrVariable source, Type targetType, LlvmIrVariable result)
-	{
-		var ret = new LlvmIrInstructions.Ext (source, targetType, result);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Icmp Icmp (LlvmIrIcmpCond cond, LlvmIrVariable op1, object? op2, LlvmIrVariable result)
-	{
-		var ret = new LlvmIrInstructions.Icmp (cond, op1, op2, result);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Load Load (LlvmIrVariable source, LlvmIrVariable result, LlvmIrMetadataItem? tbaa = null)
-	{
-		var ret = new LlvmIrInstructions.Load (source, result) {
-			TBAA = tbaa,
-		};
-		Add (ret);
-		return ret;
-	}
-
-	/// <summary>
-	/// Creates the `phi` instruction form we use the most throughout marshal methods generator - one which refers to an if/else block and where
-	/// **both** value:label pairs are **required**.  Parameters <paramref name="label1"/> and <paramref name="label2"/> are nullable because, in theory,
-	/// it is possible that <see cref="LlvmIrFunctionBody"/> hasn't had the required blocks defined prior to adding the `phi` instruction and, thus,
-	/// we must check for the possibility here.
-	/// </summary>
-	public LlvmIrInstructions.Phi Phi (LlvmIrVariable result, LlvmIrVariable val1, LlvmIrFunctionLabelItem? label1, LlvmIrVariable val2, LlvmIrFunctionLabelItem? label2)
-	{
-		var ret = new LlvmIrInstructions.Phi (result, val1, label1, val2, label2);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Ret Ret (Type retvalType, object? retval = null)
-	{
-		var ret = new LlvmIrInstructions.Ret (retvalType, retval);
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Store Store (LlvmIrVariable from, LlvmIrVariable to, LlvmIrMetadataItem? tbaa = null)
-	{
-		var ret = new LlvmIrInstructions.Store (from, to) {
-			TBAA = tbaa,
-		};
-
-		Add (ret);
-		return ret;
-	}
-
-	/// <summary>
-	/// Stores `null` in the indicated variable
-	/// </summary>
-	public LlvmIrInstructions.Store Store (LlvmIrVariable to, LlvmIrMetadataItem? tbaa = null)
-	{
-		var ret = new LlvmIrInstructions.Store (to) {
-			TBAA = tbaa,
-		};
-
-		Add (ret);
-		return ret;
-	}
-
-	public LlvmIrInstructions.Unreachable Unreachable ()
-	{
-		var ret = new LlvmIrInstructions.Unreachable ();
-
-		Add (ret);
-		return ret;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.Constants.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.Constants.cs
deleted file mode 100644
index c71b7753b59..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.Constants.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	partial class LlvmIrGenerator
-	{
-		// https://llvm.org/docs/LangRef.html#linkage-types
-		static readonly Dictionary<LlvmIrLinkage, string> llvmLinkage = new Dictionary<LlvmIrLinkage, string> {
-			{ LlvmIrLinkage.Default, String.Empty },
-			{ LlvmIrLinkage.Private, "private" },
-			{ LlvmIrLinkage.Internal, "internal" },
-			{ LlvmIrLinkage.AvailableExternally, "available_externally" },
-			{ LlvmIrLinkage.LinkOnce, "linkonce" },
-			{ LlvmIrLinkage.Weak, "weak" },
-			{ LlvmIrLinkage.Common, "common" },
-			{ LlvmIrLinkage.Appending, "appending" },
-			{ LlvmIrLinkage.ExternWeak, "extern_weak" },
-			{ LlvmIrLinkage.LinkOnceODR, "linkonce_odr" },
-			{ LlvmIrLinkage.External, "external" },
-		};
-
-		// https://llvm.org/docs/LangRef.html#runtime-preemption-specifiers
-		static readonly Dictionary<LlvmIrRuntimePreemption, string> llvmRuntimePreemption = new Dictionary<LlvmIrRuntimePreemption, string> {
-			{ LlvmIrRuntimePreemption.Default, String.Empty },
-			{ LlvmIrRuntimePreemption.DSOPreemptable, "dso_preemptable" },
-			{ LlvmIrRuntimePreemption.DSOLocal, "dso_local" },
-		};
-
-		// https://llvm.org/docs/LangRef.html#visibility-styles
-		static readonly Dictionary<LlvmIrVisibility, string> llvmVisibility = new Dictionary<LlvmIrVisibility, string> {
-			{ LlvmIrVisibility.Default, "default" },
-			{ LlvmIrVisibility.Hidden, "hidden" },
-			{ LlvmIrVisibility.Protected, "protected" },
-		};
-
-		// https://llvm.org/docs/LangRef.html#global-variables
-		static readonly Dictionary<LlvmIrAddressSignificance, string> llvmAddressSignificance = new Dictionary<LlvmIrAddressSignificance, string> {
-			{ LlvmIrAddressSignificance.Default, String.Empty },
-			{ LlvmIrAddressSignificance.Unnamed, "unnamed_addr" },
-			{ LlvmIrAddressSignificance.LocalUnnamed, "local_unnamed_addr" },
-		};
-
-		// https://llvm.org/docs/LangRef.html#global-variables
-		static readonly Dictionary<LlvmIrWritability, string> llvmWritability = new Dictionary<LlvmIrWritability, string> {
-			{ LlvmIrWritability.Constant, "constant" },
-			{ LlvmIrWritability.Writable, "global" },
-		};
-
-		// https://llvm.org/docs/LangRef.html#callingconv
-		static readonly Dictionary<LlvmIrCallingConvention, string> llvmCallingConvention = new () {
-			{ LlvmIrCallingConvention.Ccc, "ccc" },
-			{ LlvmIrCallingConvention.Fastcc, "fastcc" },
-			{ LlvmIrCallingConvention.Tailcc, "tailcc" },
-		};
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.cs
deleted file mode 100644
index 2c01dc5e28a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.cs
+++ /dev/null
@@ -1,1960 +0,0 @@
-#nullable disable
-
-using System;
-using System.Buffers;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
-using System.Text;
-
-using Microsoft.Android.Build.Tasks;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	sealed class GeneratorStructureInstance : StructureInstance
-	{
-		public GeneratorStructureInstance (StructureInfo info, object instance)
-			: base (info, instance)
-		{}
-	}
-
-	sealed class GeneratorWriteContext
-	{
-		const char IndentChar = '\t';
-
-		int currentIndentLevel = 0;
-
-		public readonly TextWriter Output;
-		public readonly LlvmIrModule Module;
-		public readonly LlvmIrModuleTarget Target;
-		public readonly LlvmIrMetadataManager MetadataManager;
-		public readonly LlvmIrTypeCache TypeCache;
-		public readonly LlvmIrGenerator Generator;
-
-		/// <summary>
-		/// Whether descriptive comments are written to the generated LLVM IR.  Comments make the
-		/// output easier to read, but they can account for the majority of the file's size and
-		/// have no effect on the code <c>llc</c> produces.
-		/// </summary>
-		public readonly bool EmitComments;
-
-		public string CurrentIndent { get; private set; } = String.Empty;
-		public bool InVariableGroup { get; set; }
-		public LlvmIrVariableNumberFormat NumberFormat { get; set; } = LlvmIrVariableNumberFormat.Default;
-
-		public GeneratorWriteContext (LlvmIrGenerator generator, TextWriter writer, LlvmIrModule module, LlvmIrModuleTarget target, LlvmIrMetadataManager metadataManager, LlvmIrTypeCache cache)
-		{
-			Generator = generator;
-			EmitComments = generator.EmitComments;
-			Output = writer;
-			Module = module;
-			Target = target;
-			MetadataManager = metadataManager;
-			TypeCache = cache;
-		}
-
-		public void IncreaseIndent ()
-		{
-			currentIndentLevel++;
-			CurrentIndent = MakeIndentString ();
-		}
-
-		public void DecreaseIndent ()
-		{
-			if (currentIndentLevel > 0) {
-				currentIndentLevel--;
-			}
-			CurrentIndent = MakeIndentString ();
-		}
-
-		string MakeIndentString () => currentIndentLevel > 0 ? new String (IndentChar, currentIndentLevel) : String.Empty;
-	}
-
-	partial class LlvmIrGenerator
-	{
-		sealed class LlvmTypeInfo
-		{
-			public readonly bool IsPointer;
-			public readonly bool IsAggregate;
-			public readonly bool IsStructure;
-			public readonly ulong Size;
-			public readonly ulong MaxFieldAlignment;
-
-			public LlvmTypeInfo (bool isPointer, bool isAggregate, bool isStructure, ulong size, ulong maxFieldAlignment)
-			{
-				IsPointer = isPointer;
-				IsAggregate = isAggregate;
-				IsStructure = isStructure;
-				Size = size;
-				MaxFieldAlignment = maxFieldAlignment;
-			}
-		}
-
-		sealed class BasicType
-		{
-			public readonly string Name;
-			public readonly ulong Size;
-			public readonly bool IsNumeric;
-			public readonly bool IsUnsigned;
-			public readonly bool PreferHex;
-			public readonly string HexFormat;
-
-			public BasicType (string name, ulong size, bool isNumeric = true, bool isUnsigned = false, bool? preferHex = null)
-			{
-				Name = name;
-				Size = size;
-				IsNumeric = isNumeric;
-				IsUnsigned = isUnsigned;
-
-				// If hex preference isn't specified, we determine whether the type wants to be represented in
-				// the hexadecimal notation based on signedness.  Unsigned types will be represented in hexadecimal,
-				// but signed types will remain decimal, as it's easier for humans to see the actual value of the
-				// variable, given this note from LLVM IR manual:
-				//
-				//    Note that hexadecimal integers are sign extended from the number of active bits, i.e. the bit width minus the number of leading zeros. So ‘s0x0001’ of type ‘i16’ will be -1, not 1.
-				//
-				// See: https://llvm.org/docs/LangRef.html#simple-constants
-				//
-				if (preferHex.HasValue) {
-					PreferHex = preferHex.Value;
-				} else {
-					PreferHex = isUnsigned;
-				}
-				if (!PreferHex) {
-					HexFormat = String.Empty;
-					return;
-				}
-
-				HexFormat = $"x{size * 2}";
-			}
-		}
-
-		public const string IRPointerType = "ptr";
-
-		static readonly Dictionary<Type, BasicType> basicTypeMap = new Dictionary<Type, BasicType> {
-			{ typeof (bool),   new ("i1",     1, isNumeric: false, isUnsigned: true, preferHex: false) },
-			{ typeof (byte),   new ("i8",     1, isUnsigned: true) },
-			{ typeof (char),   new ("i16",    2, isUnsigned: true, preferHex: false) },
-			{ typeof (sbyte),  new ("i8",     1) },
-			{ typeof (short),  new ("i16",    2) },
-			{ typeof (ushort), new ("i16",    2, isUnsigned: true) },
-			{ typeof (int),    new ("i32",    4) },
-			{ typeof (uint),   new ("i32",    4, isUnsigned: true) },
-			{ typeof (long),   new ("i64",    8) },
-			{ typeof (ulong),  new ("i64",    8, isUnsigned: true) },
-			{ typeof (float),  new ("float",  4) },
-			{ typeof (double), new ("double", 8) },
-			{ typeof (void),   new ("void",   0, isNumeric: false, preferHex: false) },
-		};
-
-		public string FilePath           { get; }
-		public string FileName           { get; }
-
-		/// <summary>
-		/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to
-		/// <c>false</c>, since comments can easily account for more than half of the generated
-		/// file's size while having no effect whatsoever on the object code <c>llc</c> emits.
-		/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
-		/// </summary>
-		public bool EmitComments         { get; set; }
-
-		LlvmIrModuleTarget target;
-
-		protected LlvmIrGenerator (string filePath, LlvmIrModuleTarget target)
-		{
-			FilePath = Path.GetFullPath (filePath);
-			FileName = Path.GetFileName (filePath);
-			this.target = target;
-		}
-
-		public static LlvmIrGenerator Create (AndroidTargetArch arch, string fileName)
-		{
-			return arch switch {
-				AndroidTargetArch.Arm    => new LlvmIrGenerator (fileName, new LlvmIrModuleArmV7a ()),
-				AndroidTargetArch.Arm64  => new LlvmIrGenerator (fileName, new LlvmIrModuleAArch64 ()),
-				AndroidTargetArch.X86    => new LlvmIrGenerator (fileName, new LlvmIrModuleX86 ()),
-				AndroidTargetArch.X86_64 => new LlvmIrGenerator (fileName, new LlvmIrModuleX64 ()),
-				_ => throw new InvalidOperationException ($"Unsupported Android target ABI {arch}")
-			};
-		}
-
-		public void Generate (TextWriter writer, LlvmIrModule module)
-		{
-			LlvmIrMetadataManager metadataManager = module.GetMetadataManagerCopy ();
-			target.AddTargetSpecificMetadata (metadataManager);
-
-			var context = new GeneratorWriteContext (this, writer, module, target, metadataManager, module.TypeCache);
-			if (!String.IsNullOrEmpty (FilePath)) {
-				WriteCommentLine (context, $" ModuleID = '{FileName}'");
-				context.Output.WriteLine ($"source_filename = \"{FileName}\"");
-			}
-
-			context.Output.WriteLine (target.DataLayout.Render ());
-			context.Output.WriteLine ($"target triple = \"{target.Triple}\"");
-			WriteStructureDeclarations (context);
-			WriteGlobalVariables (context);
-			WriteFunctions (context);
-
-			// Bottom of the file
-			WriteStrings (context);
-			WriteExternalFunctionDeclarations (context);
-			WriteAttributeSets (context);
-			WriteMetadata (context);
-		}
-
-		void WriteStrings (GeneratorWriteContext context)
-		{
-			if (context.Module.Strings == null || context.Module.Strings.Count == 0) {
-				return;
-			}
-
-			context.Output.WriteLine ();
-			WriteComment (context, " Strings");
-
-			foreach (LlvmIrStringGroup group in context.Module.Strings) {
-				context.Output.WriteLine ();
-
-				if (!String.IsNullOrEmpty (group.Comment)) {
-					WriteCommentLine (context, group.Comment);
-				}
-
-				foreach (LlvmIrStringVariable info in group.Strings) {
-					string s = QuoteString (info, out ulong size);
-
-					if (context.EmitComments && !info.IsConstantStringLiteral) {
-						WriteCommentLine (context, $" '{info.Value}'");
-					}
-
-					WriteGlobalVariableName (context, info);
-
-					// Strings must always be local symbols, global variables will point to them
-					WriteVariableOptions (context, LlvmIrVariableOptions.LocalString);
-					context.Output.Write ('[');
-					context.Output.Write (size.ToString (CultureInfo.InvariantCulture));
-					context.Output.Write ($" x {info.IrType}] ");
-					if (info.IsConstantStringLiteral) {
-						context.Output.Write ('c');
-					}
-					context.Output.Write (s);
-					context.Output.Write (", align ");
-					context.Output.WriteLine (target.GetAggregateAlignment (1, size).ToString (CultureInfo.InvariantCulture));
-				}
-			}
-		}
-
-		void WriteGlobalVariables (GeneratorWriteContext context)
-		{
-			if (context.Module.GlobalVariables == null || context.Module.GlobalVariables.Count == 0) {
-				return;
-			}
-
-			foreach (LlvmIrGlobalVariable gv in context.Module.GlobalVariables) {
-				context.NumberFormat = gv.NumberFormat;
-
-				if (gv is LlvmIrGroupDelimiterVariable groupDelimiter) {
-					if (context.EmitComments && !context.InVariableGroup && !String.IsNullOrEmpty (groupDelimiter.Comment)) {
-						context.Output.WriteLine ();
-						context.Output.Write (context.CurrentIndent);
-						WriteComment (context, groupDelimiter.Comment);
-					}
-
-					context.InVariableGroup = !context.InVariableGroup;
-					if (context.InVariableGroup) {
-						context.Output.WriteLine ();
-					}
-					continue;
-				}
-
-				if (gv.TargetArch.HasValue && gv.TargetArch.Value != target.TargetArch) {
-					continue;
-				}
-
-				if (gv.BeforeWriteCallback != null) {
-					gv.BeforeWriteCallback (gv, target, gv.BeforeWriteCallbackCallerState);
-				}
-				WriteGlobalVariable (context, gv);
-			}
-		}
-
-		void WriteGlobalVariableName (GeneratorWriteContext context, LlvmIrGlobalVariable variable)
-		{
-			if (!String.IsNullOrEmpty (variable.Comment)) {
-				WriteCommentLine (context, variable.Comment);
-			}
-			context.Output.Write ('@');
-			context.Output.Write (variable.Name);
-			context.Output.Write (" = ");
-		}
-
-		void WriteVariableOptions (GeneratorWriteContext context, LlvmIrVariableOptions options)
-		{
-			WriteLinkage (context, options.Linkage);
-			WritePreemptionSpecifier (context, options.RuntimePreemption);
-			WriteVisibility (context, options.Visibility);
-			WriteAddressSignificance (context, options.AddressSignificance);
-			WriteWritability (context, options.Writability);
-		}
-
-		void WriteVariableOptions (GeneratorWriteContext context, LlvmIrGlobalVariable variable, LlvmIrVariableOptions? defaultOptions = null)
-		{
-			LlvmIrVariableOptions options = variable.Options ?? defaultOptions ?? LlvmIrGlobalVariable.DefaultOptions;
-			WriteVariableOptions (context, options);
-		}
-
-		void WriteVariableReference (GeneratorWriteContext context, LlvmIrVariableReference variable)
-		{
-			context.Output.Write (variable.Global ? '@' : '%');
-			context.Output.Write (variable.Name);
-		}
-
-		void WriteGlobalVariableStart (GeneratorWriteContext context, LlvmIrGlobalVariable variable)
-		{
-			WriteGlobalVariableName (context, variable);
-			WriteVariableOptions (context, variable, LlvmIrGlobalVariable.DefaultOptions);
-		}
-
-		void WriteGlobalVariable (GeneratorWriteContext context, LlvmIrGlobalVariable variable)
-		{
-			if (!context.InVariableGroup) {
-				context.Output.WriteLine ();
-			}
-
-			WriteGlobalVariableStart (context, variable);
-			WriteTypeAndValue (context, variable, out LlvmTypeInfo typeInfo);
-			context.Output.Write (", align ");
-
-			ulong alignment;
-			if (variable.Alignment.HasValue) {
-				alignment = variable.Alignment.Value;
-			} else if (typeInfo.IsAggregate) {
-				ulong count = GetAggregateValueElementCount (context, variable);
-				alignment = (ulong)target.GetAggregateAlignment ((int)typeInfo.MaxFieldAlignment, count * typeInfo.Size);
-			} else if (typeInfo.IsStructure) {
-				alignment = (ulong)target.GetAggregateAlignment ((int)typeInfo.MaxFieldAlignment, typeInfo.Size);
-			} else if (typeInfo.IsPointer) {
-				alignment = target.NativePointerSize;
-			} else {
-				alignment = typeInfo.Size;
-			}
-
-			context.Output.WriteLine (alignment.ToString (CultureInfo.InvariantCulture));
-		}
-
-		void WriteTypeAndValue (GeneratorWriteContext context, LlvmIrVariable variable, out LlvmTypeInfo typeInfo)
-		{
-			WriteType (context, variable, out typeInfo);
-			context.Output.Write (' ');
-
-			Type valueType;
-			if (variable.Value is LlvmIrVariable referencedVariable) {
-				valueType = referencedVariable.Type;
-			} else {
-				valueType = variable.Value?.GetType () ?? variable.Type;
-			}
-
-			if (variable.Value == null) {
-				// Order of checks is important here. Aggregates can contain pointer types, in which case typeInfo.IsPointer
-				// will be `true` and the aggregate would be incorrectly initialized with `null` instead of the correct
-				// `zeroinitializer`
-				if (typeInfo.IsAggregate) {
-					WriteValue (context, valueType, variable);
-					return;
-				}
-
-				if (typeInfo.IsPointer) {
-					context.Output.Write ("null");
-					return;
-				}
-
-				throw new InvalidOperationException ($"Internal error: variable '{variable.Name}'' of type {variable.Type} must not have a null value");
-			}
-
-			if (!IsValueAssignableFrom (valueType, variable) && !IsValueAssignableFrom (LlvmIrModule.NameValueArrayType, variable)) {
-				throw new InvalidOperationException ($"Internal error: variable type '{variable.Type}' is different to its value type, '{valueType}'");
-			}
-
-			WriteValue (context, valueType, variable);
-		}
-
-		bool IsValueAssignableFrom (Type valueType, LlvmIrVariable variable)
-		{
-			if (valueType != typeof(string) && valueType != typeof(StringHolder)) {
-				return valueType.IsAssignableFrom (variable.Type);
-			}
-
-			return variable.Type == typeof(string) || variable.Type == typeof(StringHolder);
-		}
-
-		ulong GetAggregateValueElementCount (GeneratorWriteContext context, LlvmIrVariable variable) => GetAggregateValueElementCount (context, variable.Type, variable.Value, variable as LlvmIrGlobalVariable);
-
-		ulong GetAggregateValueElementCount (GeneratorWriteContext context, Type type, object? value, LlvmIrGlobalVariable? globalVariable = null)
-		{
-			if (type == typeof(LlvmIrStringBlob)) {
-				return 1; // String blobs are a collection of bytes
-			}
-
-			if (type.IsSubclassOf (typeof(LlvmIrSectionedArrayBase))) {
-				var sectionedArray = value as LlvmIrSectionedArrayBase;
-				if (sectionedArray == null) {
-					throw new InvalidOperationException ($"Internal error: null sectioned arrays aren't supported");
-				}
-				return sectionedArray.Count;
-			}
-
-			if (!type.IsArray ()) {
-				throw new InvalidOperationException ($"Internal error: unknown type {type} when trying to determine aggregate type element count");
-			}
-
-			if (value == null) {
-				if (globalVariable != null) {
-					if (globalVariable.ArrayDataProvider != null) {
-						return globalVariable.ArrayDataProvider.GetTotalDataSize (context.Target);
-					}
-					return globalVariable.ArrayItemCount;
-				}
-				return 0;
-			}
-
-			// TODO: use caching here
-			if (type.ImplementsInterface (typeof(IDictionary<string, string>))) {
-				return (uint)((IDictionary<string, string>)value).Count * 2;
-			}
-
-			if (type.ImplementsInterface (typeof(ICollection))) {
-				return (uint)((ICollection)value).Count;
-			}
-
-			if (type.ImplementsInterface (typeof(ICollection<>))) {
-				return (ulong)GetCollectionOfTCount (type, value);
-			}
-
-			throw new InvalidOperationException ($"Internal error: should never get here");
-		}
-
-		void WriteType (GeneratorWriteContext context, LlvmIrVariable variable, out LlvmTypeInfo typeInfo)
-		{
-			WriteType (context, variable.Type, variable.Value, out typeInfo, variable as LlvmIrGlobalVariable);
-		}
-
-		void WriteType (GeneratorWriteContext context, StructureInstance si, StructureMemberInfo memberInfo, out LlvmTypeInfo typeInfo)
-		{
-			if (memberInfo.IsNativePointer) {
-				typeInfo = new LlvmTypeInfo (
-					isPointer: true,
-					isAggregate: false,
-					isStructure: false,
-					size: target.NativePointerSize,
-					maxFieldAlignment: target.NativePointerSize
-				);
-
-				context.Output.Write (IRPointerType);
-				return;
-			}
-
-			if (memberInfo.IsInlineArray) {
-				WriteArrayType (context, memberInfo.MemberType.GetArrayElementType (), memberInfo.ArrayElements, out typeInfo);
-				return;
-			}
-
-			if (memberInfo.IsIRStruct) {
-				var sim = new GeneratorStructureInstance (context.Module.GetStructureInfo (memberInfo.MemberType), memberInfo.GetValue (si.Obj));
-				WriteStructureType (context, sim, out typeInfo);
-				return;
-			}
-
-			WriteType (context, memberInfo.MemberType, value: null, out typeInfo);
-		}
-
-		void WriteStructureType (GeneratorWriteContext context, StructureInstance si, out LlvmTypeInfo typeInfo)
-		{
-			ulong alignment = GetStructureMaxFieldAlignment (si.Info);
-
-			typeInfo = new LlvmTypeInfo (
-				isPointer: false,
-				isAggregate: false,
-				isStructure: true,
-				size: si.Info.Size,
-				maxFieldAlignment: alignment
-			);
-
-			context.Output.Write ('%');
-			context.Output.Write (si.Info.NativeTypeDesignator);
-			context.Output.Write ('.');
-			context.Output.Write (si.Info.Name);
-		}
-
-		void WriteType (GeneratorWriteContext context, Type type, object? value, out LlvmTypeInfo typeInfo, LlvmIrGlobalVariable? globalVariable = null)
-		{
-			// Fast path: a basic scalar type (`byte`, `uint`, ...) can never be a structure instance,
-			// an array or a string blob, so skip the reflection-heavy probing below.  Arrays and string
-			// blobs write one element at a time, so this runs millions of times for a typical
-			// application and `Type.IsPrimitive`/`Type.IsArray` dominate the generator otherwise.
-			if (basicTypeMap.ContainsKey (type)) {
-				string basicIRType = GetIRType (context, type, out ulong basicSize, out bool basicIsPointer);
-				typeInfo = new LlvmTypeInfo (
-					isPointer: basicIsPointer,
-					isAggregate: false,
-					isStructure: false,
-					size: basicSize,
-					maxFieldAlignment: basicSize
-				);
-				context.Output.Write (basicIRType);
-				return;
-			}
-
-			if (IsStructureInstance (type)) {
-				if (value == null) {
-					throw new ArgumentException ($"must not be null for structure instances ({type})", nameof (value));
-				}
-
-				WriteStructureType (context, (StructureInstance)value, out typeInfo);
-				return;
-			}
-
-			string irType;
-			ulong size;
-			bool isPointer;
-			bool isStandardArray = type.IsArray ();
-			bool isSectionedArray = !isStandardArray && type.IsSubclassOf (typeof(LlvmIrSectionedArrayBase));
-
-			if (isStandardArray || isSectionedArray) {
-				Type elementType;
-				ulong elementCount;
-
-				if (isStandardArray) {
-					elementType = type.GetArrayElementType ();
-					elementCount = GetAggregateValueElementCount (context, type, value, globalVariable);
-				} else if (isSectionedArray) {
-					var sectionedArray = value as LlvmIrSectionedArrayBase;
-					if (sectionedArray == null) {
-						throw new InvalidOperationException ($"Internal error: sectioned array variables must have a value");
-					}
-
-					elementType = sectionedArray.ContainedType;
-					elementCount = GetAggregateValueElementCount (context, type, value, globalVariable);
-				} else {
-					throw new InvalidOperationException ("Internal error: should never get here (forgot to add a handler for another array type?)");
-				}
-
-				WriteArrayType (context, elementType, elementCount, globalVariable, out typeInfo);
-				return;
-			}
-
-			if (type == typeof(LlvmIrStringBlob)) {
-				WriteStringBlobType (context, (LlvmIrStringBlob?)value, out typeInfo);
-				return;
-			}
-
-			irType = GetIRType (context, type, out size, out isPointer);
-			typeInfo = new LlvmTypeInfo (
-				isPointer: isPointer,
-				isAggregate: false,
-				isStructure: false,
-				size: size,
-				maxFieldAlignment: size
-			);
-			context.Output.Write (irType);
-		}
-
-		void WriteStringBlobType (GeneratorWriteContext context, LlvmIrStringBlob? blob, out LlvmTypeInfo typeInfo)
-		{
-			long size = blob?.Size ?? 0;
-			// Blobs are always arrays of bytes
-			context.Output.Write ($"[{size} x i8]");
-
-			typeInfo = new LlvmTypeInfo (
-				isPointer: false,
-				isAggregate: true,
-				isStructure: false,
-				size: (ulong)size,
-				maxFieldAlignment: 1
-			);
-		}
-
-		void WriteArrayType (GeneratorWriteContext context, Type elementType, ulong elementCount, out LlvmTypeInfo typeInfo)
-		{
-			WriteArrayType (context, elementType, elementCount, variable: null, out typeInfo);
-		}
-
-		void WriteArrayType (GeneratorWriteContext context, Type elementType, ulong elementCount, LlvmIrGlobalVariable? variable, out LlvmTypeInfo typeInfo)
-		{
-			string irType;
-			ulong size;
-			ulong maxFieldAlignment;
-			bool isPointer;
-
-			if (elementType.IsStructureInstance (out Type? structureType)) {
-				StructureInfo si = context.Module.GetStructureInfo (structureType);
-
-				irType = $"%{si.NativeTypeDesignator}.{si.Name}";
-				size = si.Size;
-				maxFieldAlignment = GetStructureMaxFieldAlignment (si);
-				isPointer = false;
-			} else {
-				irType = GetIRType (context, elementType, out size, out isPointer);
-				maxFieldAlignment = size;
-
-				if (elementType.IsArray) {
-					if (variable == null) {
-						throw new InvalidOperationException ($"Internal error: array of arrays ({elementType}) requires variable to be defined");
-					}
-
-					// For the sake of simpler code, we currently assume that all the element arrays are of the same size, because that's the only scenario
-					// that we use at this time.
-					var value = variable.Value as ICollection;
-					if (value == null) {
-						throw new InvalidOperationException ($"Internal error: variable '{variable.Name}' of type '{variable.Type}' is required to have a value of type which implements the ICollection interface");
-					}
-
-					if (value.Count == 0) {
-						throw new InvalidOperationException ($"Internal error: variable '{variable.Name}' of type '{variable.Type}' is required to have a value which is a non-empty ICollection");
-					}
-
-					Array? firstItem = null;
-					foreach (object v in value) {
-						firstItem = (Array)v;
-						break;
-					}
-
-					if (firstItem == null) {
-						throw new InvalidOperationException ($"Internal error: variable '{variable.Name}' of type '{variable.Type}' is required to have a value which is a non-empty ICollection with non-null elements");
-					}
-
-					irType = $"[{MonoAndroidHelper.CultureInvariantToString (firstItem.Length)} x {irType}]";
-				}
-			}
-			typeInfo = new LlvmTypeInfo (
-				isPointer: isPointer,
-				isAggregate: true,
-				isStructure: false,
-				size: size,
-				maxFieldAlignment: maxFieldAlignment
-			);
-
-			context.Output.Write ('[');
-			context.Output.Write (elementCount.ToString (CultureInfo.InvariantCulture));
-			context.Output.Write (" x ");
-			context.Output.Write (irType);
-			context.Output.Write (']');
-		}
-
-		ulong GetStructureMaxFieldAlignment (StructureInfo si)
-		{
-			if (si.HasPointers && target.NativePointerSize > si.MaxFieldAlignment) {
-				return target.NativePointerSize;
-			}
-
-			return si.MaxFieldAlignment;
-		}
-
-		bool IsStructureInstance (Type t) => typeof(StructureInstance).IsAssignableFrom (t);
-
-		void WriteValue (GeneratorWriteContext context, Type valueType, LlvmIrVariable variable)
-		{
-			if (variable is LlvmIrGlobalVariable globalVariable && globalVariable.ArrayDataProvider != null) {
-				WriteStreamedArrayValue (context, globalVariable, globalVariable.ArrayDataProvider);
-				return;
-			}
-
-			if (variable.Type.IsArray ()) {
-				bool zeroInitialize = false;
-				if (variable is LlvmIrGlobalVariable gv) {
-					zeroInitialize = gv.ZeroInitializeArray || variable.Value == null;
-				} else {
-					zeroInitialize = GetAggregateValueElementCount (context, variable) == 0;
-				}
-
-				if (zeroInitialize) {
-					context.Output.Write ("zeroinitializer");
-					return;
-				}
-
-				WriteArrayValue (context, variable);
-				return;
-			}
-
-			WriteValue (context, valueType, variable.Value);
-		}
-
-		void AssertArraySize (StructureInstance si, StructureMemberInfo smi, ulong length, ulong expectedLength)
-		{
-			if (length == expectedLength) {
-				return;
-			}
-
-			throw new InvalidOperationException ($"Invalid array size in field '{smi.Info.Name}' of structure '{si.Info.Name}', expected {expectedLength}, found {length}");
-		}
-
-		void WriteInlineArray (GeneratorWriteContext context, byte[] bytes, bool encodeAsASCII)
-		{
-			if (encodeAsASCII) {
-				context.Output.Write ('c');
-				context.Output.Write (QuoteUtf8String (bytes, bytes.Length, out _, nullTerminated: false));
-				return;
-			}
-
-			string irType = MapToIRType (typeof(byte), context.TypeCache);
-			bool first = true;
-			context.Output.Write ("[ ");
-			foreach (byte b in bytes) {
-				if (!first) {
-					context.Output.Write (", ");
-				} else {
-					first = false;
-				}
-
-				context.Output.Write ($"{irType} u0x{b:x02}");
-			}
-			context.Output.Write (" ]");
-		}
-
-		void WriteValue (GeneratorWriteContext context, StructureInstance structInstance, StructureMemberInfo smi, object? value)
-		{
-			if (smi.IsNativePointer) {
-				if (WriteNativePointerValue (context, structInstance, smi, value)) {
-					return;
-				}
-			}
-
-			if (smi.IsInlineArray) {
-				Array a = (Array)value;
-				ulong length = smi.ArrayElements == 0 ? (ulong)a.Length : smi.ArrayElements;
-
-				if (smi.MemberType == typeof(byte[])) {
-					var bytes = (byte[])value;
-
-					// Byte arrays are represented in the same way as strings, without the explicit NUL termination byte
-					AssertArraySize (structInstance, smi, length, smi.ArrayElements);
-					WriteInlineArray (context, bytes, encodeAsASCII: false);
-					return;
-				}
-
-				throw new NotSupportedException ($"Internal error: inline arrays of type {smi.MemberType} aren't supported at this point. Field {smi.Info.Name} in structure {structInstance.Info.Name}");
-			}
-
-			if (smi.IsIRStruct) {
-				StructureInfo si = context.Module.GetStructureInfo (smi.MemberType);
-				WriteValue (context, typeof(GeneratorStructureInstance), new GeneratorStructureInstance (si, value));
-				return;
-			}
-
-			if (smi.Info.IsNativePointerToPreallocatedBuffer (context.TypeCache, out _)) {
-				string bufferVariableName = context.Module.LookupRequiredBufferVariableName (structInstance, smi);
-				context.Output.Write ('@');
-				context.Output.Write (bufferVariableName);
-				return;
-			}
-
-			WriteValue (context, smi.MemberType, value, smi.Info.GetStringEncoding (context.TypeCache));
-		}
-
-		bool WriteNativePointerValue (GeneratorWriteContext context, StructureInstance si, StructureMemberInfo smi, object? value)
-		{
-			// Structure members decorated with the [NativePointer] attribute cannot have a
-			// value other than `null`, unless they are strings or references to symbols
-
-			if (smi.Info.PointsToSymbol (context.TypeCache, out string? symbolName)) {
-				if (String.IsNullOrEmpty (symbolName) && smi.Info.UsesDataProvider (context.TypeCache)) {
-					if (si.Info.DataProvider == null) {
-						throw new InvalidOperationException ($"Field '{smi.Info.Name}' of structure '{si.Info.Name}' points to a symbol, but symbol name wasn't provided and there's no configured data context provider");
-					}
-					symbolName = si.Info.DataProvider.GetPointedToSymbolName (si.Obj, smi.Info.Name);
-				}
-
-				if (String.IsNullOrEmpty (symbolName)) {
-					context.Output.Write ("null");
-				} else {
-					context.Output.Write ('@');
-					context.Output.Write (symbolName);
-				}
-				return true;
-			}
-
-			if (smi.MemberType != typeof(string)) {
-				context.Output.Write ("null");
-				return true;
-			}
-
-			return false;
-		}
-
-		string ToHex (BasicType basicTypeDesc, Type type, object? value)
-		{
-			const char prefixSigned = 's';
-			const char prefixUnsigned = 'u';
-
-			string hex;
-			if (type == typeof(byte)) {
-				hex = ((byte)value).ToString (basicTypeDesc.HexFormat, CultureInfo.InvariantCulture);
-			} else if (type == typeof(ushort)) {
-				hex = ((ushort)value).ToString (basicTypeDesc.HexFormat, CultureInfo.InvariantCulture);
-			} else if (type == typeof(uint)) {
-				hex = ((uint)value).ToString (basicTypeDesc.HexFormat, CultureInfo.InvariantCulture);
-			} else if (type == typeof(ulong)) {
-				hex = ((ulong)value).ToString (basicTypeDesc.HexFormat, CultureInfo.InvariantCulture);
-			} else {
-				throw new NotImplementedException ($"Conversion to hexadecimal from type {type} is not implemented");
-			};
-
-			return $"{(basicTypeDesc.IsUnsigned ? prefixUnsigned : prefixSigned)}0x{hex}";
-		}
-
-		public void WriteValue (GeneratorWriteContext context, Type type, object? value, LlvmIrStringEncoding stringEncoding = LlvmIrStringEncoding.UTF8)
-		{
-			if (value is LlvmIrVariable variableRef) {
-				context.Output.Write (variableRef.Reference);
-				return;
-			}
-
-			bool isBasic = basicTypeMap.TryGetValue (type, out BasicType basicTypeDesc);
-			if (isBasic) {
-				if (basicTypeDesc.IsNumeric) {
-					bool hex = context.NumberFormat switch {
-						LlvmIrVariableNumberFormat.Default => basicTypeDesc.PreferHex,
-						LlvmIrVariableNumberFormat.Decimal => false,
-						LlvmIrVariableNumberFormat.Hexadecimal => true,
-						_ => throw new InvalidOperationException ($"Internal error: number format {context.NumberFormat} is unsupported")
-					};
-
-					context.Output.Write (
-						hex ? ToHex (basicTypeDesc, type, value) :  MonoAndroidHelper.CultureInvariantToString (value)
-					);
-					return;
-				}
-
-				if (type == typeof(bool)) {
-					context.Output.Write ((bool)value ? "true" : "false");
-					return;
-				}
-			}
-
-			if (IsStructureInstance (type)) {
-				WriteStructureValue (context, (StructureInstance?)value);
-				return;
-			}
-
-			if (type == typeof(IntPtr)) {
-				// Pointers can only be `null` or a reference to variable
-				context.Output.Write ("null");
-				return;
-			}
-
-			if (type == typeof(string) || type == typeof(StringHolder)) {
-				if (value == null) {
-					context.Output.Write ("null");
-					return;
-				}
-
-				LlvmIrStringVariable sv = context.Module.LookupRequiredVariableForString (StringHolder.AsHolder (value, stringEncoding));
-				context.Output.Write (sv.Reference);
-				return;
-			}
-
-			if (type == typeof(LlvmIrStringBlob)) {
-				WriteStringBlobArray (context, (LlvmIrStringBlob)value);
-				return;
-			}
-
-			if (type.IsArray) {
-				if (type == typeof(byte[])) {
-					WriteInlineArray (context, (byte[])value, encodeAsASCII: true);
-					return;
-				}
-
-				throw new NotSupportedException ($"Internal error: array of type {type} is unsupported");
-			}
-
-			if (type.IsSubclassOf (typeof(LlvmIrSectionedArrayBase))) {
-				WriteSectionedArrayValue (context, (LlvmIrSectionedArrayBase)value);
-				return;
-			}
-
-			if (type == typeof (LlvmIrVariableReference) || type.IsSubclassOf (typeof (LlvmIrVariableReference))) {
-				WriteVariableReference (context, (LlvmIrVariableReference)value);
-				return;
-			}
-
-			throw new NotSupportedException ($"Internal error: value type '{type}' is unsupported");
-		}
-
-		void WriteSectionedArrayValue (GeneratorWriteContext context, LlvmIrSectionedArrayBase? array)
-		{
-			if (array == null) {
-				context.Output.Write (" zeroinitializer");
-				return;
-			}
-
-			Type elementType = array.ContainedType;
-			WriteArrayValueStart (context);
-			ulong globalCounter = 0;
-			int lastSectionIndex = array.Sections.Count - 1;
-
-			for (int i = 0; i < array.Sections.Count; i++) {
-				LlvmIrArraySectionBase section = array.Sections[i];
-
-				if (i > 0) {
-					context.Output.WriteLine ();
-				}
-
-				if (!String.IsNullOrEmpty (section.Header)) {
-					context.Output.Write (context.CurrentIndent);
-					WriteCommentLine (context, $" Module map index: {globalCounter}");
-					context.Output.Write (context.CurrentIndent);
-					WriteCommentLine (context, section.Header);
-				}
-
-				WriteArrayEntries (
-					context,
-					variable: null,
-					section.Data,
-					section.DataType,
-					stride: 1,
-					writeIndices: true,
-					terminateWithComma: i < lastSectionIndex
-				);
-				globalCounter += (ulong)section.Data.Count;
-			}
-
-			WriteArrayValueEnd (context);
-		}
-
-		void WriteStringBlobArray (GeneratorWriteContext context, LlvmIrStringBlob blob)
-		{
-			// Emitted as a single `c"..."` literal rather than one `i8` element per byte, which shrinks
-			// the `.ll` ~10x.  No per-string comments are possible, as the literal must be on one line.
-			const int HexDigits = 2;
-			const int MaxEscapeWidth = 1 + HexDigits;
-			const int ChunkSize = 4096;
-
-			char [] chunk = ArrayPool<char>.Shared.Rent (ChunkSize);
-			int chunkCapacity = chunk.Length;
-			int chunkUsed = 0;
-
-			try {
-				context.Output.Write ('c');
-				context.Output.Write ('"');
-
-				foreach (LlvmIrStringBlob.StringInfo si in blob.GetSegments ()) {
-					foreach (byte b in si.Bytes) {
-						WriteByte (b);
-					}
-
-					// Terminating NUL is counted for each string, but not included in its bytes
-					WriteByte (0);
-				}
-
-				Flush ();
-				context.Output.Write ('"');
-			} finally {
-				ArrayPool<char>.Shared.Return (chunk);
-			}
-
-			void WriteByte (byte b)
-			{
-				if (b != (byte) '"' && b != (byte) '\\' && b >= 32 && b < 127) {
-					if (chunkUsed == chunkCapacity) {
-						Flush ();
-					}
-					chunk [chunkUsed++] = (char) b;
-					return;
-				}
-
-				if (chunkUsed + MaxEscapeWidth > chunkCapacity) {
-					Flush ();
-				}
-
-				chunk [chunkUsed++] = '\\';
-				HexUtilities.WriteHex (chunk.AsSpan (chunkUsed, HexDigits), b, upperCase: true);
-				chunkUsed += HexDigits;
-			}
-
-			void Flush ()
-			{
-				if (chunkUsed == 0) {
-					return;
-				}
-
-				context.Output.Write (chunk, 0, chunkUsed);
-				chunkUsed = 0;
-			}
-		}
-
-		void WriteStructureValue (GeneratorWriteContext context, StructureInstance? instance)
-		{
-			if (instance == null || instance.IsZeroInitialized) {
-				context.Output.Write ("zeroinitializer");
-				return;
-			}
-
-			context.Output.WriteLine ('{');
-			context.IncreaseIndent ();
-
-			StructureInfo info = instance.Info;
-			int lastMember = info.Members.Count - 1;
-
-			for (int i = 0; i < info.Members.Count; i++) {
-				StructureMemberInfo smi = info.Members[i];
-				if (!smi.IsSupportedForTarget (context.Target)) {
-					continue;
-				}
-
-				context.Output.Write (context.CurrentIndent);
-				WriteType (context, instance, smi, out _);
-				context.Output.Write (' ');
-
-				object? value = GetTypedMemberValue (context, info, smi, instance, smi.MemberType);
-				LlvmIrVariableNumberFormat numberFormat = smi.Info.GetNumberFormat (context.TypeCache);
-				LlvmIrVariableNumberFormat? savedNumberFormat = null;
-
-				if (numberFormat != LlvmIrVariableNumberFormat.Default && numberFormat != context.NumberFormat) {
-					savedNumberFormat = context.NumberFormat;
-					context.NumberFormat = numberFormat;
-				}
-
-				WriteValue (context, instance, smi, value);
-
-				if (savedNumberFormat.HasValue) {
-					context.NumberFormat = savedNumberFormat.Value;
-				}
-
-				if (i < lastMember) {
-					context.Output.Write (", ");
-				}
-
-				if (context.EmitComments) {
-					string? comment = info.GetCommentFromProvider (smi, instance);
-					if (String.IsNullOrEmpty (comment)) {
-						var sb = new StringBuilder (" ");
-						sb.Append (MapManagedTypeToNative (context, smi));
-						sb.Append (' ');
-						sb.Append (smi.MappedName);
-						comment = sb.ToString ();
-					}
-					WriteCommentLine (context, comment);
-				} else {
-					context.Output.WriteLine ();
-				}
-			}
-
-			context.DecreaseIndent ();
-			context.Output.Write (context.CurrentIndent);
-			context.Output.Write ('}');
-		}
-
-		void WriteArrayValueStart (GeneratorWriteContext context)
-		{
-			context.Output.WriteLine ('[');
-			context.IncreaseIndent ();
-		}
-
-		void WriteArrayValueEnd (GeneratorWriteContext context)
-		{
-			context.DecreaseIndent ();
-			context.Output.Write (']');
-		}
-
-		uint GetArrayStride (LlvmIrVariable variable)
-		{
-			if ((variable.WriteOptions & LlvmIrVariableWriteOptions.ArrayFormatInRows) == LlvmIrVariableWriteOptions.ArrayFormatInRows) {
-				return variable.ArrayStride > 0 ? variable.ArrayStride : 1;
-			}
-
-			return 1;
-		}
-
-		void WriteArrayEntries (GeneratorWriteContext context, LlvmIrVariable? variable, ICollection? entries, Type elementType, uint stride, bool writeIndices, bool terminateWithComma = false)
-		{
-			bool first = true;
-			// Comments are skipped when the array is written in rows, as they would break the layout
-			bool ignoreComments = stride > 1 || !context.EmitComments;
-			string? prevItemComment = null;
-			ulong counter = 0;
-			bool writeStringInComment = !ignoreComments && (elementType == typeof(string) || elementType == typeof(StringHolder));
-
-			if (entries != null) {
-				foreach (object entry in entries) {
-					if (!first) {
-						context.Output.Write (',');
-						if (stride == 1 || counter % stride == 0) {
-							WritePrevItemCommentOrNewline ();
-							context.Output.Write (context.CurrentIndent);
-						} else {
-							context.Output.Write (' ');
-						}
-					} else {
-						context.Output.Write (context.CurrentIndent);
-						first = false;
-					}
-
-					if (!ignoreComments) {
-						prevItemComment = null;
-						if (variable != null && variable.GetArrayItemCommentCallback != null) {
-							prevItemComment = variable.GetArrayItemCommentCallback (variable, target, counter, entry, variable.GetArrayItemCommentCallbackCallerState);
-						}
-
-						if (writeIndices && String.IsNullOrEmpty (prevItemComment)) {
-							string stringComment = String.Empty;
-							if (writeStringInComment) {
-								var holder = StringHolder.AsHolder (entry);
-								stringComment = $" ('{holder.Data}')";
-							}
-
-							prevItemComment = $" {counter}{stringComment}";
-						}
-					}
-
-					counter++;
-					WriteType (context, elementType, entry, out _);
-
-					context.Output.Write (' ');
-					WriteValue (context, elementType, entry);
-				}
-			}
-
-			if (terminateWithComma) {
-				if (!ignoreComments) {
-					context.Output.WriteLine (); // must put comma outside the comment
-					context.Output.Write (context.CurrentIndent);
-				}
-				context.Output.Write (',');
-			}
-			WritePrevItemCommentOrNewline ();
-
-			void WritePrevItemCommentOrNewline ()
-			{
-				if (!ignoreComments && !String.IsNullOrEmpty (prevItemComment)) {
-					context.Output.Write (' ');
-					WriteCommentLine (context, prevItemComment);
-				} else {
-					context.Output.WriteLine ();
-				}
-			}
-		}
-
-		bool ArrayWantsToWriteIndices (LlvmIrVariable variable) => (variable.WriteOptions & LlvmIrVariableWriteOptions.ArrayWriteIndexComments) == LlvmIrVariableWriteOptions.ArrayWriteIndexComments;
-
-		void WriteStreamedArrayValue (GeneratorWriteContext context, LlvmIrGlobalVariable variable, LlvmIrStreamedArrayDataProvider dataProvider)
-		{
-			ulong dataSizeSoFar = 0;
-			ulong totalDataSize = dataProvider.GetTotalDataSize (context.Target);
-			bool first = true;
-
-			WriteArrayValueStart (context);
-			while (true) {
-				(LlvmIrStreamedArrayDataProviderState state, ICollection? data) = dataProvider.GetData (context.Target);
-				if (state == LlvmIrStreamedArrayDataProviderState.NextSectionNoData) {
-					continue;
-				}
-
-				bool mustHaveData = state != LlvmIrStreamedArrayDataProviderState.LastSectionNoData;
-				if (mustHaveData) {
-					if (data.Count == 0) {
-						throw new InvalidOperationException ("Data must be provided for streamed arrays");
-					}
-
-					dataSizeSoFar += (ulong)data.Count;
-					if (dataSizeSoFar > totalDataSize) {
-						throw new InvalidOperationException ($"Data provider {dataProvider} is trying to write more data than declared");
-					}
-
-					if (first) {
-						first = false;
-					} else {
-						context.Output.WriteLine ();
-					}
-					string comment = dataProvider.GetSectionStartComment (context.Target);
-
-					if (comment.Length > 0) {
-						context.Output.Write (context.CurrentIndent);
-						WriteCommentLine (context, comment);
-					}
-				}
-
-				bool lastSection = state == LlvmIrStreamedArrayDataProviderState.LastSection || state == LlvmIrStreamedArrayDataProviderState.LastSectionNoData;
-				WriteArrayEntries (
-					context,
-					variable,
-					data,
-					dataProvider.ArrayElementType,
-					GetArrayStride (variable),
-					writeIndices: false,
-					terminateWithComma: !lastSection
-				);
-
-				if (lastSection) {
-					break;
-				}
-
-			}
-			WriteArrayValueEnd (context);
-		}
-
-		void WriteArrayValue (GeneratorWriteContext context, LlvmIrVariable variable)
-		{
-			ICollection entries;
-			if (variable.Type.ImplementsInterface (typeof(IDictionary<string, string>))) {
-				var list = new List<string> ();
-				foreach (var kvp in (IDictionary<string, string>)variable.Value) {
-					list.Add (kvp.Key);
-					list.Add (kvp.Value);
-				}
-				entries = list;
-			} else if (variable.Type.ImplementsInterface (typeof (ICollection))) {
-				entries = (ICollection)variable.Value;
-			} else if (variable.Type.ImplementsInterface (typeof (ICollection<>))) {
-				// This is slow and messy, but should work for a wide range of types without us having to add
-				// any explicit support
-				Type elementType = variable.Type.GetArrayElementType ();
-				int elementCount = GetCollectionOfTCount (variable.Type, variable.Value);
-				Array array = Array.CreateInstance (elementType, elementCount);
-				MethodInfo copyTo = variable.Type.GetMethod ("CopyTo", new Type[] { array.GetType (), typeof (int) });
-				copyTo.Invoke (variable.Value, new object[] { array, (int)0 });
-				entries = array;
-			} else {
-				throw new NotSupportedException ($"Unsupported array value type '{variable.Type}'");
-			}
-
-			if (entries.Count == 0) {
-				context.Output.Write ("zeroinitializer");
-				return;
-			}
-
-			WriteArrayValueStart (context);
-
-			WriteArrayEntries (
-				context,
-				variable,
-				entries,
-				variable.Type.GetArrayElementType (),
-				GetArrayStride (variable),
-				writeIndices: ArrayWantsToWriteIndices (variable)
-			);
-
-			WriteArrayValueEnd (context);
-		}
-
-		void WriteLinkage (GeneratorWriteContext context, LlvmIrLinkage linkage)
-		{
-			if (linkage == LlvmIrLinkage.Default) {
-				return;
-			}
-
-			try {
-				WriteAttribute (context, llvmLinkage[linkage]);
-			} catch (Exception ex) {
-				throw new InvalidOperationException ($"Internal error: unsupported writability '{linkage}'", ex);
-			}
-		}
-
-		void WriteWritability (GeneratorWriteContext context, LlvmIrWritability writability)
-		{
-			try {
-				WriteAttribute (context, llvmWritability[writability]);
-			} catch (Exception ex) {
-				throw new InvalidOperationException ($"Internal error: unsupported writability '{writability}'", ex);
-			}
-		}
-
-		void WriteAddressSignificance (GeneratorWriteContext context, LlvmIrAddressSignificance addressSignificance)
-		{
-			if (addressSignificance == LlvmIrAddressSignificance.Default) {
-				return;
-			}
-
-			try {
-				WriteAttribute (context, llvmAddressSignificance[addressSignificance]);
-			} catch (Exception ex) {
-				throw new InvalidOperationException ($"Internal error: unsupported address significance '{addressSignificance}'", ex);
-			}
-		}
-
-		void WriteVisibility (GeneratorWriteContext context, LlvmIrVisibility visibility)
-		{
-			if (visibility == LlvmIrVisibility.Default) {
-				return;
-			}
-
-			try {
-				WriteAttribute (context, llvmVisibility[visibility]);
-			} catch (Exception ex) {
-				throw new InvalidOperationException ($"Internal error: unsupported visibility '{visibility}'", ex);
-			}
-		}
-
-		void WritePreemptionSpecifier (GeneratorWriteContext context, LlvmIrRuntimePreemption preemptionSpecifier)
-		{
-			if (preemptionSpecifier == LlvmIrRuntimePreemption.Default) {
-				return;
-			}
-
-			try {
-				WriteAttribute (context, llvmRuntimePreemption[preemptionSpecifier]);
-			} catch (Exception ex) {
-				throw new InvalidOperationException ($"Internal error: unsupported preemption specifier '{preemptionSpecifier}'", ex);
-			}
-		}
-
-		/// <summary>
-		/// Write attribute named in <paramref ref="attr"/> followed by a single space
-		/// </summary>
-		void WriteAttribute (GeneratorWriteContext context, string attr)
-		{
-			context.Output.Write (attr);
-			context.Output.Write (' ');
-		}
-
-		void WriteStructureDeclarations (GeneratorWriteContext context)
-		{
-			if (context.Module.Structures == null || context.Module.Structures.Count == 0) {
-				return;
-			}
-
-			foreach (StructureInfo si in context.Module.Structures) {
-				context.Output.WriteLine ();
-				WriteStructureDeclaration (context, si);
-			}
-		}
-
-		void WriteStructureDeclaration (GeneratorWriteContext context, StructureInfo si)
-		{
-			// $"%{typeDesignator}.{name} = type "
-			context.Output.Write ('%');
-			context.Output.Write (si.NativeTypeDesignator);
-			context.Output.Write ('.');
-			context.Output.Write (si.Name);
-			context.Output.Write (" = type ");
-
-			if (si.IsOpaque) {
-				context.Output.WriteLine ("opaque");
-			} else {
-				context.Output.WriteLine ('{');
-			}
-
-			if (si.IsOpaque) {
-				return;
-			}
-
-			context.IncreaseIndent ();
-			for (int i = 0; i < si.Members.Count; i++) {
-				StructureMemberInfo info = si.Members[i];
-				if (!info.IsSupportedForTarget (context.Target)) {
-					continue;
-				}
-
-				string nativeType = MapManagedTypeToNative (info.MemberType);
-
-				// TODO: nativeType can be an array, update to indicate that (and get the size)
-				string arraySize;
-				if (info.IsNativeArray) {
-					arraySize = $"[{info.ArrayElements}]";
-				} else {
-					arraySize = String.Empty;
-				}
-
-				var comment = $" {nativeType} {info.MappedName}{arraySize}";
-				WriteStructureDeclarationField (info.IRType, comment, i == si.Members.Count - 1);
-			}
-			context.DecreaseIndent ();
-
-			context.Output.WriteLine ('}');
-
-			void WriteStructureDeclarationField (string typeName, string comment, bool last)
-			{
-				context.Output.Write (context.CurrentIndent);
-				context.Output.Write (typeName);
-				if (!last) {
-					context.Output.Write (", ");
-				} else {
-					context.Output.Write (' ');
-				}
-
-				if (context.EmitComments && !String.IsNullOrEmpty (comment)) {
-					WriteCommentLine (context, comment);
-				} else {
-					context.Output.WriteLine ();
-				}
-			}
-		}
-
-		//
-		// Functions syntax: https://llvm.org/docs/LangRef.html#functions
-		//
-		void WriteFunctions (GeneratorWriteContext context)
-		{
-			if (context.Module.Functions == null || context.Module.Functions.Count == 0) {
-				return;
-			}
-
-			context.Output.WriteLine ();
-			WriteComment (context, " Functions");
-
-			foreach (LlvmIrFunction function in context.Module.Functions) {
-				context.Output.WriteLine ();
-				WriteFunctionComment (context, function);
-
-				// Must preserve state between calls, different targets may modify function state differently (e.g. set different parameter flags
-				ILlvmIrSavedFunctionState funcState = WriteFunctionPreamble (context, function, "define");
-				WriteFunctionDefinitionLeadingDecorations (context, function);
-				WriteFunctionSignature (context, function, writeParameterNames: true);
-				WriteFunctionDefinitionTrailingDecorations (context, function);
-				WriteFunctionBody (context, function);
-				function.RestoreState (funcState);
-			}
-		}
-
-		void WriteFunctionComment (GeneratorWriteContext context, LlvmIrFunction function)
-		{
-			if (String.IsNullOrEmpty (function.Comment)) {
-				return;
-			}
-
-			foreach (string commentLine in function.Comment.Split ('\n')) {
-				context.Output.Write (context.CurrentIndent);
-				WriteCommentLine (context, commentLine);
-			}
-		}
-
-		void WriteFunctionBody (GeneratorWriteContext context, LlvmIrFunction function)
-		{
-			context.Output.WriteLine ();
-			context.Output.WriteLine ('{');
-			context.IncreaseIndent ();
-
-			foreach (LlvmIrFunctionBodyItem item in function.Body.Items) {
-				item.Write (context, this);
-			}
-
-			context.DecreaseIndent ();
-			context.Output.WriteLine ('}');
-		}
-
-		ILlvmIrSavedFunctionState WriteFunctionPreamble (GeneratorWriteContext context, LlvmIrFunction function, string keyword)
-		{
-			ILlvmIrSavedFunctionState funcState = function.SaveState ();
-
-			foreach (LlvmIrFunctionParameter parameter in function.Signature.Parameters) {
-				target.SetParameterFlags (parameter);
-			}
-
-			WriteFunctionAttributesComment (context, function);
-			context.Output.Write (keyword);
-			context.Output.Write (' ');
-
-			return funcState;
-		}
-
-		void WriteExternalFunctionDeclarations (GeneratorWriteContext context)
-		{
-			if (context.Module.ExternalFunctions == null || context.Module.ExternalFunctions.Count == 0) {
-				return;
-			}
-
-			context.Output.WriteLine ();
-			WriteComment (context, " External functions");
-			foreach (LlvmIrFunction function in context.Module.ExternalFunctions) {
-				context.Output.WriteLine ();
-
-				// Must preserve state between calls, different targets may modify function state differently (e.g. set different parameter flags)
-				ILlvmIrSavedFunctionState funcState = WriteFunctionPreamble (context, function, "declare");
-				WriteFunctionDeclarationLeadingDecorations (context, function);
-				WriteFunctionSignature (context, function, writeParameterNames: false);
-				WriteFunctionDeclarationTrailingDecorations (context, function);
-
-				function.RestoreState (funcState);
-			}
-		}
-
-		void WriteFunctionAttributesComment (GeneratorWriteContext context, LlvmIrFunction func)
-		{
-			if (func.AttributeSet == null) {
-				return;
-			}
-
-			if (String.IsNullOrEmpty (func.Comment)) {
-				context.Output.WriteLine ();
-			}
-			WriteCommentLine (context, $" Function attributes: {func.AttributeSet.Render ()}");
-		}
-
-		void WriteFunctionDeclarationLeadingDecorations (GeneratorWriteContext context, LlvmIrFunction func)
-		{
-			WriteFunctionLeadingDecorations (context, func, declaration: true);
-		}
-
-		void WriteFunctionDefinitionLeadingDecorations (GeneratorWriteContext context, LlvmIrFunction func)
-		{
-			WriteFunctionLeadingDecorations (context, func, declaration: false);
-		}
-
-		void WriteFunctionLeadingDecorations (GeneratorWriteContext context, LlvmIrFunction func, bool declaration)
-		{
-			if (func.Linkage != LlvmIrLinkage.Default) {
-				context.Output.Write (llvmLinkage[func.Linkage]);
-				context.Output.Write (' ');
-			}
-
-			if (!declaration && func.RuntimePreemption != LlvmIrRuntimePreemption.Default) {
-				context.Output.Write (llvmRuntimePreemption[func.RuntimePreemption]);
-				context.Output.Write (' ');
-			}
-
-			if (func.Visibility != LlvmIrVisibility.Default) {
-				context.Output.Write (llvmVisibility[func.Visibility]);
-				context.Output.Write (' ');
-			}
-
-			if (func.CallingConvention != LlvmIrCallingConvention.Default) {
-				context.Output.Write (llvmCallingConvention[func.CallingConvention]);
-				context.Output.Write (' ');
-			}
-		}
-
-		void WriteFunctionDeclarationTrailingDecorations (GeneratorWriteContext context, LlvmIrFunction func)
-		{
-			WriteFunctionTrailingDecorations (context, func, declaration: true);
-		}
-
-		void WriteFunctionDefinitionTrailingDecorations (GeneratorWriteContext context, LlvmIrFunction func)
-		{
-			WriteFunctionTrailingDecorations (context, func, declaration: false);
-		}
-
-		void WriteFunctionTrailingDecorations (GeneratorWriteContext context, LlvmIrFunction func, bool declaration)
-		{
-			if (func.AddressSignificance != LlvmIrAddressSignificance.Default) {
-				context.Output.Write ($" {llvmAddressSignificance[func.AddressSignificance]}");
-			}
-
-			if (func.AttributeSet != null) {
-				context.Output.Write ($" #{func.AttributeSet.Number}");
-			}
-		}
-
-		public static void WriteReturnAttributes (GeneratorWriteContext context, LlvmIrFunctionSignature.ReturnTypeAttributes returnAttrs)
-		{
-			if (AttributeIsSet (returnAttrs.InReg)) {
-				context.Output.Write ("inreg");
-			}
-
-			if (AttributeIsSet (returnAttrs.NoUndef)) {
-				context.Output.Write ("noundef ");
-			}
-
-			if (AttributeIsSet (returnAttrs.NonNull)) {
-				context.Output.Write ("nonnull ");
-			}
-
-			if (AttributeIsSet (returnAttrs.SignExt)) {
-				context.Output.Write ("signext ");
-			}
-
-			if (AttributeIsSet (returnAttrs.ZeroExt)) {
-				context.Output.Write ("zeroext ");
-			}
-		}
-
-		void WriteFunctionSignature (GeneratorWriteContext context, LlvmIrFunction func, bool writeParameterNames)
-		{
-			if (func.ReturnsValue) {
-				WriteReturnAttributes (context, func.Signature.ReturnAttributes);
-			}
-
-			context.Output.Write (MapToIRType (func.Signature.ReturnType, context.TypeCache));
-			context.Output.Write (" @");
-			context.Output.Write (func.Signature.Name);
-			context.Output.Write ('(');
-
-			bool first = true;
-			bool varargsFound = false;
-
-			foreach (LlvmIrFunctionParameter parameter in func.Signature.Parameters) {
-				if (varargsFound) {
-					throw new InvalidOperationException ($"Internal error: function '{func.Signature.Name}' has extra parameters following the C varargs parameter. This is not allowed.");
-				}
-
-				if (!first) {
-					context.Output.Write (", ");
-				} else {
-					first = false;
-				}
-
-				if (parameter.IsVarArgs) {
-					context.Output.Write ("...");
-					varargsFound = true;
-					continue;
-				}
-
-				context.Output.Write (MapToIRType (parameter.Type, context.TypeCache));
-				WriteParameterAttributes (context, parameter);
-
-				if (writeParameterNames) {
-					if (String.IsNullOrEmpty (parameter.Name)) {
-						throw new InvalidOperationException ($"Internal error: parameter must have a name");
-					}
-					context.Output.Write (" %"); // Function arguments are always local variables
-					context.Output.Write (parameter.Name);
-				}
-			}
-
-			context.Output.Write (')');
-		}
-
-		public static void WriteParameterAttributes (GeneratorWriteContext context, LlvmIrFunctionParameter parameter)
-		{
-			var attributes = new List<string> ();
-			if (AttributeIsSet (parameter.ImmArg)) {
-				attributes.Add ("immarg");
-			}
-
-			if (AttributeIsSet (parameter.AllocPtr)) {
-				attributes.Add ("allocptr");
-			}
-
-			if (AttributeIsSet (parameter.NoCapture)) {
-				attributes.Add ("nocapture");
-			}
-
-			if (AttributeIsSet (parameter.NonNull)) {
-				attributes.Add ("nonnull");
-			}
-
-			if (AttributeIsSet (parameter.NoUndef)) {
-				attributes.Add ("noundef");
-			}
-
-			if (AttributeIsSet (parameter.ReadNone)) {
-				attributes.Add ("readnone");
-			}
-
-			if (AttributeIsSet (parameter.SignExt)) {
-				attributes.Add ("signext");
-			}
-
-			if (AttributeIsSet (parameter.ZeroExt)) {
-				attributes.Add ("zeroext");
-			}
-
-			if (AttributeIsSet (parameter.WriteOnly)) {
-				attributes.Add ("writeonly");
-			}
-
-			if (parameter.Align.HasValue) {
-				attributes.Add ($"align({ValueOrPointerSize (parameter.Align.Value)})");
-			}
-
-			if (parameter.Dereferenceable.HasValue) {
-				attributes.Add ($"dereferenceable({ValueOrPointerSize (parameter.Dereferenceable.Value)})");
-			}
-
-			if (attributes.Count == 0) {
-				return;
-			}
-
-			context.Output.Write (' ');
-			context.Output.Write (String.Join (" ", attributes));
-
-			uint ValueOrPointerSize (uint? value)
-			{
-				if (value.Value == 0) {
-					return context.Target.NativePointerSize;
-				}
-
-				return value.Value;
-			}
-		}
-
-		static bool AttributeIsSet (bool? attr) => attr.HasValue && attr.Value;
-
-		void WriteAttributeSets (GeneratorWriteContext context)
-		{
-			if (context.Module.AttributeSets == null || context.Module.AttributeSets.Count == 0) {
-				return;
-			}
-
-			context.Output.WriteLine ();
-			foreach (LlvmIrFunctionAttributeSet attrSet in context.Module.AttributeSets) {
-				// Must not modify the original set, it is shared with other targets.
-				var targetSet = new LlvmIrFunctionAttributeSet (attrSet);
-				if (!attrSet.DoNotAddTargetSpecificAttributes) {
-					target.AddTargetSpecificAttributes (targetSet);
-				}
-
-				IList<LlvmIrFunctionAttribute>? privateTargetSet = attrSet.GetPrivateTargetAttributes (target.TargetArch);
-				if (privateTargetSet != null) {
-					targetSet.Add (privateTargetSet);
-				}
-
-				context.Output.WriteLine ($"attributes #{targetSet.Number} = {{ {targetSet.Render ()} }}");
-			}
-		}
-
-		void WriteMetadata (GeneratorWriteContext context)
-		{
-			if (context.MetadataManager.Items.Count == 0) {
-				return;
-			}
-
-			context.Output.WriteLine ();
-			WriteCommentLine (context, " Metadata");
-			foreach (LlvmIrMetadataItem metadata in context.MetadataManager.Items) {
-				context.Output.WriteLine (metadata.Render ());
-			}
-		}
-
-		public void WriteComment (GeneratorWriteContext context, string comment)
-		{
-			if (!context.EmitComments) {
-				return;
-			}
-
-			context.Output.Write (';');
-			context.Output.Write (comment);
-		}
-
-		public void WriteCommentLine (GeneratorWriteContext context, string comment)
-		{
-			if (!context.EmitComments) {
-				return;
-			}
-
-			WriteComment (context, comment);
-			context.Output.WriteLine ();
-		}
-
-		static Type GetActualType (Type type)
-		{
-			// Arrays of types are handled elsewhere, so we obtain the array base type here
-			if (type.IsArray) {
-				return type.GetElementType ();
-			}
-
-			return type;
-		}
-
-		/// <summary>
-		/// Map a managed <paramref name="type"/> to its <c>C++</c> counterpart. Only primitive types,
-		/// <c>string</c> and <c>IntPtr</c> are supported.
-		/// </summary>
-		public static string MapManagedTypeToNative (Type type)
-		{
-			Type baseType = GetActualType (type);
-
-			if (baseType == typeof (bool)) return "bool";
-			if (baseType == typeof (byte)) return "uint8_t";
-			if (baseType == typeof (char)) return "char";
-			if (baseType == typeof (sbyte)) return "int8_t";
-			if (baseType == typeof (short)) return "int16_t";
-			if (baseType == typeof (ushort)) return "uint16_t";
-			if (baseType == typeof (int)) return "int32_t";
-			if (baseType == typeof (uint)) return "uint32_t";
-			if (baseType == typeof (long)) return "int64_t";
-			if (baseType == typeof (ulong)) return "uint64_t";
-			if (baseType == typeof (float)) return "float";
-			if (baseType == typeof (double)) return "double";
-			if (baseType == typeof (string)) return "char*";
-			if (baseType == typeof (IntPtr)) return "void*";
-
-			return type.GetShortName ();
-		}
-
-		static string MapManagedTypeToNative (GeneratorWriteContext context, StructureMemberInfo smi)
-		{
-			if (smi.Info.IsUnicodeString (context.TypeCache)) {
-				return "char16_t*";
-			}
-
-			string nativeType = MapManagedTypeToNative (smi.MemberType);
-			// Silly, but effective
-			if (nativeType[nativeType.Length - 1] == '*') {
-				return nativeType;
-			}
-
-			if (!smi.IsNativePointer) {
-				return nativeType;
-			}
-
-			return $"{nativeType}*";
-		}
-
-		object? GetTypedMemberValue (GeneratorWriteContext context, StructureInfo info, StructureMemberInfo smi, StructureInstance instance, Type expectedType, object? defaultValue = null)
-		{
-			object? value = smi.GetValue (instance.Obj);
-			if (value == null) {
-				return defaultValue;
-			}
-
-			Type valueType = value.GetType ();
-			if (valueType != expectedType) {
-				throw new InvalidOperationException ($"Field '{smi.Info.Name}' of structure '{info.Name}' should have a value of '{expectedType}' type, instead it had a '{value.GetType ()}'");
-			}
-
-			if (valueType == typeof(string) || valueType == typeof(StringHolder)) {
-				var encoding = smi.Info.GetStringEncoding (context.TypeCache);
-				return context.Module.LookupRequiredVariableForString (StringHolder.AsHolder (value, encoding));
-			}
-
-			return value;
-		}
-
-		public static string MapToIRType (Type type, LlvmIrTypeCache cache)
-		{
-			return MapToIRType (type, cache, out _, out _);
-		}
-
-		public static string MapToIRType (Type type, LlvmIrTypeCache cache, out ulong size)
-		{
-			return MapToIRType (type, cache, out size, out _);
-		}
-
-		public static string MapToIRType (Type type, LlvmIrTypeCache cache, out bool isPointer)
-		{
-			return MapToIRType (type, cache, out _, out isPointer);
-		}
-
-		/// <summary>
-		/// Maps managed type to equivalent IR type.  Puts type size in <paramref name="size"/> and whether or not the type
-		/// is a pointer in <paramref name="isPointer"/>.  When a type is determined to be a pointer, <paramref name="size"/>
-		/// will be set to <c>0</c>, because this method doesn't have access to the generator target.  In order to adjust pointer
-		/// size, the instance method <see cref="GetIRType"/> must be called (private to the generator as other classes should not
-		/// have any need to know the pointer size).
-		/// </summary>
-		public static string MapToIRType (Type type, LlvmIrTypeCache cache, out ulong size, out bool isPointer)
-		{
-			type = GetActualType (type);
-			if (!type.IsNativePointer (cache) && basicTypeMap.TryGetValue (type, out BasicType typeDesc)) {
-				size = typeDesc.Size;
-				isPointer = false;
-				return typeDesc.Name;
-			}
-
-			// if it's not a basic type, then it's an opaque pointer
-			size = 0; // Will be determined by the specific target architecture class
-			isPointer = true;
-			return IRPointerType;
-		}
-
-		string GetIRType (GeneratorWriteContext context, Type type, out ulong size, out bool isPointer)
-		{
-			string ret = MapToIRType (type, context.TypeCache, out size, out isPointer);
-			if (isPointer && size == 0) {
-				size = target.NativePointerSize;
-			}
-
-			return ret;
-		}
-
-		public static bool IsFirstClassNonPointerType (Type type)
-		{
-			if (type == typeof(void)) {
-				return false;
-			}
-
-			return basicTypeMap.ContainsKey (type);
-		}
-
-		public static string QuoteStringNoEscape (string s)
-		{
-			return $"\"{s}\"";
-		}
-
-		public static string QuoteString (LlvmIrStringVariable variable, out ulong stringSize, bool nullTerminated = true)
-		{
-			if (variable.Encoding == LlvmIrStringEncoding.UTF8) {
-				var value = (StringHolder)variable.Value;
-				if (value.Data == null) {
-					throw new InvalidOperationException ("Internal error: null strings not supported here, they should be handled elsewhere.");
-				}
-
-				int byteCount = Encoding.UTF8.GetByteCount (value.Data);
-				var bytes = ArrayPool<byte>.Shared.Rent (byteCount);
-
-				try {
-					Encoding.UTF8.GetBytes (value.Data, 0, value.Data.Length, bytes, 0);
-					return QuoteUtf8String (bytes, byteCount, out stringSize, nullTerminated);
-				} finally {
-					ArrayPool<byte>.Shared.Return (bytes);
-				}
-			}
-
-			if (variable.Encoding == LlvmIrStringEncoding.Unicode) {
-				return QuoteUnicodeString (variable, out stringSize, nullTerminated);
-			}
-
-			throw new InvalidOperationException ($"Internal error: unsupported string encoding {variable.Encoding}");
-		}
-
-		static string QuoteUnicodeString (LlvmIrStringVariable variable, out ulong stringSize, bool nullTerminated = true)
-		{
-			var value = (StringHolder)variable.Value;
-			if (value.Data == null) {
-				throw new InvalidOperationException ("Internal error: null strings not supported here, they should be handled elsewhere.");
-			}
-
-			// Each character/lexeme is encoded as iXY u0xVXYZ + comma and a space, and on top of that we have two square brackets and a trailing nul
-			var sb = new StringBuilder ((value.Data.Length * 13) + 3); // rough estimate of capacity
-			sb.Append ('[');
-			for (int i = 0; i < value.Data.Length; i++) {
-				var ch = (short)value.Data[i];
-				if (i > 0) {
-					sb.Append (", ");
-				}
-				sb.Append ($"{variable.IrType} u0x{ch:X2}");
-			}
-
-			if (nullTerminated) {
-				if (value.Data.Length > 0) {
-					sb.Append (", ");
-				}
-				sb.Append ($"{variable.IrType} 0");
-			}
-			sb.Append (']');
-
-			stringSize = (ulong)value.Data.Length + (nullTerminated ? 1u : 0u);
-			return sb.ToString ();
-		}
-
-		static string QuoteUtf8String (byte[] bytes, int byteCount, out ulong stringSize, bool nullTerminated = true)
-		{
-			var sb = new StringBuilder (byteCount * 2); // rough estimate of capacity
-
-			byte b;
-			for (int i = 0; i < byteCount; i++) {
-				b = bytes [i];
-				if (b != '"' && b != '\\' && b >= 32 && b < 127) {
-					sb.Append ((char)b);
-					continue;
-				}
-
-				sb.Append ('\\');
-				sb.Append ($"{b:X2}");
-			}
-
-			stringSize = (ulong) byteCount;
-			if (nullTerminated) {
-				stringSize++;
-				sb.Append ("\\00");
-			}
-
-			return QuoteStringNoEscape (sb.ToString ());
-		}
-
-		static int GetCollectionOfTCount (Type type, object instance)
-		{
-			if (!type.ImplementsInterface (typeof (ICollection<>))) {
-				throw new ArgumentException ("Must implement the ICollection<T> interface", nameof (type));
-			}
-
-			PropertyInfo countProperty = type.GetProperty ("Count");
-			var ret = (int)countProperty.GetValue (instance);
-
-			if (ret < 0) {
-				throw new InvalidOperationException ($"Collection count is negative: {ret}");
-			}
-
-			return ret;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrIcmpCond.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrIcmpCond.cs
deleted file mode 100644
index 63b7602c02d..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrIcmpCond.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Represents comparison conditions for the LLVM IR icmp instruction.
-	/// </summary>
-	enum LlvmIrIcmpCond
-	{
-		/// <summary>
-		/// Equal comparison (eq).
-		/// </summary>
-		Equal,
-		/// <summary>
-		/// Not equal comparison (ne).
-		/// </summary>
-		NotEqual,
-		/// <summary>
-		/// Unsigned greater than comparison (ugt).
-		/// </summary>
-		UnsignedGreaterThan,
-		/// <summary>
-		/// Unsigned greater than or equal comparison (uge).
-		/// </summary>
-		UnsignedGreaterOrEqual,
-		/// <summary>
-		/// Unsigned less than comparison (ult).
-		/// </summary>
-		UnsignedLessThan,
-		/// <summary>
-		/// Unsigned less than or equal comparison (ule).
-		/// </summary>
-		UnsignedLessOrEqual,
-		/// <summary>
-		/// Signed greater than comparison (sgt).
-		/// </summary>
-		SignedGreaterThan,
-		/// <summary>
-		/// Signed greater than or equal comparison (sge).
-		/// </summary>
-		SignedGreaterOrEqual,
-		/// <summary>
-		/// Signed less than comparison (slt).
-		/// </summary>
-		SignedLessThan,
-		/// <summary>
-		/// Signed less than or equal comparison (sle).
-		/// </summary>
-		SignedLessOrEqual,
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrInstructions.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrInstructions.cs
deleted file mode 100644
index 52c6c4e3b6a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrInstructions.cs
+++ /dev/null
@@ -1,777 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-abstract class LlvmIrInstruction : LlvmIrFunctionBodyItem
-{
-	public string Mnemonic                          { get; }
-	public LlvmIrFunctionAttributeSet? AttributeSet { get; set; }
-
-	/// <summary>
-	/// TBAA (Type Based Alias Analysis) metadata item the instruction references, if any.
-	/// <see cref="LlvmIrModule.TbaaAnyPointer"/> for more information about TBAA.
-	/// </summary>
-	public LlvmIrMetadataItem? TBAA                 { get; set; }
-
-	protected LlvmIrInstruction (string mnemonic)
-	{
-		if (String.IsNullOrEmpty (mnemonic)) {
-			throw new ArgumentException ("must not be null or empty", nameof (mnemonic));
-		}
-
-		Mnemonic = mnemonic;
-	}
-
-	protected override void DoWrite (GeneratorWriteContext context, LlvmIrGenerator generator)
-	{
-		context.Output.Write (context.CurrentIndent);
-		WriteValueAssignment (context);
-		WritePreamble (context);
-		context.Output.Write (Mnemonic);
-		context.Output.Write (' ');
-		WriteBody (context);
-
-		if (TBAA != null) {
-			context.Output.Write (", !tbaa !");
-			context.Output.Write (TBAA.Name);
-		}
-
-		if (AttributeSet != null) {
-			context.Output.Write (" #");
-			context.Output.Write (AttributeSet.Number.ToString (CultureInfo.InvariantCulture));
-		}
-	}
-
-	/// <summary>
-	/// Write the '&lt;variable_reference&gt; = ' part of the instruction line.
-	/// </summary>
-	protected virtual void WriteValueAssignment (GeneratorWriteContext context)
-	{}
-
-	/// <summary>
-	/// Write part of the instruction that comes between the optional value assignment and the instruction
-	/// mnemonic.  If any text is written, it must end with a whitespace.
-	/// </summary>
-	protected virtual void WritePreamble (GeneratorWriteContext context)
-	{}
-
-	/// <summary>
-	/// Write the "body" of the instruction, that is the part that follows instruction mnemonic but precedes the
-	/// metadata and attribute set references.
-	/// </summary>
-	protected virtual void WriteBody (GeneratorWriteContext context)
-	{}
-
-	protected void WriteValue (GeneratorWriteContext context, Type type, object? value, bool isPointer)
-	{
-		if (value == null) {
-			if (!isPointer) {
-				throw new InvalidOperationException ($"Internal error: non-pointer type '{type}' must not have a `null` value");
-			}
-			context.Output.Write ("null");
-		} else if (value is LlvmIrVariable variable) {
-			context.Output.Write (variable.Reference);
-		} else if (value is bool) {
-			context.Output.Write ((bool)value ? "true" : "false");
-		} else {
-			context.Output.Write (MonoAndroidHelper.CultureInvariantToString (value));
-		}
-	}
-
-	protected void WriteAlignment (GeneratorWriteContext context, ulong typeSize, bool isPointer)
-	{
-		context.Output.Write (", align ");
-
-		ulong alignment;
-		if (isPointer) {
-			alignment = context.Target.NativePointerSize;
-		} else {
-			alignment = typeSize;
-		}
-		context.Output.Write (alignment.ToString (CultureInfo.InvariantCulture));
-	}
-}
-
-abstract class LlvmIrInstructionArgumentValuePlaceholder
-{
-	protected LlvmIrInstructionArgumentValuePlaceholder ()
-	{}
-
-	public abstract object? GetValue (LlvmIrModuleTarget target);
-}
-
-class LlvmIrInstructionPointerSizeArgumentPlaceholder : LlvmIrInstructionArgumentValuePlaceholder
-{
-	public override object? GetValue (LlvmIrModuleTarget target)
-	{
-		return target.NativePointerSize;
-	}
-}
-
-sealed class LlvmIrInstructions
-{
-	public class Alloca : LlvmIrInstruction
-	{
-		LlvmIrVariable result;
-
-		public Alloca (LlvmIrVariable result)
-			: base ("alloca")
-		{
-			this.result = result;
-		}
-
-		protected override void WriteValueAssignment (GeneratorWriteContext context)
-		{
-			if (result == null) {
-				return;
-			}
-
-			context.Output.Write (result.Reference);
-			context.Output.Write (" = ");
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			string irType = LlvmIrGenerator.MapToIRType (result.Type, context.TypeCache, out ulong size, out bool isPointer);
-
-			context.Output.Write (irType);
-			WriteAlignment (context, size, isPointer);
-		}
-	}
-
-	public class Br : LlvmIrInstruction
-	{
-		const string OpName = "br";
-
-		LlvmIrVariable? cond;
-		LlvmIrFunctionLabelItem ifTrue;
-		LlvmIrFunctionLabelItem? ifFalse;
-
-		/// <summary>
-		/// Outputs a conditional branch to label <paramref name="ifTrue"/> if condition <paramref name="cond"/> is
-		/// <c>true</c>, and to label <paramref name="ifFalse"/> otherwise.  <paramref name="cond"/> must be a variable
-		/// of type <c>bool</c>
-		/// </summary>
-		public Br (LlvmIrVariable cond, LlvmIrFunctionLabelItem ifTrue, LlvmIrFunctionLabelItem ifFalse)
-			: base (OpName)
-		{
-			if (cond.Type != typeof(bool)) {
-				throw new ArgumentException ($"Internal error: condition must refer to a variable of type 'bool', was '{cond.Type}' instead", nameof (cond));
-			}
-
-			this.cond = cond;
-			this.ifTrue = ifTrue;
-			this.ifFalse = ifFalse;
-		}
-
-		/// <summary>
-		/// Outputs an unconditional branch to label <paramref name="label"/>
-		/// </summary>
-		public Br (LlvmIrFunctionLabelItem label)
-			: base (OpName)
-		{
-			ifTrue = label;
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			if (cond == null) {
-				context.Output.Write ("label %");
-				context.Output.Write (ifTrue.Name);
-				return;
-			}
-
-			context.Output.Write ("i1 ");
-			context.Output.Write (cond.Reference);
-			context.Output.Write (", label %");
-			context.Output.Write (ifTrue.Name);
-			context.Output.Write (", label %");
-			context.Output.Write (ifFalse.Name);
-		}
-	}
-
-	public class Call : LlvmIrInstruction
-	{
-		LlvmIrFunction function;
-		IList<object?>? arguments;
-		LlvmIrVariable? result;
-
-		public LlvmIrCallMarker CallMarker { get; set; } = LlvmIrCallMarker.None;
-
-		/// <summary>
-		/// This needs to be set if we want to call a function via a local or global variable.  <see cref="LlvmIrFunction"/> passed
-		/// to the constructor is then used only to generate a type safe call, while function address comes from the variable assigned
-		/// to this property.
-		/// </summary>
-		public LlvmIrVariable? FuncPointer { get; set; }
-
-		public Call (LlvmIrFunction function, LlvmIrVariable? result = null, ICollection<object?>? arguments = null, LlvmIrVariable? funcPointer = null)
-			: base ("call")
-		{
-			this.function = function;
-			this.result = result;
-			this.FuncPointer = funcPointer;
-
-			if (function.Signature.ReturnType != typeof(void)) {
-				if (result == null) {
-					throw new ArgumentNullException (nameof (result), $"Internal error: function '{function.Signature.Name}' returns '{function.Signature.ReturnType}' and thus requires a result variable");
-				}
-			} else if (result != null) {
-				throw new ArgumentException ($"Internal error: function '{function.Signature.Name}' returns no value and yet a result variable was provided", nameof (result));
-			}
-
-			int argCount = function.Signature.Parameters.Count;
-			if (argCount != 0) {
-				if (arguments == null) {
-					throw new ArgumentNullException (nameof (arguments), $"Internal error: function '{function.Signature.Name}' requires {argCount} arguments");
-				}
-
-				if (function.UsesVarArgs) {
-					if (arguments.Count < argCount) {
-						throw new ArgumentException ($"Internal error: varargs function '{function.Signature.Name}' needs at least {argCount} fixed arguments, got {arguments.Count} instead");
-					}
-				} else if (arguments.Count != argCount) {
-					throw new ArgumentException ($"Internal error: function '{function.Signature.Name}' requires {argCount} arguments, but {arguments.Count} were provided", nameof (arguments));
-				}
-
-				this.arguments = new List<object> (arguments).AsReadOnly ();
-			}
-		}
-
-		protected override void WriteValueAssignment (GeneratorWriteContext context)
-		{
-			if (result == null) {
-				return;
-			}
-
-			context.Output.Write (result.Reference);
-			context.Output.Write (" = ");
-		}
-
-		protected override void WritePreamble (GeneratorWriteContext context)
-		{
-			string? callMarker = CallMarker switch {
-				LlvmIrCallMarker.None     => null,
-				LlvmIrCallMarker.Tail     => "tail",
-				LlvmIrCallMarker.NoTail   => "notail",
-				LlvmIrCallMarker.MustTail => "musttail",
-				_ => throw new InvalidOperationException ($"Internal error: call marker '{CallMarker}' not supported"),
-			};
-
-			if (!String.IsNullOrEmpty (callMarker)) {
-				context.Output.Write (callMarker);
-				context.Output.Write (' ');
-			}
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			if (function.ReturnsValue) {
-				LlvmIrGenerator.WriteReturnAttributes (context, function.Signature.ReturnAttributes);
-			}
-
-			context.Output.Write (LlvmIrGenerator.MapToIRType (function.Signature.ReturnType, context.TypeCache));
-
-			if (function.UsesVarArgs) {
-				context.Output.Write (" (");
-				for (int j = 0; j < function.Signature.Parameters.Count; j++) {
-					if (j > 0) {
-						context.Output.Write (", ");
-					}
-
-					LlvmIrFunctionParameter parameter = function.Signature.Parameters[j];
-					string irType = parameter.IsVarArgs ? "..." : LlvmIrGenerator.MapToIRType (parameter.Type, context.TypeCache);
-					context.Output.Write (irType);
-				}
-				context.Output.Write (')');
-			}
-
-			if (FuncPointer == null) {
-				context.Output.Write (" @");
-				context.Output.Write (function.Signature.Name);
-			} else {
-				context.Output.Write (' ');
-				context.Output.Write (FuncPointer.Reference);
-			}
-			context.Output.Write ('(');
-
-			bool isVararg = false;
-			int i;
-			for (i = 0; i < function.Signature.Parameters.Count; i++) {
-				if (i > 0) {
-					context.Output.Write (", ");
-				}
-
-				LlvmIrFunctionParameter parameter = function.Signature.Parameters[i];
-				if (parameter.IsVarArgs) {
-					isVararg = true;
-				}
-
-				WriteArgument (context, parameter, i, isVararg);
-			}
-
-			if (arguments != null) {
-				for (; i < arguments.Count; i++) {
-					context.Output.Write (", ");
-					WriteArgument (context, null, i, isVararg: true);
-				}
-			}
-
-			context.Output.Write (')');
-		}
-
-		void WriteArgument (GeneratorWriteContext context, LlvmIrFunctionParameter? parameter, int index, bool isVararg)
-		{
-			object? value = arguments[index];
-			if (value is LlvmIrInstructionArgumentValuePlaceholder placeholder) {
-				value = placeholder.GetValue (context.Target);
-			}
-
-			string irType;
-			if (!isVararg) {
-				irType = LlvmIrGenerator.MapToIRType (parameter.Type, context.TypeCache);
-			} else if (value is LlvmIrVariable v1) {
-				irType = LlvmIrGenerator.MapToIRType (v1.Type, context.TypeCache);
-			} else {
-				if (value == null) {
-					// We have no way of verifying the vararg parameter type if value is null, so we'll assume it's a pointer.
-					// If our assumption is wrong, llc will fail and signal the error
-					irType = "ptr";
-				} else {
-					irType = LlvmIrGenerator.MapToIRType (value.GetType (), context.TypeCache);
-				}
-			}
-
-			context.Output.Write (irType);
-			if (parameter != null) {
-				LlvmIrGenerator.WriteParameterAttributes (context, parameter);
-			}
-			context.Output.Write (' ');
-
-			if (value == null) {
-				if (!parameter.Type.IsNativePointer (context.TypeCache)) {
-					throw new InvalidOperationException ($"Internal error: value for argument {index} to function '{function.Signature.Name}' must not be null");
-				}
-
-				context.Output.Write ("null");
-				return;
-			}
-
-			if (value is LlvmIrVariable v2) {
-				context.Output.Write (v2.Reference);
-				return;
-			}
-
-			if (parameter != null && !parameter.Type.IsAssignableFrom (value.GetType ())) {
-				throw new InvalidOperationException ($"Internal error: value type '{value.GetType ()}' for argument {index} to function '{function.Signature.Name}' is invalid. Expected '{parameter.Type}' or compatible");
-			}
-
-			if (value is string || value is StringHolder) {
-				context.Output.Write (context.Module.LookupRequiredVariableForString (StringHolder.AsHolder (value)).Reference);
-				return;
-			}
-
-			if (LlvmIrGenerator.IsFirstClassNonPointerType (value.GetType ())) {
-				context.Output.Write (MonoAndroidHelper.CultureInvariantToString (value));
-				return;
-			}
-
-			throw new InvalidOperationException ($"Internal error: unsupported type '{value.GetType ()}' in call to function '{function.Signature.Name}'");
-		}
-	}
-
-	public class Ext : LlvmIrInstruction
-	{
-		const string FpextOpCode = "fpext";
-		const string SextOpCode  = "sext";
-		const string ZextOpCode  = "zext";
-
-		LlvmIrVariable result;
-		LlvmIrVariable source;
-		Type targetType;
-
-		public Ext (LlvmIrVariable source, Type targetType, LlvmIrVariable result)
-			: base (GetOpCode (targetType))
-		{
-			this.source = source;
-			this.targetType = targetType;
-			this.result = result;
-		}
-
-		protected override void WriteValueAssignment (GeneratorWriteContext context)
-		{
-			context.Output.Write (result.Reference);
-			context.Output.Write (" = ");
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			context.Output.Write (LlvmIrGenerator.MapToIRType (source.Type, context.TypeCache));
-			context.Output.Write (' ');
-			context.Output.Write (source.Reference);
-			context.Output.Write (" to ");
-			context.Output.Write ( LlvmIrGenerator.MapToIRType (targetType, context.TypeCache));
-		}
-
-		static string GetOpCode (Type targetType)
-		{
-			if (targetType == typeof(double)) {
-				return FpextOpCode;
-			} else if (targetType == typeof(int)) {
-				return SextOpCode;
-			} else if (targetType == typeof(uint)) {
-				return ZextOpCode;
-			} else {
-				throw new InvalidOperationException ($"Unsupported target type for upcasting: {targetType}");
-			}
-		}
-	}
-
-	public class Icmp : LlvmIrInstruction
-	{
-		LlvmIrIcmpCond cond;
-		LlvmIrVariable op1;
-		object? op2;
-		LlvmIrVariable result;
-
-		public Icmp (LlvmIrIcmpCond cond, LlvmIrVariable op1, object? op2, LlvmIrVariable result)
-			: base ("icmp")
-		{
-			if (result.Type != typeof(bool)) {
-				throw new ArgumentException ($"Internal error: result must be a variable of type 'bool', was '{result.Type}' instead", nameof (result));
-			}
-
-			this.cond = cond;
-			this.op1 = op1;
-			this.op2 = op2;
-			this.result = result;
-		}
-
-		protected override void WriteValueAssignment (GeneratorWriteContext context)
-		{
-			context.Output.Write (result.Reference);
-			context.Output.Write (" = ");
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			string irType = LlvmIrGenerator.MapToIRType (op1.Type, context.TypeCache, out ulong size, out bool isPointer);
-			string condOp = cond switch {
-				LlvmIrIcmpCond.Equal => "eq",
-				LlvmIrIcmpCond.NotEqual => "ne",
-				LlvmIrIcmpCond.UnsignedGreaterThan => "ugt",
-				LlvmIrIcmpCond.UnsignedGreaterOrEqual => "uge",
-				LlvmIrIcmpCond.UnsignedLessThan => "ult",
-				LlvmIrIcmpCond.UnsignedLessOrEqual => "ule",
-				LlvmIrIcmpCond.SignedGreaterThan => "sgt",
-				LlvmIrIcmpCond.SignedGreaterOrEqual => "sge",
-				LlvmIrIcmpCond.SignedLessThan => "slt",
-				LlvmIrIcmpCond.SignedLessOrEqual => "sle",
-				_ => throw new InvalidOperationException ($"Unsupported `icmp` conditional '{cond}'"),
-			};
-
-			context.Output.Write (condOp);
-			context.Output.Write (' ');
-			context.Output.Write (irType);
-			context.Output.Write (' ');
-			context.Output.Write (op1.Reference);
-			context.Output.Write (", ");
-			WriteValue (context, op1.Type, op2, isPointer);
-		}
-	}
-
-	public class Load : LlvmIrInstruction
-	{
-		LlvmIrVariable source;
-		LlvmIrVariable result;
-
-		public Load (LlvmIrVariable source, LlvmIrVariable result)
-			: base ("load")
-		{
-			this.source = source;
-			this.result = result;
-		}
-
-		protected override void WriteValueAssignment (GeneratorWriteContext context)
-		{
-			context.Output.Write (result.Reference);
-			context.Output.Write (" = ");
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			string irType = LlvmIrGenerator.MapToIRType (result.Type, context.TypeCache, out ulong size, out bool isPointer);
-			context.Output.Write (irType);
-			context.Output.Write (", ptr ");
-			WriteValue (context, result.Type, source, isPointer);
-			WriteAlignment (context, size, isPointer);
-		}
-	}
-
-	public class Phi : LlvmIrInstruction
-	{
-		sealed class Node
-		{
-			public readonly LlvmIrVariableReference? Variable;
-			public readonly LlvmIrFunctionLabelItem? Label;
-
-			public Node (LlvmIrVariableReference? variable, LlvmIrFunctionLabelItem? label)
-			{
-				Variable = variable;
-				Label = label;
-			}
-		}
-
-		LlvmIrVariable result;
-
-		readonly List<Node> nodes;
-
-		public Phi (LlvmIrVariable result)
-			: base ("phi")
-		{
-			nodes = new ();
-			this.result = result;
-		}
-
-		/// <summary>
-		/// Represents the `phi` instruction form we use the most throughout marshal methods generator - one which refers to an if/else block and where
-		/// **both** value:label pairs are **required**.  Parameters <paramref name="label1"/> and <paramref name="label2"/> are nullable because, in theory,
-		/// it is possible that <see cref="LlvmIrFunctionBody"/> hasn't had the required blocks defined prior to adding the `phi` instruction and, thus,
-		/// we must check for the possibility here.
-		/// </summary>
-		public Phi (LlvmIrVariable result, LlvmIrVariableReference val1, LlvmIrFunctionLabelItem? label1, LlvmIrVariableReference val2, LlvmIrFunctionLabelItem? label2)
-			: base ("phi")
-		{
-			this.result = result;
-
-			nodes = new () {
-				new Node (val1, label1 ?? throw new ArgumentNullException (nameof (label1))),
-				new Node (val2, label2 ?? throw new ArgumentNullException (nameof (label2))),
-			};
-		}
-
-		public void AddNode (LlvmIrFunctionLabelItem label, LlvmIrVariableReference? variable)
-		{
-			nodes.Add (new Node (variable, label));
-		}
-
-		protected override void WriteValueAssignment (GeneratorWriteContext context)
-		{
-			context.Output.Write (result.Reference);
-			context.Output.Write (" = ");
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			context.Output.Write (LlvmIrGenerator.MapToIRType (result.Type, context.TypeCache));
-			context.IncreaseIndent ();
-			bool first = true;
-			foreach (Node node in nodes) {
-				if (!first) {
-					context.Output.WriteLine (',');
-				} else {
-					first = false;
-					context.Output.WriteLine ();
-				}
-				context.Output.Write (context.CurrentIndent);
-				WriteNode (context, node);
-			}
-			context.DecreaseIndent ();
-			// context.Output.Write (" [");
-			// context.Output.Write (val1.Reference);
-			// context.Output.Write (", %");
-			// context.Output.Write (label1.Name);
-			// context.Output.Write ("], [");
-			// context.Output.Write (val2.Reference);
-			// context.Output.Write (", %");
-			// context.Output.Write (label2.Name);
-			// context.Output.Write (']');
-		}
-		void WriteNode (GeneratorWriteContext context, Node node)
-		{
-			if (node.Label == null) {
-				throw new NotImplementedException ("Internal error: null labels not implemented");
-			}
-			context.Output.Write (" [");
-			context.Output.Write (node.Variable == null ? "null" : node.Variable.Reference);
-			context.Output.Write (", %");
-			context.Output.Write (node.Label.Name);
-			context.Output.Write (']');
-		}
-	}
-
-	public class Ret : LlvmIrInstruction
-	{
-		Type retvalType;
-		object? retVal;
-
-		public Ret (Type retvalType, object? retval = null)
-			: base ("ret")
-		{
-			this.retvalType = retvalType;
-			retVal = retval;
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			if (retvalType == typeof(void)) {
-				context.Output.Write ("void");
-				return;
-			}
-
-			string irType = LlvmIrGenerator.MapToIRType (retvalType, context.TypeCache, out bool isPointer);
-			context.Output.Write (irType);
-			context.Output.Write (' ');
-
-			WriteValue (context, retvalType, retVal, isPointer);
-		}
-	}
-
-	public class Store : LlvmIrInstruction
-	{
-		const string Opcode = "store";
-
-		object? from;
-		LlvmIrVariable to;
-
-		public Store (LlvmIrVariable from, LlvmIrVariable to)
-			: base (Opcode)
-		{
-			this.from = from;
-			this.to = to;
-		}
-
-		public Store (object from, LlvmIrVariable to)
-			: base (Opcode)
-		{
-			this.from = from;
-			this.to = to;
-		}
-
-		/// <summary>
-		/// Stores `null` in the indicated variable
-		/// </summary>
-		public Store (LlvmIrVariable to)
-			: base (Opcode)
-		{
-			this.to = to;
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			Type type = from?.GetType () ?? to.Type;
-			string irType = LlvmIrGenerator.MapToIRType (type, context.TypeCache, out ulong size, out bool isPointer);
-
-			context.Output.Write (irType);
-			context.Output.Write (' ');
-
-			WriteValue (context, to.Type, from, isPointer);
-
-			context.Output.Write (", ptr ");
-			context.Output.Write (to.Reference);
-
-			WriteAlignment (context, size, isPointer);
-		}
-	}
-
-	public class Switch<T> : LlvmIrInstruction where T: struct
-	{
-		// Since we can't use System.Numerics.IBinaryInteger<T>, this is the poor man's verification that T is acceptable for us
-		static readonly HashSet<Type> acceptedTypes = new () {
-			typeof (byte),
-			typeof (sbyte),
-			typeof (short),
-			typeof (ushort),
-			typeof (int),
-			typeof (uint),
-			typeof (long),
-			typeof (ulong),
-		};
-		readonly LlvmIrVariable value;
-		readonly LlvmIrFunctionLabelItem defaultDest;
-		readonly string? automaticLabelPrefix;
-		ulong automaticLabelCounter = 0;
-		List<(T constant, LlvmIrFunctionLabelItem label, string? comment)>? items;
-		public Switch (LlvmIrVariable value, LlvmIrFunctionLabelItem defaultDest, string? automaticLabelPrefix = null)
-		: base ("switch")
-		{
-			if (!acceptedTypes.Contains (typeof(T))) {
-				throw new NotSupportedException ($"Type '{typeof(T)}' is unsupported, only integer types are accepted");
-			}
-			if (value.Type != typeof (T)) {
-				throw new ArgumentException ($"Must refer to value of type '{typeof(T)}'", nameof (value));
-			}
-			this.value = value;
-			this.defaultDest = defaultDest;
-			this.automaticLabelPrefix = automaticLabelPrefix;
-			if (!String.IsNullOrEmpty (automaticLabelPrefix)) {
-				items = new ();
-			}
-		}
-
-		protected override void WriteBody (GeneratorWriteContext context)
-		{
-			string irType = LlvmIrGenerator.MapToIRType (value.Type, context.TypeCache, out _, out bool isPointer);
-			context.Output.Write (irType);
-			context.Output.Write (' ');
-			WriteValue (context, value.Type, value, isPointer);
-			context.Output.Write (", label %");
-			context.Output.Write (defaultDest.Name);
-			context.Output.WriteLine (" [");
-			context.IncreaseIndent ();
-			foreach ((T constant, LlvmIrFunctionLabelItem label, string? comment) in items) {
-				context.Output.Write (context.CurrentIndent);
-				context.Output.Write (irType);
-				context.Output.Write (' ');
-				context.Generator.WriteValue (context, value.Type, constant);
-				context.Output.Write (", label %");
-				context.Output.Write (label.Name);
-				if (context.EmitComments && !String.IsNullOrEmpty (comment)) {
-					context.Output.Write (' ');
-					context.Generator.WriteCommentLine (context, comment);
-				} else {
-					context.Output.WriteLine ();
-				}
-			}
-			context.DecreaseIndent ();
-			context.Output.Write (context.CurrentIndent);
-			context.Output.Write (']');
-		}
-		public LlvmIrFunctionLabelItem Add (T val, LlvmIrFunctionLabelItem? dest = null, string? comment = null)
-		{
-			var label = MakeLabel (dest);
-			items.Add ((val, label, comment));
-			return label;
-		}
-		void EnsureValidity (LlvmIrFunctionLabelItem? dest)
-		{
-			if (dest != null) {
-				return;
-			}
-			if (String.IsNullOrEmpty (automaticLabelPrefix)) {
-				throw new InvalidOperationException ($"Internal error: automatic label management requested, but prefix not defined");
-			}
-		}
-		LlvmIrFunctionLabelItem MakeLabel (LlvmIrFunctionLabelItem? maybeDest)
-		{
-			EnsureValidity (maybeDest);
-			if (maybeDest != null) {
-				return maybeDest;
-			}
-			var ret = new LlvmIrFunctionLabelItem (automaticLabelCounter == 0 ? automaticLabelPrefix : $"{automaticLabelPrefix}{automaticLabelCounter}");
-			automaticLabelCounter++;
-			return ret;
-		}
-	}
-
-	public class Unreachable : LlvmIrInstruction
-	{
-		public Unreachable ()
-			: base ("unreachable")
-		{}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrKnownMetadata.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrKnownMetadata.cs
deleted file mode 100644
index ca941708b7a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrKnownMetadata.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#nullable enable
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Contains constants for well-known LLVM IR metadata names.
-/// </summary>
-sealed class LlvmIrKnownMetadata
-{
-	/// <summary>
-	/// The "llvm.module.flags" metadata name used for module-level flags.
-	/// </summary>
-	public const string LlvmModuleFlags = "llvm.module.flags";
-	/// <summary>
-	/// The "llvm.ident" metadata name used for module identification.
-	/// </summary>
-	public const string LlvmIdent = "llvm.ident";
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrLinkage.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrLinkage.cs
deleted file mode 100644
index 9e84138ae9b..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrLinkage.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Variable linkage, see https://llvm.org/docs/LangRef.html#linkage
-	/// </summary>
-	[Flags]
-	enum LlvmIrLinkage
-	{
-		/// <summary>
-		/// Default linkage (external).
-		/// </summary>
-		Default             = 0 << 0,
-		/// <summary>
-		/// Private linkage - symbol is not accessible from outside the module.
-		/// </summary>
-		Private             = 1 << 0,
-		/// <summary>
-		/// Internal linkage - symbol is accessible within the current module only.
-		/// </summary>
-		Internal            = 1 << 1,
-		/// <summary>
-		/// Available externally linkage - symbol is available for inspection but not emission.
-		/// </summary>
-		AvailableExternally = 1 << 2,
-		/// <summary>
-		/// Link once linkage - symbol may be defined in multiple modules but only one will be chosen.
-		/// </summary>
-		LinkOnce            = 1 << 3,
-		/// <summary>
-		/// Weak linkage - symbol may be overridden by other definitions.
-		/// </summary>
-		Weak                = 1 << 4,
-		/// <summary>
-		/// Common linkage - for uninitialized global variables.
-		/// </summary>
-		Common              = 1 << 5,
-		/// <summary>
-		/// Appending linkage - for arrays that should be concatenated with arrays from other modules.
-		/// </summary>
-		Appending           = 1 << 6,
-		/// <summary>
-		/// Extern weak linkage - weak reference to external symbol.
-		/// </summary>
-		ExternWeak          = 1 << 7,
-		/// <summary>
-		/// Link once ODR linkage - link once with One Definition Rule enforcement.
-		/// </summary>
-		LinkOnceODR         = 1 << 8,
-		/// <summary>
-		/// External linkage - symbol is accessible from outside the module.
-		/// </summary>
-		External            = 1 << 9,
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrMetadataManager.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrMetadataManager.cs
deleted file mode 100644
index 688b0bc0d61..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrMetadataManager.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	class LlvmIrMetadataField
-	{
-		readonly LlvmIrTypeCache cache;
-
-		public string Contents { get; }
-		public bool IsReference { get; }
-
-		public LlvmIrMetadataField (LlvmIrMetadataField other)
-		{
-			this.cache = other.cache;
-			Contents = other.Contents;
-			IsReference = other.IsReference;
-		}
-
-		public LlvmIrMetadataField (LlvmIrTypeCache cache, string value, bool isReference = false)
-		{
-			this.cache = cache;
-			if (isReference) {
-				Contents = $"!{value}";
-			} else {
-				Contents = QuoteString (value);
-			}
-
-			IsReference = isReference;
-		}
-
-		public LlvmIrMetadataField (LlvmIrTypeCache cache, object value)
-		{
-			this.cache = cache;
-			Contents = FormatValue (value);
-			IsReference = false;
-		}
-
-		string FormatValue (object value)
-		{
-			Type vt = value.GetType ();
-
-			if (vt == typeof(string)) {
-				return QuoteString ((string)value);
-			}
-
-			string irType = LlvmIrGenerator.MapToIRType (vt, cache);
-			return $"{irType} {MonoAndroidHelper.CultureInvariantToString (value)}";
-		}
-
-		string QuoteString (string value)
-		{
-			return $"!{LlvmIrGenerator.QuoteStringNoEscape (value)}";
-		}
-	}
-
-	class LlvmIrMetadataItem
-	{
-		readonly LlvmIrTypeCache cache;
-
-		List<LlvmIrMetadataField> fields;
-
-		public string Name { get; }
-
-		public LlvmIrMetadataItem (LlvmIrMetadataItem other)
-		{
-			this.cache = other.cache;
-			Name = other.Name;
-			fields = new List<LlvmIrMetadataField> ();
-			foreach (LlvmIrMetadataField field in other.fields) {
-				fields.Add (new LlvmIrMetadataField (field));
-			}
-		}
-
-		public LlvmIrMetadataItem (LlvmIrTypeCache cache, string name)
-		{
-			if (name.Length == 0) {
-				throw new ArgumentException ("must not be empty", nameof (name));
-			}
-
-			this.cache = cache;
-			Name = name;
-			fields = new List<LlvmIrMetadataField> ();
-		}
-
-		public void AddReferenceField (string referenceName)
-		{
-			fields.Add (new LlvmIrMetadataField (cache, referenceName, isReference: true));
-		}
-
-		public void AddReferenceField (LlvmIrMetadataItem referencedItem)
-		{
-			AddReferenceField (referencedItem.Name);
-		}
-
-		public void AddField (object value)
-		{
-			AddField (new LlvmIrMetadataField (cache, value));
-		}
-
-		public void AddField (LlvmIrMetadataField field)
-		{
-			fields.Add (field);
-		}
-
-		public string Render ()
-		{
-			var sb = new StringBuilder ($"!{Name} = !{{");
-			bool first = true;
-
-			foreach (LlvmIrMetadataField field in fields) {
-				if (first) {
-					first = false;
-				} else {
-					sb.Append (", ");
-				}
-
-				sb.Append (field.Contents);
-			}
-
-			sb.Append ('}');
-
-			return sb.ToString ();
-		}
-	}
-
-	class LlvmIrMetadataManager
-	{
-		readonly LlvmIrTypeCache cache;
-		ulong counter = 0;
-		List<LlvmIrMetadataItem> items = new List<LlvmIrMetadataItem> ();
-		Dictionary<string, LlvmIrMetadataItem> nameToItem = new Dictionary<string, LlvmIrMetadataItem> (StringComparer.Ordinal);
-
-		public List<LlvmIrMetadataItem> Items => items;
-
-		public LlvmIrMetadataManager (LlvmIrTypeCache cache)
-		{
-			this.cache = cache;
-		}
-
-		public LlvmIrMetadataManager (LlvmIrMetadataManager other)
-		{
-			this.cache = other.cache;
-			foreach (LlvmIrMetadataItem item in other.items) {
-				var newItem = new LlvmIrMetadataItem (item);
-				items.Add (newItem);
-				nameToItem.Add (newItem.Name, newItem);
-			}
-			counter = other.counter;
-		}
-
-		public LlvmIrMetadataItem Add (string name, params object[]? values)
-		{
-			if (nameToItem.ContainsKey (name)) {
-				throw new InvalidOperationException ($"Internal error: metadata item '{name}' has already been added");
-			}
-
-			var ret = new LlvmIrMetadataItem (cache, name);
-
-			if (values != null && values.Length > 0) {
-				foreach (object v in values) {
-					ret.AddField (v);
-				}
-			}
-			items.Add (ret);
-
-			nameToItem.Add (name, ret);
-			return ret;
-		}
-
-		public LlvmIrMetadataItem AddNumbered (params object[]? values)
-		{
-			string name = counter.ToString (CultureInfo.InvariantCulture);
-			counter++;
-			return Add (name, values);
-		}
-
-		public LlvmIrMetadataItem? GetItem (string name)
-		{
-			if (nameToItem.TryGetValue (name, out LlvmIrMetadataItem? item)) {
-				return item;
-			}
-
-			return null;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs
deleted file mode 100644
index 95abb042ea3..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModule.cs
+++ /dev/null
@@ -1,712 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	partial class LlvmIrModule
-	{
-		/// <summary>
-		/// Global variable type to be used to output name:value string arrays. This is a notational shortcut,
-		/// do **NOT** change the type without understanding how it affects the rest of code.
-		/// </summary>
-		public static readonly Type NameValueArrayType = typeof(IDictionary<string, string>);
-
-		public IList<LlvmIrFunction>? ExternalFunctions         { get; private set; }
-		public IList<LlvmIrFunction>? Functions                 { get; private set; }
-		public IList<LlvmIrFunctionAttributeSet>? AttributeSets { get; private set; }
-		public IList<StructureInfo>? Structures                 { get; private set; }
-		public IList<LlvmIrGlobalVariable>? GlobalVariables     { get; private set; }
-		public IList<LlvmIrStringGroup>? Strings                { get; private set; }
-
-		/// <summary>
-		/// TBAA stands for "Type Based Alias Analysis" and is used by LLVM to implemente a description of
-		/// a higher level language typesystem to LLVM IR (in which memory doesn't have types).  This metadata
-		/// item describes pointer usage for certain instructions we output and is common enough to warrant
-		/// a shortcut property like that.  More information about TBAA can be found at https://llvm.org/docs/LangRef.html#tbaa-metadata
-		/// </summary>
-		public LlvmIrMetadataItem TbaaAnyPointer                => tbaaAnyPointer;
-
-		Dictionary<LlvmIrFunctionAttributeSet, LlvmIrFunctionAttributeSet>? attributeSets;
-		Dictionary<LlvmIrFunction, LlvmIrFunction>? externalFunctions;
-		Dictionary<LlvmIrFunction, LlvmIrFunction>? functions;
-		Dictionary<Type, StructureInfo>? structures;
-		LlvmIrStringManager? stringManager;
-		LlvmIrMetadataManager metadataManager;
-		LlvmIrMetadataItem tbaaAnyPointer;
-		LlvmIrBufferManager? bufferManager;
-
-		List<LlvmIrGlobalVariable>? globalVariables;
-
-		LlvmIrFunction? puts;
-		LlvmIrFunction? abort;
-
-		TaskLoggingHelper log;
-
-		public readonly LlvmIrTypeCache TypeCache;
-
-		public string? DefaultStringGroup { get; set; }
-
-		public LlvmIrModule (LlvmIrTypeCache cache, TaskLoggingHelper log)
-		{
-			this.log = log;
-			TypeCache = cache;
-			metadataManager = new LlvmIrMetadataManager (cache);
-
-			// Only model agnostic items can be added here
-			LlvmIrMetadataItem flags = metadataManager.Add (LlvmIrKnownMetadata.LlvmModuleFlags);
-			flags.AddReferenceField (metadataManager.AddNumbered (LlvmIrModuleMergeBehavior.Error, "wchar_size", 4));
-			flags.AddReferenceField (metadataManager.AddNumbered (LlvmIrModuleMergeBehavior.Max, "PIC Level", 2));
-
-			LlvmIrMetadataItem ident = metadataManager.Add (LlvmIrKnownMetadata.LlvmIdent);
-			LlvmIrMetadataItem identValue = metadataManager.AddNumbered ($".NET for Android {XABuildConfig.XamarinAndroidBranch} @ {XABuildConfig.XamarinAndroidCommitHash}");
-			ident.AddReferenceField (identValue.Name);
-
-			tbaaAnyPointer = metadataManager.AddNumbered ();
-			LlvmIrMetadataItem anyPointer = metadataManager.AddNumbered ("any pointer");
-			LlvmIrMetadataItem omnipotentChar = metadataManager.AddNumbered ("omnipotent char");
-			LlvmIrMetadataItem simpleCppTBAA = metadataManager.AddNumbered ("Simple C++ TBAA");
-
-			anyPointer.AddReferenceField (omnipotentChar.Name);
-			anyPointer.AddField ((ulong)0);
-
-			omnipotentChar.AddReferenceField (simpleCppTBAA);
-			omnipotentChar.AddField ((ulong)0);
-
-			tbaaAnyPointer.AddReferenceField (anyPointer);
-			tbaaAnyPointer.AddReferenceField (anyPointer);
-			tbaaAnyPointer.AddField ((ulong)0);
-		}
-
-		/// <summary>
-		/// Return a metadata manager instance which includes copies of all the target-agnostic metadata items.
-		/// We must not modify the original manager since each target may have conflicting values for certain
-		/// flags.
-		/// </summary>
-		public LlvmIrMetadataManager GetMetadataManagerCopy () => new LlvmIrMetadataManager (metadataManager);
-
-		/// <summary>
-		/// Perform any tasks that need to be done after construction is complete.
-		/// </summary>
-		public void AfterConstruction ()
-		{
-			if (externalFunctions != null) {
-				List<LlvmIrFunction> list = externalFunctions.Values.ToList ();
-				list.Sort ((LlvmIrFunction a, LlvmIrFunction b) => a.Signature.Name.CompareTo (b.Signature.Name));
-				ExternalFunctions = list.AsReadOnly ();
-			}
-
-			if (functions != null) {
-				List<LlvmIrFunction> list = functions.Values.ToList ();
-				// TODO: sort or not?
-				Functions = list.AsReadOnly ();
-			}
-
-			if (attributeSets != null) {
-				List<LlvmIrFunctionAttributeSet> list = attributeSets.Values.ToList ();
-				list.Sort ((LlvmIrFunctionAttributeSet a, LlvmIrFunctionAttributeSet b) => a.Number.CompareTo (b.Number));
-				AttributeSets = list.AsReadOnly ();
-			}
-
-			if (structures != null) {
-				List<StructureInfo> list = structures.Values.ToList ();
-				list.Sort ((StructureInfo a, StructureInfo b) => a.Name.CompareTo (b.Name));
-				Structures = list.AsReadOnly ();
-			}
-
-			if (stringManager != null && stringManager.StringGroups.Count > 0) {
-				Strings = stringManager.StringGroups.AsReadOnly ();
-			}
-
-			GlobalVariables = globalVariables?.AsReadOnly ();
-		}
-
-		public void Add (LlvmIrFunction func)
-		{
-			if (functions == null) {
-				functions = new Dictionary<LlvmIrFunction, LlvmIrFunction> ();
-			}
-
-			if (functions.TryGetValue (func, out LlvmIrFunction existingFunc)) {
-				throw new InvalidOperationException ($"Internal error: identical function has already been added (\"{func.Signature.Name}\")");
-			}
-
-			functions.Add (func, func);
-		}
-
-		public LlvmIrInstructions.Call CreatePuts (string text, LlvmIrVariable result)
-		{
-			EnsurePuts ();
-			RegisterString (text);
-			return new LlvmIrInstructions.Call (puts, result, new List<object?> { text });
-		}
-
-		/// <summary>
-		/// Generate code to call the `puts(3)` C library function to print a simple string to standard output.
-		/// </summary>
-		public LlvmIrInstructions.Call AddPuts (LlvmIrFunction function, string text, LlvmIrVariable result)
-		{
-			EnsurePuts ();
-			RegisterString (text);
-			return function.Body.Call (puts, result, new List<object?> { text });
-		}
-
-		void EnsurePuts ()
-		{
-			if (puts != null) {
-				return;
-			}
-
-			var puts_params = new List<LlvmIrFunctionParameter> {
-				new (typeof(string), "s"),
-			};
-
-			var puts_sig = new LlvmIrFunctionSignature (
-				name: "puts",
-				returnType: typeof(int),
-				parameters: puts_params
-			);
-			puts_sig.ReturnAttributes.NoUndef = true;
-
-			puts = DeclareExternalFunction (puts_sig, MakePutsAttributeSet ());
-		}
-
-		LlvmIrFunctionAttributeSet MakePutsAttributeSet ()
-		{
-			var ret = new LlvmIrFunctionAttributeSet {
-				new NofreeFunctionAttribute (),
-				new NounwindFunctionAttribute (),
-			};
-
-			ret.DoNotAddTargetSpecificAttributes = true;
-			return AddAttributeSet (ret);
-		}
-
-		public LlvmIrInstructions.Call CreateAbort ()
-		{
-			EnsureAbort ();
-			return new LlvmIrInstructions.Call (abort);
-		}
-
-		public LlvmIrInstructions.Call AddAbort (LlvmIrFunction function)
-		{
-			EnsureAbort ();
-			LlvmIrInstructions.Call ret = function.Body.Call (abort);
-			function.Body.Unreachable ();
-
-			return ret;
-		}
-
-		void EnsureAbort ()
-		{
-			if (abort != null) {
-				return;
-			}
-
-			var abort_sig = new LlvmIrFunctionSignature (name: "abort", returnType: typeof(void));
-			abort = DeclareExternalFunction (abort_sig, MakeAbortAttributeSet ());
-		}
-
-		LlvmIrFunctionAttributeSet MakeAbortAttributeSet ()
-		{
-			var ret = new LlvmIrFunctionAttributeSet {
-				new NoreturnFunctionAttribute (),
-				new NounwindFunctionAttribute (),
-				new NoTrappingMathFunctionAttribute (true),
-				new StackProtectorBufferSizeFunctionAttribute (8),
-			};
-
-			return AddAttributeSet (ret);
-		}
-
-		public void AddIfThenElse (LlvmIrFunction function, LlvmIrVariable result, LlvmIrIcmpCond condition, LlvmIrVariable conditionVariable, object? conditionComparand, ICollection<LlvmIrInstruction> codeIfThen, ICollection<LlvmIrInstruction>? codeIfElse = null)
-		{
-			function.Body.Icmp (condition, conditionVariable, conditionComparand, result);
-
-			var labelIfThen = new LlvmIrFunctionLabelItem ();
-			LlvmIrFunctionLabelItem? labelIfElse = codeIfElse != null ? new LlvmIrFunctionLabelItem () : null;
-			var labelIfDone = new LlvmIrFunctionLabelItem ();
-
-			function.Body.Br (result, labelIfThen, labelIfElse == null ? labelIfDone : labelIfElse);
-			function.Body.Add (labelIfThen);
-
-			AddInstructions (codeIfThen);
-
-			if (codeIfElse != null) {
-				function.Body.Add (labelIfElse);
-				AddInstructions (codeIfElse);
-			}
-
-			function.Body.Add (labelIfDone);
-
-			void AddInstructions (ICollection<LlvmIrInstruction> instructions)
-			{
-				foreach (LlvmIrInstruction ins in instructions) {
-					function.Body.Add (ins);
-				}
-			}
-		}
-
-		/// <summary>
-		/// A shortcut way to add a global variable without first having to create an instance of <see cref="LlvmIrGlobalVariable"/> first. This overload
-		/// requires the <paramref name="value"/> parameter to not be <c>null</c>.
-		/// </summary>
-		public LlvmIrGlobalVariable AddGlobalVariable (string name, object value, LlvmIrVariableOptions? options = null, string? comment = null)
-		{
-			if (value == null) {
-				throw new ArgumentNullException (nameof (value));
-			}
-
-			return AddGlobalVariable (value.GetType (), name, value, options, comment);
-		}
-
-		/// <summary>
-		/// A shortcut way to add a global variable without first having to create an instance of <see cref="LlvmIrGlobalVariable"/> first.
-		/// </summary>
-		public LlvmIrGlobalVariable AddGlobalVariable (Type type, string name, object? value, LlvmIrVariableOptions? options = null, string? comment = null)
-		{
-			LlvmIrGlobalVariable ret;
-			if (type == typeof(string)) {
-				// The cast to `string?` is intentionally meant to throw if `value` type isn't a string.
-				ret = new LlvmIrStringVariable (name, new StringHolder ((string?)value), options) {
-					Comment = comment,
-				};
-				AddStringGlobalVariable ((LlvmIrStringVariable)ret);
-			} else {
-				ret = new LlvmIrGlobalVariable (type, name, options) {
-					Value = value,
-					Comment = comment,
-				};
-				Add (ret);
-			}
-
-			return ret;
-		}
-
-		public void Add (LlvmIrGlobalVariable variable, string stringGroupName, string? stringGroupComment = null, string? symbolSuffix = null)
-		{
-			EnsureValidGlobalVariableType (variable);
-
-			if (IsStringVariable (variable)) {
-				AddStringGlobalVariable ((LlvmIrStringVariable)variable, stringGroupName, stringGroupComment, symbolSuffix);
-				return;
-			}
-
-			if (IsStringArrayVariable (variable)) {
-				AddStringArrayGlobalVariable (variable, stringGroupName, stringGroupComment, symbolSuffix);
-				return;
-			}
-
-			throw new InvalidOperationException ("Internal error: this overload is ONLY for adding string or array-of-string variables");
-		}
-
-		public void Add (IList<LlvmIrGlobalVariable> variables)
-		{
-			foreach (LlvmIrGlobalVariable variable in variables) {
-				Add (variable);
-			}
-		}
-
-		public void Add (LlvmIrGlobalVariable variable)
-		{
-			EnsureValidGlobalVariableType (variable);
-
-			if (IsStringVariable (variable)) {
-				AddStringGlobalVariable ((LlvmIrStringVariable)variable);
-				return;
-			}
-
-			if (IsStringArrayVariable (variable)) {
-				AddStringArrayGlobalVariable (variable);
-				return;
-			}
-
-			if (IsStructureArrayVariable (variable)) {
-				AddStructureArrayGlobalVariable (variable);
-				return;
-			}
-
-			if (IsStructureVariable (variable)) {
-				PrepareStructure (variable);
-			}
-
-			AddStandardGlobalVariable (variable);
-		}
-
-		void PrepareStructure (LlvmIrGlobalVariable variable)
-		{
-			var structure = variable.Value as StructureInstance;
-			if (structure == null) {
-				return;
-			}
-
-			PrepareStructure (structure);
-		}
-
-		void PrepareStructure (StructureInstance structure)
-		{
-			foreach (StructureMemberInfo smi in structure.Info.Members) {
-				if (smi.IsIRStruct) {
-					object? instance = structure.Obj == null ? null : smi.GetValue (structure.Obj);
-					if (instance == null) {
-						continue;
-					}
-
-					StructureInfo si = GetStructureInfo (smi.MemberType);
-					PrepareStructure (new GeneratorStructureInstance (si, instance));
-					continue;
-				}
-
-				if (smi.Info.IsNativePointerToPreallocatedBuffer (TypeCache, out ulong bufferSize)) {
-					if (bufferSize == 0) {
-						bufferSize = structure.Info.GetBufferSizeFromProvider (smi, structure);
-					}
-
-					AddAutomaticBuffer (structure, smi, bufferSize);
-					continue;
-				}
-
-				if (smi.MemberType != typeof(string)) {
-					continue;
-				}
-
-				string? value = smi.GetValue (structure.Obj) as string;
-				if (value != null) {
-					RegisterString (value, stringGroupName: structure.Info.Name, symbolSuffix: smi.Info.Name, encoding: smi.Info.GetStringEncoding (TypeCache));
-				}
-			}
-		}
-
-		void AddAutomaticBuffer (StructureInstance structure, StructureMemberInfo smi, ulong bufferSize)
-		{
-			if (bufferManager == null) {
-				bufferManager = new LlvmIrBufferManager ();
-			}
-
-			string bufferName = bufferManager.Allocate (structure, smi, bufferSize);
-			var buffer = new LlvmIrGlobalVariable (typeof(List<byte>), bufferName, LlvmIrVariableOptions.LocalWritable) {
-				ZeroInitializeArray = true,
-				ArrayItemCount = bufferSize,
-			};
-			Add (buffer);
-		}
-
-		void AddStandardGlobalVariable (LlvmIrGlobalVariable variable)
-		{
-			if (globalVariables == null) {
-				globalVariables = new List<LlvmIrGlobalVariable> ();
-			}
-
-			globalVariables.Add (variable);
-		}
-
-		[MemberNotNull (nameof (stringManager))]
-		void EnsureStringManager ()
-		{
-			if (stringManager == null) {
-				stringManager = new LlvmIrStringManager (log, DefaultStringGroup);
-			}
-		}
-
-		void AddStringGlobalVariable (LlvmIrStringVariable variable, string? stringGroupName = null, string? stringGroupComment = null, string? symbolSuffix = null)
-		{
-			RegisterString (variable, stringGroupName, stringGroupComment, symbolSuffix);
-			AddStandardGlobalVariable (variable);
-		}
-
-		public void RegisterString (LlvmIrStringVariable variable, string? stringGroupName = null, string? stringGroupComment = null, string? symbolSuffix = null)
-		{
-			EnsureStringManager ();
-			stringManager.Add (variable, stringGroupName, stringGroupComment, symbolSuffix);
-		}
-
-		public void RegisterString (string value, string? stringGroupName = null, string? stringGroupComment = null, string? symbolSuffix = null,
-			LlvmIrStringEncoding encoding = LlvmIrStringEncoding.UTF8, StringComparison comparison = StringComparison.Ordinal)
-		{
-			EnsureStringManager ();
-			stringManager.Add (value, stringGroupName, stringGroupComment, symbolSuffix, encoding, comparison);
-		}
-
-		void AddStructureArrayGlobalVariable (LlvmIrGlobalVariable variable)
-		{
-			if (variable.Value == null) {
-				AddStandardGlobalVariable (variable);
-				return;
-			}
-
-			// For simplicity we support only arrays with homogenous entry types
-			StructureInfo? info = null;
-			ulong index = 0;
-
-			foreach (StructureInstance structure in (IEnumerable<StructureInstance>)variable.Value) {
-				if (info == null) {
-					info = structure.Info;
-					if (info.HasPreAllocatedBuffers) {
-						// let's group them...
-						Add (new LlvmIrGroupDelimiterVariable ());
-					}
-				}
-
-				if (structure.Type != info.Type) {
-					throw new InvalidOperationException ($"Internal error: only arrays with homogenous element types are currently supported.  All entries were expected to be of type '{info.Type}', but the '{structure.Type}' type was encountered.");
-				}
-
-				// This is a bit of a kludge to make a specific corner case work seamlessly from the LlvmIrModule user's point of view.
-				// The scenario is used in ApplicationConfigNativeAssemblyGenerator and it involves an array of structures where each
-				// array index contains the same object in structure.Obj but each instance needs to allocate a unique buffer at runtime.
-				// LlvmIrBufferManager makes it possible, but it must be able to uniquely identify each instance, which in this scenario
-				// wouldn't be possible if we had to rely only on the StructureInstance contents.  Enter `StructureInstance.IndexInArray`,
-				// which is used to create unique buffers and unambiguously assign them to each structure instance.
-				//
-				// See LlvmIrBufferManager for how it is used.
-				structure.IndexInArray = index++;
-
-				PrepareStructure (structure);
-			}
-
-			if (info != null && info.HasPreAllocatedBuffers) {
-				Add (new LlvmIrGroupDelimiterVariable ());
-			}
-
-			AddStandardGlobalVariable (variable);
-		}
-
-		void AddStringArrayGlobalVariable (LlvmIrGlobalVariable variable, string? stringGroupName = null, string? stringGroupComment = null, string? symbolSuffix = null)
-		{
-			if (variable.Value == null) {
-				AddStandardGlobalVariable (variable);
-				return;
-			}
-
-			List<string>? entries = null;
-			if (NameValueArrayType.IsAssignableFrom (variable.Type)) {
-				entries = new List<string> ();
-				var dict = (IDictionary<string, string>)variable.Value;
-				foreach (var kvp in dict) {
-					Register (kvp.Key);
-					Register (kvp.Value);
-				}
-			} else if (typeof(ICollection<string>).IsAssignableFrom (variable.Type)) {
-				foreach (string? s in (ICollection<string?>)variable.Value) {
-					Register (s);
-				}
-			}  else {
-				throw new InvalidOperationException ($"Internal error: unsupported string array type `{variable.Type}'");
-			}
-
-			AddStandardGlobalVariable (variable);
-
-			void Register (string? value)
-			{
-				if (value == null) {
-					return;
-				}
-
-				RegisterString (value, stringGroupName, stringGroupComment, symbolSuffix);
-			}
-		}
-
-		bool IsStringArrayVariable (LlvmIrGlobalVariable variable)
-		{
-			if (NameValueArrayType.IsAssignableFrom (variable.Type)) {
-				if (variable.Value != null &&  !NameValueArrayType.IsAssignableFrom (variable.Value.GetType ())) {
-					throw new InvalidOperationException ($"Internal error: name:value array variable must have its value set to either `null` or `{NameValueArrayType}`");
-				}
-
-				return true;
-			}
-
-			var ctype = typeof(ICollection<string>);
-			if (ctype.IsAssignableFrom (variable.Type)) {
-				if (variable.Value != null && !ctype.IsAssignableFrom (variable.Value.GetType ())) {
-					throw new InvalidOperationException ($"Internal error: string array variable must have its value set to either `null` or implement `{ctype}`");
-				}
-
-				return true;
-			}
-
-			if (variable.Type == typeof(string[])) {
-				if (variable.Value != null && variable.Value.GetType () != typeof(string[])) {
-					throw new InvalidOperationException ($"Internal error: string array variable must have its value set to either `null` or be `{typeof(string[])}`");
-				}
-
-				return true;
-			}
-
-			return false;
-		}
-
-		bool IsStringVariable (LlvmIrGlobalVariable variable)
-		{
-			if (variable.Type != typeof(string)) {
-				return false;
-			}
-
-			if (variable.Value != null && variable.Value.GetType () != typeof(string)) {
-				throw new InvalidOperationException ("Internal error: variable of string type must have its value set to either `null` or a string");
-			}
-
-			return true;
-		}
-
-		bool IsStructureArrayVariable (LlvmIrGlobalVariable variable)
-		{
-			if (typeof(StructureInstance[]).IsAssignableFrom (variable.Type)) {
-				return true;
-			}
-
-			if (!variable.Type.IsArray ()) {
-				return false;
-			}
-
-			Type elementType = variable.Type.GetArrayElementType ();
-			return typeof(StructureInstance).IsAssignableFrom (elementType);
-		}
-
-		bool IsStructureVariable (LlvmIrGlobalVariable variable)
-		{
-			if (!typeof(StructureInstance).IsAssignableFrom (variable.Type)) {
-				return false;
-			}
-
-			if (variable.Value != null && !typeof(StructureInstance).IsAssignableFrom (variable.Value.GetType ())) {
-				throw new InvalidOperationException ("Internal error: variable referring to a structure instance must have its value set to either `null` or an instance of the StructureInstance class");
-			}
-
-			return true;
-		}
-
-		void EnsureValidGlobalVariableType (LlvmIrGlobalVariable variable)
-		{
-			if (variable is LlvmIrStringVariable) {
-				throw new ArgumentException ("Internal error: do not add instances of LlvmIrStringVariable, simply set variable value to the desired string instead");
-			}
-		}
-
-		/// <summary>
-		/// Looks up LLVM variable for a previously registered string given in <paramref name="value"/>.  If a variable isn't found,
-		/// an exception is thrown.  This is primarily used by <see cref="LlvmIrGenerator"/> to look up variables related to strings which
-		/// are part of structure instances.  Such strings **MUST** be registered by <see cref="LlvmIrModule"/> and, thus, failure to do
-		/// so is an internal error.
-		/// </summary>
-		public LlvmIrStringVariable LookupRequiredVariableForString (StringHolder value)
-		{
-			LlvmIrStringVariable? sv = stringManager?.Lookup (value);
-			if (sv == null) {
-				throw new InvalidOperationException ($"Internal error: string '{value}' wasn't registered with string manager");
-			}
-
-			return sv;
-		}
-
-		public string LookupRequiredBufferVariableName (StructureInstance structure, StructureMemberInfo smi)
-		{
-			if (bufferManager == null) {
-				throw new InvalidOperationException ("Internal error: no buffer variables have been registed with the buffer manager");
-			}
-
-			string? variableName = bufferManager.GetBufferVariableName (structure, smi);
-			if (variableName.IsNullOrEmpty ()) {
-				throw new InvalidOperationException ($"Internal error: buffer for member '{smi.Info.Name}' of structure '{structure.Info.Name}' (index {structure.IndexInArray}) not found");
-			}
-
-			return variableName;
-		}
-
-		/// <summary>
-		/// Add a new attribute set.  The caller MUST use the returned value to refer to the set, instead of the one passed
-		/// as parameter, since this function de-duplicates sets and may return a previously added one that's identical to
-		/// the new one.
-		/// </summary>
-		public LlvmIrFunctionAttributeSet AddAttributeSet (LlvmIrFunctionAttributeSet attrSet)
-		{
-			if (attributeSets == null) {
-				attributeSets = new Dictionary<LlvmIrFunctionAttributeSet, LlvmIrFunctionAttributeSet> ();
-			}
-
-			if (attributeSets.TryGetValue (attrSet, out LlvmIrFunctionAttributeSet existingSet)) {
-				return existingSet;
-			}
-			attrSet.Number = (uint)attributeSets.Count;
-			attributeSets.Add (attrSet, attrSet);
-
-			return attrSet;
-		}
-
-		/// <summary>
-		/// Add a new external function declaration.  The caller MUST use the returned value to refer to the function, instead
-		/// of the one passed as parameter, since this function de-duplicates function declarations and may return a previously
-		/// added one that's identical to the new one.
-		/// </summary>
-		public LlvmIrFunction DeclareExternalFunction (LlvmIrFunction func)
-		{
-			if (externalFunctions == null) {
-				externalFunctions = new Dictionary<LlvmIrFunction, LlvmIrFunction> ();
-			}
-
-			if (externalFunctions.TryGetValue (func, out LlvmIrFunction existingFunc)) {
-				return existingFunc;
-			}
-
-			externalFunctions.Add (func, func);
-			return func;
-		}
-
-		public LlvmIrFunction DeclareExternalFunction (LlvmIrFunctionSignature sig, LlvmIrFunctionAttributeSet? attrSet = null)
-		{
-			return DeclareExternalFunction (new LlvmIrFunction (sig, attrSet));
-		}
-
-		/// <summary>
-		/// Since LLVM IR is strongly typed, it requires each structure to be properly declared before it is
-		/// used throughout the code.  This method uses reflection to scan the managed type <typeparamref name="T"/>
-		/// and record the information for future use.  The returned <see cref="StructureInfo<T>"/> structure contains
-		/// the description.  It is used later on not only to declare the structure in output code, but also to generate
-		/// data from instances of <typeparamref name="T"/>.  This method is typically called from the <see cref="LlvmIrGenerator.MapStructures"/>
-		/// method.
-		/// </summary>
-		public StructureInfo MapStructure<T> ()
-		{
-			if (structures == null) {
-				structures = new Dictionary<Type, StructureInfo> ();
-			}
-
-			Type t = typeof(T);
-			if (!t.IsClass && !t.IsValueType) {
-				throw new InvalidOperationException ($"{t} must be a class or a struct");
-			}
-
-			if (structures.TryGetValue (t, out StructureInfo sinfo)) {
-				return (StructureInfo)sinfo;
-			}
-
-			var ret = new StructureInfo (this, t, TypeCache);
-			structures.Add (t, ret);
-
-			return ret;
-		}
-
-		internal StructureInfo GetStructureInfo (Type type)
-		{
-			if (structures == null) {
-				throw new InvalidOperationException ($"Internal error: no structures have been mapped, cannot return info for {type}");
-			}
-
-			foreach (var kvp in structures) {
-				StructureInfo si = kvp.Value;
-				if (si.Type != type) {
-					continue;
-				}
-
-				return si;
-			}
-
-			throw new InvalidOperationException ($"Internal error: unmapped structure {type}");
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleAArch64.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleAArch64.cs
deleted file mode 100644
index fbc7d1357aa..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleAArch64.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System.Collections.Generic;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// LLVM IR module target implementation for the AArch64 (ARM 64-bit) architecture.
-/// Provides AArch64-specific data layout, target triple, and compilation settings.
-/// </summary>
-class LlvmIrModuleAArch64 : LlvmIrModuleTarget
-{
-	/// <summary>
-	/// Gets the data layout specification for the AArch64 architecture.
-	/// </summary>
-	public override LlvmIrDataLayout DataLayout { get; }
-	/// <summary>
-	/// Gets the LLVM target triple for AArch64 Android.
-	/// </summary>
-	public override string Triple => "aarch64-unknown-linux-android21";
-	/// <summary>
-	/// Gets the Android target architecture (ARM 64-bit).
-	/// </summary>
-	public override AndroidTargetArch TargetArch => AndroidTargetArch.Arm64;
-	/// <summary>
-	/// Gets the size of native pointers in bytes (8 for 64-bit architecture).
-	/// </summary>
-	public override uint NativePointerSize => 8;
-	/// <summary>
-	/// Gets a value indicating whether this is a 64-bit architecture.
-	/// </summary>
-	public override bool Is64Bit => true;
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrModuleAArch64"/> class.
-	/// Sets up the AArch64-specific data layout based on Android NDK specifications.
-	/// </summary>
-	public LlvmIrModuleAArch64 ()
-	{
-		//
-		// As per Android NDK:
-		//   target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-		//
-		DataLayout = new LlvmIrDataLayout {
-			LittleEndian = true,
-			Mangling = new LlvmIrDataLayoutMangling (LlvmIrDataLayoutManglingOption.ELF),
-
-			IntegerAlignment = new List<LlvmIrDataLayoutIntegerAlignment> {
-				new LlvmIrDataLayoutIntegerAlignment (size: 8, abi: 8, pref: 32), // i8
-				new LlvmIrDataLayoutIntegerAlignment (size: 16, abi: 16, pref: 32), // i16
-				new LlvmIrDataLayoutIntegerAlignment (size: 64, abi: 64), // i64
-				new LlvmIrDataLayoutIntegerAlignment (size: 128, abi: 128), // i128
-			},
-
-			NativeIntegerWidths = new List<uint> { 32, 64},
-			StackAlignment = 128,
-		};
-	}
-
-	/// <summary>
-	/// Adds AArch64-specific attributes to the function attribute set.
-	/// </summary>
-	/// <param name="attrSet">The function attribute set to add AArch64-specific attributes to.</param>
-	public override void AddTargetSpecificAttributes (LlvmIrFunctionAttributeSet attrSet)
-	{
-		attrSet.Add (new TargetCpuFunctionAttribute ("generic"));
-		attrSet.Add (new TargetFeaturesFunctionAttribute ("+fix-cortex-a53-835769,+neon,+outline-atomics,+v8a"));
-	}
-
-	/// <summary>
-	/// Adds AArch64-specific metadata to the metadata manager.
-	/// </summary>
-	/// <param name="manager">The metadata manager to add AArch64-specific metadata to.</param>
-	public override void AddTargetSpecificMetadata (LlvmIrMetadataManager manager)
-	{
-		LlvmIrMetadataItem flags = GetFlagsMetadata (manager);
-
-		flags.AddReferenceField (manager.AddNumbered (LlvmIrModuleMergeBehavior.Error, "branch-target-enforcement", 0));
-		flags.AddReferenceField (manager.AddNumbered (LlvmIrModuleMergeBehavior.Error, "sign-return-address", 0));
-		flags.AddReferenceField (manager.AddNumbered (LlvmIrModuleMergeBehavior.Error, "sign-return-address-all", 0));
-		flags.AddReferenceField (manager.AddNumbered (LlvmIrModuleMergeBehavior.Error, "sign-return-address-with-bkey", 0));
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleArmV7a.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleArmV7a.cs
deleted file mode 100644
index f7ff54f8a48..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleArmV7a.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System.Collections.Generic;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-class LlvmIrModuleArmV7a : LlvmIrModuleTarget
-{
-	public override LlvmIrDataLayout DataLayout { get; }
-	public override string Triple => "armv7-unknown-linux-android21";
-	public override AndroidTargetArch TargetArch => AndroidTargetArch.Arm;
-	public override uint NativePointerSize => 4;
-	public override bool Is64Bit => false;
-
-	public LlvmIrModuleArmV7a ()
-	{
-		//
-		// As per Android NDK:
-		//   target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
-		//
-		DataLayout = new LlvmIrDataLayout {
-			LittleEndian = true,
-			Mangling = new LlvmIrDataLayoutMangling (LlvmIrDataLayoutManglingOption.ELF),
-
-			PointerSize = new List<LlvmIrDataLayoutPointerSize> {
-				new LlvmIrDataLayoutPointerSize (size: 32, abi: 32),
-			},
-
-			FunctionPointerAlignment = new LlvmIrDataLayoutFunctionPointerAlignment (LlvmIrDataLayoutFunctionPointerAlignmentType.Independent, abi: 8),
-
-			IntegerAlignment = new List<LlvmIrDataLayoutIntegerAlignment> {
-				new LlvmIrDataLayoutIntegerAlignment (size: 64, abi: 64), // i64
-			},
-
-			VectorAlignment = new List<LlvmIrDataLayoutVectorAlignment> {
-				new LlvmIrDataLayoutVectorAlignment (size: 128, abi: 64, pref: 128), // v128
-			},
-
-			AggregateObjectAlignment = new LlvmIrDataLayoutAggregateObjectAlignment (abi: 0, pref: 32),
-			NativeIntegerWidths = new List<uint> { 32 },
-			StackAlignment = 64,
-		};
-	}
-
-	public override void AddTargetSpecificAttributes (LlvmIrFunctionAttributeSet attrSet)
-	{
-		attrSet.Add (new TargetCpuFunctionAttribute ("generic"));
-		attrSet.Add (new TargetFeaturesFunctionAttribute ("+armv7-a,+d32,+dsp,+fp64,+neon,+vfp2,+vfp2sp,+vfp3,+vfp3d16,+vfp3d16sp,+vfp3sp,-aes,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fullfp16,-sha2,-thumb-mode,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp"));
-	}
-
-	public override void SetParameterFlags (LlvmIrFunctionParameter parameter)
-	{
-		base.SetParameterFlags (parameter);
-		SetIntegerParameterUpcastFlags (parameter);
-	}
-
-	public override void AddTargetSpecificMetadata (LlvmIrMetadataManager manager)
-	{
-		LlvmIrMetadataItem flags = GetFlagsMetadata (manager);
-
-		flags.AddReferenceField (manager.AddNumbered (LlvmIrModuleMergeBehavior.Error, "min_enum_size", 4));
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleMergeBehavior.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleMergeBehavior.cs
deleted file mode 100644
index 62254347fea..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleMergeBehavior.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Constants defining LLVM IR module merge behaviors for module flags metadata.
-	/// See: https://llvm.org/docs/LangRef.html#module-flags-metadata
-	/// </summary>
-	static class LlvmIrModuleMergeBehavior
-	{
-		/// <summary>
-		/// Error merge behavior - linking fails if flag values differ.
-		/// </summary>
-		public const int Error        = 1;
-		/// <summary>
-		/// Warning merge behavior - warning is emitted if flag values differ.
-		/// </summary>
-		public const int Warning      = 2;
-		/// <summary>
-		/// Require merge behavior - linking fails if the flag is not present in the other module.
-		/// </summary>
-		public const int Require      = 3;
-		/// <summary>
-		/// Override merge behavior - the flag value is overridden.
-		/// </summary>
-		public const int Override     = 4;
-		/// <summary>
-		/// Append merge behavior - the flag values are appended.
-		/// </summary>
-		public const int Append       = 5;
-		/// <summary>
-		/// Append unique merge behavior - the flag values are appended only if unique.
-		/// </summary>
-		public const int AppendUnique = 6;
-		/// <summary>
-		/// Max merge behavior - the maximum value is used.
-		/// </summary>
-		public const int Max          = 7;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleTarget.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleTarget.cs
deleted file mode 100644
index 6b6226fcf27..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleTarget.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Abstract base class for LLVM IR module targets that define architecture-specific code generation settings.
-/// Each target architecture implements this class to provide specific data layout, triple, and compilation settings.
-/// </summary>
-abstract class LlvmIrModuleTarget
-{
-	/// <summary>
-	/// Gets the data layout specification for this target architecture.
-	/// </summary>
-	public abstract LlvmIrDataLayout DataLayout  { get; }
-	/// <summary>
-	/// Gets the LLVM target triple for this architecture.
-	/// </summary>
-	public abstract string Triple                { get; }
-	/// <summary>
-	/// Gets the Android target architecture this module target represents.
-	/// </summary>
-	public abstract AndroidTargetArch TargetArch { get; }
-	/// <summary>
-	/// Gets the size of native pointers in bytes for this target architecture.
-	/// </summary>
-	public abstract uint NativePointerSize       { get; }
-	/// <summary>
-	/// Gets a value indicating whether this target architecture is 64-bit.
-	/// </summary>
-	public abstract bool Is64Bit                 { get; }
-
-	/// <summary>
-	/// Adds target-specific attributes which are common to many attribute sets. Usually this specifies CPU type, tuning and
-	/// features.
-	/// </summary>
-	/// <param name="attrSet">The function attribute set to add target-specific attributes to.</param>
-	public virtual void AddTargetSpecificAttributes (LlvmIrFunctionAttributeSet attrSet)
-	{}
-
-	/// <summary>
-	/// Adds target-specific metadata to the metadata manager.
-	/// </summary>
-	/// <param name="manager">The metadata manager to add target-specific metadata to.</param>
-	public virtual void AddTargetSpecificMetadata (LlvmIrMetadataManager manager)
-	{}
-
-	/// <summary>
-	/// Sets target-specific parameter flags for function parameters.
-	/// </summary>
-	/// <param name="parameter">The function parameter to set flags on.</param>
-	public virtual void SetParameterFlags (LlvmIrFunctionParameter parameter)
-	{
-		if (!parameter.NoUndef.HasValue) {
-			parameter.NoUndef = true;
-		}
-	}
-
-	/// <summary>
-	/// Sets the <c>zeroext</c> or <c>signext</c> attributes on the parameter, if not set previously and if
-	/// the parameter is a small integral type.  Out of our supported architectures, all except AArch64 set
-	/// the flags, thus the reason to put this method in the base class.
-	/// </summary>
-	/// <param name="parameter">The function parameter to potentially set upcasting flags on.</param>
-	protected void SetIntegerParameterUpcastFlags (LlvmIrFunctionParameter parameter)
-	{
-		if (parameter.Type == typeof(bool) ||
-		    parameter.Type == typeof(byte) ||
-		    parameter.Type == typeof(char) ||
-		    parameter.Type == typeof(ushort))
-		{
-			if (!parameter.ZeroExt.HasValue) {
-				parameter.ZeroExt = true;
-				parameter.SignExt = false;
-			}
-			return;
-		}
-
-		if (parameter.Type == typeof(sbyte) ||
-		    parameter.Type == typeof(short))
-		{
-			if (!parameter.SignExt.HasValue) {
-				parameter.SignExt = true;
-				parameter.ZeroExt = false;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Gets the alignment for aggregate objects (structures, arrays) based on the maximum field alignment and data size.
-	/// </summary>
-	/// <param name="maxFieldAlignment">The maximum alignment requirement of any field in the aggregate.</param>
-	/// <param name="dataSize">The total size of the aggregate data.</param>
-	/// <returns>The alignment to use for the aggregate object.</returns>
-	public virtual int GetAggregateAlignment (int maxFieldAlignment, ulong dataSize)
-	{
-		return maxFieldAlignment;
-	}
-
-	/// <summary>
-	/// Gets or creates the module flags metadata item for this target.
-	/// </summary>
-	/// <param name="manager">The metadata manager to get the flags from.</param>
-	/// <returns>The module flags metadata item.</returns>
-	protected LlvmIrMetadataItem GetFlagsMetadata (LlvmIrMetadataManager manager)
-	{
-		LlvmIrMetadataItem? flags = manager.GetItem (LlvmIrKnownMetadata.LlvmModuleFlags);
-		if (flags == null) {
-			flags = manager.Add (LlvmIrKnownMetadata.LlvmModuleFlags);
-		}
-
-		return flags;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX64.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX64.cs
deleted file mode 100644
index ccd4140b824..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX64.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System.Collections.Generic;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// LLVM IR module target implementation for the x86-64 (Intel/AMD 64-bit) architecture.
-/// Provides x86-64-specific data layout, target triple, and compilation settings.
-/// </summary>
-class LlvmIrModuleX64 : LlvmIrModuleTarget
-{
-	/// <summary>
-	/// Gets the data layout specification for the x86-64 architecture.
-	/// </summary>
-	public override LlvmIrDataLayout DataLayout { get; }
-	/// <summary>
-	/// Gets the LLVM target triple for x86-64 Android.
-	/// </summary>
-	public override string Triple => "x86_64-unknown-linux-android21";
-	/// <summary>
-	/// Gets the Android target architecture (x86-64).
-	/// </summary>
-	public override AndroidTargetArch TargetArch => AndroidTargetArch.X86_64;
-	/// <summary>
-	/// Gets the size of native pointers in bytes (8 for 64-bit architecture).
-	/// </summary>
-	public override uint NativePointerSize => 8;
-	/// <summary>
-	/// Gets a value indicating whether this is a 64-bit architecture.
-	/// </summary>
-	public override bool Is64Bit => true;
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrModuleX64"/> class.
-	/// Sets up the x86-64-specific data layout based on Android NDK specifications.
-	/// </summary>
-	public LlvmIrModuleX64 ()
-	{
-		//
-		// As per Android NDK:
-		//   target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-		//
-		DataLayout = new LlvmIrDataLayout {
-			LittleEndian = true,
-			Mangling = new LlvmIrDataLayoutMangling (LlvmIrDataLayoutManglingOption.ELF),
-
-			PointerSize = new List<LlvmIrDataLayoutPointerSize> {
-				new LlvmIrDataLayoutPointerSize (size: 32, abi: 32) {
-					AddressSpace = 270,
-				},
-				new LlvmIrDataLayoutPointerSize (size: 32, abi: 32) {
-					AddressSpace = 271,
-				},
-				new LlvmIrDataLayoutPointerSize (size: 64, abi: 64) {
-					AddressSpace = 272,
-				},
-			},
-
-			IntegerAlignment = new List<LlvmIrDataLayoutIntegerAlignment> {
-				new LlvmIrDataLayoutIntegerAlignment (size: 64, abi: 64), // i64
-			},
-
-			FloatAlignment = new List<LlvmIrDataLayoutFloatAlignment> {
-				new LlvmIrDataLayoutFloatAlignment (size: 80, abi: 128), // f80
-			},
-
-			NativeIntegerWidths = new List<uint> { 8, 16, 32, 64 },
-			StackAlignment = 128,
-		};
-	}
-
-	/// <summary>
-	/// Adds x86-64-specific attributes to the function attribute set.
-	/// </summary>
-	/// <param name="attrSet">The function attribute set to add x86-64-specific attributes to.</param>
-	public override void AddTargetSpecificAttributes (LlvmIrFunctionAttributeSet attrSet)
-	{
-		attrSet.Add (new TargetCpuFunctionAttribute ("x86-64"));
-		attrSet.Add (new TargetFeaturesFunctionAttribute ("+crc32,+cx16,+cx8,+fxsr,+mmx,+popcnt,+sse,+sse2,+sse3,+sse4.1,+sse4.2,+ssse3,+x87"));
-		attrSet.Add (new TuneCpuFunctionAttribute ("generic"));
-	}
-
-	/// <summary>
-	/// Sets x86-64-specific parameter flags for function parameters.
-	/// </summary>
-	/// <param name="parameter">The function parameter to set flags on.</param>
-	public override void SetParameterFlags (LlvmIrFunctionParameter parameter)
-	{
-		base.SetParameterFlags (parameter);
-		SetIntegerParameterUpcastFlags (parameter);
-	}
-
-	/// <summary>
-	/// Gets the alignment for aggregate objects according to the System V ABI for x86-64.
-	/// Aggregates 16 bytes or larger must be aligned to at least 16 bytes.
-	/// </summary>
-	/// <param name="maxFieldAlignment">The maximum alignment requirement of any field in the aggregate.</param>
-	/// <param name="dataSize">The total size of the aggregate data.</param>
-	/// <returns>The alignment to use for the aggregate object.</returns>
-	public override int GetAggregateAlignment (int maxFieldAlignment, ulong dataSize)
-	{
-		// System V ABI for x86_64 mandates that any aggregates 16 bytes or more long will
-		// be aligned at at least 16 bytes
-		//
-		//  See: https://refspecs.linuxbase.org/elf/x86_64-abi-0.99.pdf (Section '3.1.2 Data Representation', "Aggregates and Unions")
-		//
-		if (dataSize >= 16 && maxFieldAlignment < 16) {
-			return 16;
-		}
-
-		return maxFieldAlignment;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX86.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX86.cs
deleted file mode 100644
index d06a5f1a0a7..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrModuleX86.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System.Collections.Generic;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// LLVM IR module target implementation for the x86 (Intel/AMD 32-bit) architecture.
-/// Provides x86-specific data layout, target triple, and compilation settings.
-/// </summary>
-class LlvmIrModuleX86 : LlvmIrModuleTarget
-{
-	/// <summary>
-	/// Gets the data layout specification for the x86 architecture.
-	/// </summary>
-	public override LlvmIrDataLayout DataLayout { get; }
-	/// <summary>
-	/// Gets the LLVM target triple for x86 Android.
-	/// </summary>
-	public override string Triple => "i686-unknown-linux-android21";
-	/// <summary>
-	/// Gets the Android target architecture (x86).
-	/// </summary>
-	public override AndroidTargetArch TargetArch => AndroidTargetArch.X86;
-	/// <summary>
-	/// Gets the size of native pointers in bytes (4 for 32-bit architecture).
-	/// </summary>
-	public override uint NativePointerSize => 4;
-	/// <summary>
-	/// Gets a value indicating whether this is a 64-bit architecture.
-	/// </summary>
-	public override bool Is64Bit => false;
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrModuleX86"/> class.
-	/// Sets up the x86-specific data layout based on Android NDK specifications.
-	/// </summary>
-	public LlvmIrModuleX86 ()
-	{
-		//
-		// As per Android NDK:
-		//   target datalayout = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128"
-		//
-		DataLayout = new LlvmIrDataLayout {
-			LittleEndian = true,
-			Mangling = new LlvmIrDataLayoutMangling (LlvmIrDataLayoutManglingOption.ELF),
-
-			PointerSize = new List<LlvmIrDataLayoutPointerSize> {
-				new LlvmIrDataLayoutPointerSize (size: 32, abi: 32),
-				new LlvmIrDataLayoutPointerSize (size: 32, abi: 32) {
-					AddressSpace = 270,
-				},
-				new LlvmIrDataLayoutPointerSize (size: 32, abi: 32) {
-					AddressSpace = 271,
-				},
-				new LlvmIrDataLayoutPointerSize (size: 64, abi: 64) {
-					AddressSpace = 272,
-				},
-			},
-
-			FloatAlignment = new List<LlvmIrDataLayoutFloatAlignment> {
-				new LlvmIrDataLayoutFloatAlignment (size: 64, abi: 32, pref: 64), // f64
-				new LlvmIrDataLayoutFloatAlignment (size: 80, abi: 32), // f80
-			},
-
-			NativeIntegerWidths = new List<uint> { 8, 16, 32 },
-			StackAlignment = 128,
-		};
-	}
-
-	/// <summary>
-	/// Adds x86-specific attributes to the function attribute set.
-	/// </summary>
-	/// <param name="attrSet">The function attribute set to add x86-specific attributes to.</param>
-	public override void AddTargetSpecificAttributes (LlvmIrFunctionAttributeSet attrSet)
-	{
-		attrSet.Add (new TargetCpuFunctionAttribute ("i686"));
-		attrSet.Add (new TargetFeaturesFunctionAttribute ("+cx8,+mmx,+sse,+sse2,+sse3,+ssse3,+x87"));
-		attrSet.Add (new TuneCpuFunctionAttribute ("generic"));
-		attrSet.Add (new StackrealignFunctionAttribute ());
-	}
-
-	/// <summary>
-	/// Sets x86-specific parameter flags for function parameters.
-	/// </summary>
-	/// <param name="parameter">The function parameter to set flags on.</param>
-	public override void SetParameterFlags (LlvmIrFunctionParameter parameter)
-	{
-		base.SetParameterFlags (parameter);
-		SetIntegerParameterUpcastFlags (parameter);
-	}
-
-	/// <summary>
-	/// Adds x86-specific metadata to the metadata manager.
-	/// </summary>
-	/// <param name="manager">The metadata manager to add x86-specific metadata to.</param>
-	public override void AddTargetSpecificMetadata (LlvmIrMetadataManager manager)
-	{
-		LlvmIrMetadataItem flags = GetFlagsMetadata (manager);
-
-		flags.AddReferenceField (manager.AddNumbered (LlvmIrModuleMergeBehavior.Error, "NumRegisterParameters", 0));
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrRuntimePreemption.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrRuntimePreemption.cs
deleted file mode 100644
index e44affe6e69..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrRuntimePreemption.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-#nullable enable
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Runtime preemption specifiers, see https://llvm.org/docs/LangRef.html#runtime-preemption-model
-	/// </summary>
-	[Flags]
-	enum LlvmIrRuntimePreemption
-	{
-		/// <summary>
-		/// Default runtime preemption (dso_preemptable).
-		/// </summary>
-		Default        = 0 << 0,
-		/// <summary>
-		/// DSO preemptable - symbol may be preempted by symbols from other modules.
-		/// </summary>
-		DSOPreemptable = 1 << 0,
-		/// <summary>
-		/// DSO local - symbol is local to the current dynamic shared object.
-		/// </summary>
-		DSOLocal       = 1 << 1,
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrSectionedArray.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrSectionedArray.cs
deleted file mode 100644
index d868f776429..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrSectionedArray.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Represents a uniform array which is composed of several sections. Each section must contain
-/// entries of the same type (or derived from the same base type), has its own header but is otherwise
-/// treated as a separate entity to other sections. The resulting output array will look as a flattened
-/// array of arrays (sections).
-/// </summary>
-abstract class LlvmIrSectionedArrayBase
-{
-	readonly Type containedType;
-	readonly List<LlvmIrArraySectionBase> sections = new ();
-
-	public List<LlvmIrArraySectionBase> Sections => sections;
-	public Type ContainedType => containedType;
-	public ulong Count => GetItemCount ();
-
-	protected LlvmIrSectionedArrayBase (Type containedType)
-	{
-		this.containedType = containedType;
-	}
-
-	protected void Add (LlvmIrArraySectionBase section)
-	{
-		if (!containedType.IsAssignableFrom (section.DataType)) {
-			throw new ArgumentException ("must be of type {containedType} or derived from it", nameof (section));
-		}
-
-		sections.Add (section);
-	}
-
-	ulong GetItemCount ()
-	{
-		ulong ret = 0;
-		foreach (LlvmIrArraySectionBase section in sections) {
-			ret += (ulong)section.Data.Count;
-		}
-		return ret;
-	}
-}
-
-class LlvmIrSectionedArray<T> : LlvmIrSectionedArrayBase
-{
-	public LlvmIrSectionedArray ()
-		: base (typeof (T))
-	{}
-
-	public void Add (LlvmIrArraySection<T> section) => base.Add (section);
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringBlob.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringBlob.cs
deleted file mode 100644
index fbab4fcf72c..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringBlob.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary><para>
-/// This class is an optimization which allows us to store strings
-/// as a single "blob" of data where each string follows another, all
-/// of them separated with a NUL character. This allows us to use a single
-/// pointer at run time instead of several (one per string). The result is
-/// less relocations in the final .so, which is good for performance
-/// </para><para>
-/// Each string is converted to UTF8 before storing as a byte array. To optimize
-/// for size, duplicate strings are not stored, instead the earlier offset+length
-/// are returned when calling the <see cref="Add(string)" /> method.
-/// </para>
-/// </summary>
-class LlvmIrStringBlob
-{
-	// Length is one more than byte size, to account for the terminating nul
-	public record struct StringInfo (int Offset, int Length, byte[] Bytes, string Value);
-
-	Dictionary<string, StringInfo> cache = new (StringComparer.Ordinal);
-	List<StringInfo> segments = new ();
-	long size = 0;
-
-	public long Size => size;
-
-	/// <summary>
-	/// Add string <paramref name="s"/> to the blob, returning its offset in the blob
-	/// and its size (which is the string length after conversion from UTF8 to a byte array plus
-	/// 1 for the terminating NUL character)
-	/// </summary>
-	public (int offset, int length) Add (string s)
-	{
-		if (cache.TryGetValue (s, out StringInfo info)) {
-			return (info.Offset, info.Length);
-		}
-
-		byte[] bytes = MonoAndroidHelper.Utf8StringToBytes (s);
-		int offset;
-		if (segments.Count > 0) {
-			StringInfo lastSegment = segments[segments.Count - 1];
-			offset = lastSegment.Offset + lastSegment.Length + 1; // Include trailing NUL here
-		} else {
-			offset = 0;
-		}
-
-		info = new StringInfo (
-			Offset: offset,
-			Length: bytes.Length,
-			Bytes: bytes,
-			Value: s
-		);
-		segments.Add (info);
-		cache.Add (s, info);
-		size += info.Length + 1; // Account for the trailing NUL
-
-		return (info.Offset, info.Length);
-	}
-
-	public int GetIndexOf (string s)
-	{
-		if (String.IsNullOrEmpty (s)) {
-			return -1;
-		}
-
-		if (!cache.TryGetValue (s, out StringInfo info)) {
-			return -1;
-		}
-
-		return info.Offset;
-	}
-
-	public IEnumerable<StringInfo> GetSegments ()
-	{
-		foreach (StringInfo si in segments) {
-			yield return si;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringEncoding.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringEncoding.cs
deleted file mode 100644
index 1a257a72dd9..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringEncoding.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#nullable enable
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Specifies the encoding used for string variables in LLVM IR.
-/// </summary>
-enum LlvmIrStringEncoding
-{
-	/// <summary>
-	/// UTF-8 encoding using i8 LLVM IR type.
-	/// </summary>
-	UTF8,
-	/// <summary>
-	/// Unicode (UTF-16) encoding using i16 LLVM IR type.
-	/// </summary>
-	Unicode,
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringGroup.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringGroup.cs
deleted file mode 100644
index 17318c2505f..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringGroup.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Represents a group of string variables that will be emitted together in the LLVM IR output.
-/// String groups allow organizing related strings with optional comments for better code organization.
-/// </summary>
-sealed class LlvmIrStringGroup
-{
-	/// <summary>
-	/// Gets the number of strings in this group.
-	/// </summary>
-	public ulong Count;
-	/// <summary>
-	/// Gets the optional comment associated with this string group.
-	/// </summary>
-	public readonly string? Comment;
-	/// <summary>
-	/// Gets the list of string variables in this group.
-	/// </summary>
-	public readonly List<LlvmIrStringVariable> Strings = new List<LlvmIrStringVariable> ();
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrStringGroup"/> class.
-	/// </summary>
-	/// <param name="comment">Optional comment to associate with this string group.</param>
-	public LlvmIrStringGroup (string? comment = null)
-	{
-		Comment = comment;
-		Count = 0;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringManager.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringManager.cs
deleted file mode 100644
index 71a8794bdbc..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringManager.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-
-using Microsoft.Build.Utilities;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-partial class LlvmIrModule
-{
-	protected class LlvmIrStringManager
-	{
-		readonly string defaultGroupName = "str";
-
-		Dictionary<StringHolder, LlvmIrStringVariable> stringSymbolCache = new Dictionary<StringHolder, LlvmIrStringVariable> ();
-		Dictionary<string, LlvmIrStringGroup> stringGroupCache = new Dictionary<string, LlvmIrStringGroup> (StringComparer.Ordinal);
-		List<LlvmIrStringGroup> stringGroups = new List<LlvmIrStringGroup> ();
-
-		LlvmIrStringGroup defaultGroup;
-		TaskLoggingHelper log;
-
-		public List<LlvmIrStringGroup> StringGroups => stringGroups;
-
-		public LlvmIrStringManager (TaskLoggingHelper log, string? defaultStringGroup = null)
-		{
-			this.log = log;
-			if (!defaultStringGroup.IsNullOrEmpty ()) {
-				defaultGroupName = defaultStringGroup;
-			}
-
-			defaultGroup = new LlvmIrStringGroup ();
-			stringGroupCache.Add (String.Empty, defaultGroup);
-			stringGroups.Add (defaultGroup);
-		}
-
-		public LlvmIrStringVariable Add (LlvmIrStringVariable variable, string? groupName = null, string? groupComment = null, string? symbolSuffix = null)
-		{
-			// Let it throw if Value isn't a StringHolder, it must be.
-			return Add((StringHolder)variable.Value!, groupName, groupComment, symbolSuffix);
-		}
-
-		public LlvmIrStringVariable Add (string value, string? groupName = null, string? groupComment = null, string? symbolSuffix = null,
-			LlvmIrStringEncoding encoding = LlvmIrStringEncoding.UTF8, StringComparison comparison = StringComparison.Ordinal)
-		{
-			if (value == null) {
-				throw new ArgumentNullException (nameof (value));
-			}
-
-			return Add (new StringHolder (value, encoding, comparison), groupName, groupComment, symbolSuffix);
-		}
-
-		LlvmIrStringVariable Add (StringHolder holder, string? groupName = null, string? groupComment = null, string? symbolSuffix = null)
-		{
-			if (stringSymbolCache.TryGetValue (holder, out LlvmIrStringVariable? stringVar) && stringVar != null) {
-				return stringVar;
-			}
-
-			LlvmIrStringGroup? group;
-			string groupPrefix;
-			if (groupName.IsNullOrEmpty () || MonoAndroidHelper.StringEquals ("str", groupName)) {
-				group = defaultGroup;
-				groupPrefix = $".{defaultGroupName}";
-			} else if (!stringGroupCache.TryGetValue (groupName, out group) || group == null) {
-				group = new LlvmIrStringGroup (groupComment ?? groupName);
-				stringGroups.Add (group);
-				stringGroupCache[groupName] = group;
-				groupPrefix = $".{groupName}";
-			} else {
-				groupPrefix = $".{groupName}";
-			}
-
-			string symbolName = $"{groupPrefix}.{group.Count++}";
-			if (!symbolSuffix.IsNullOrEmpty ()) {
-				symbolName = $"{symbolName}_{symbolSuffix}";
-			}
-
-			stringVar = new LlvmIrStringVariable (symbolName, holder);
-			group.Strings.Add (stringVar);
-			stringSymbolCache.Add (holder, stringVar);
-
-			return stringVar;
-		}
-
-		public LlvmIrStringVariable? Lookup (StringHolder value)
-		{
-			if (stringSymbolCache.TryGetValue (value, out LlvmIrStringVariable? sv)) {
-				return sv;
-			}
-
-			return null;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrTypeCache.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrTypeCache.cs
deleted file mode 100644
index 500ab392203..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrTypeCache.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Provides caching for frequently accessed type and member attributes in the LLVM IR generation process.
-/// This cache improves performance by avoiding repeated reflection calls for the same attributes.
-/// </summary>
-class LlvmIrTypeCache
-{
-    readonly Dictionary<MemberInfo, NativePointerAttribute?> pointerAttributes = [];
-    readonly Dictionary<MemberInfo, NativeAssemblerAttribute?> assemblerAttributes = [];
-
-    /// <summary>
-    /// Gets the <see cref="NativePointerAttribute"/> for the specified member, using caching to improve performance.
-    /// </summary>
-    /// <param name="mi">The member info to get the attribute for.</param>
-    /// <returns>The <see cref="NativePointerAttribute"/> if present; otherwise, null.</returns>
-    public NativePointerAttribute? GetNativePointerAttribute (MemberInfo mi)
-    {
-        if (!pointerAttributes.TryGetValue (mi, out var attr)) {
-            pointerAttributes[mi] = attr = mi.GetCustomAttribute<NativePointerAttribute> ();
-        }
-        return attr;
-    }
-
-    /// <summary>
-    /// Gets the <see cref="NativeAssemblerAttribute"/> for the specified member, using caching to improve performance.
-    /// </summary>
-    /// <param name="mi">The member info to get the attribute for.</param>
-    /// <returns>The <see cref="NativeAssemblerAttribute"/> if present; otherwise, null.</returns>
-    public NativeAssemblerAttribute? GetNativeAssemblerAttribute (MemberInfo mi)
-    {
-        if (!assemblerAttributes.TryGetValue (mi, out var attr)) {
-            assemblerAttributes[mi] = attr = mi.GetCustomAttribute<NativeAssemblerAttribute> ();
-        }
-        return attr;
-    }
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariable.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariable.cs
deleted file mode 100644
index 21eb0c39d6a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariable.cs
+++ /dev/null
@@ -1,542 +0,0 @@
-using System;
-using System.Collections;
-using System.Globalization;
-
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Flags that control how variables are written in the LLVM IR output.
-/// </summary>
-[Flags]
-enum LlvmIrVariableWriteOptions
-{
-	/// <summary>
-	/// No special write options.
-	/// </summary>
-	None                    = 0x0000,
-	/// <summary>
-	/// Write index comments for array elements.
-	/// </summary>
-	ArrayWriteIndexComments = 0x0001,
-	/// <summary>
-	/// Format arrays in rows rather than one element per line.
-	/// </summary>
-	ArrayFormatInRows       = 0x0002,
-}
-
-/// <summary>
-/// Specifies the number format to use when writing numeric variables.
-/// </summary>
-enum LlvmIrVariableNumberFormat
-{
-	/// <summary>
-	/// Use the default format for the variable type.
-	/// </summary>
-	Default,
-	/// <summary>
-	/// Force hexadecimal format.
-	/// </summary>
-	Hexadecimal,
-	/// <summary>
-	/// Force decimal format.
-	/// </summary>
-	Decimal,
-}
-
-/// <summary>
-/// Abstract base class for LLVM IR variable references.
-/// </summary>
-abstract class LlvmIrVariableReference
-{
-	/// <summary>
-	/// Gets a value indicating whether this is a global variable reference.
-	/// </summary>
-	public abstract bool Global                    { get; }
-	/// <summary>
-	/// Gets the prefix character used when referencing this variable in LLVM IR code.
-	/// </summary>
-	public abstract string NamePrefix              { get; }
-	/// <summary>
-	/// Gets or sets the name of the variable.
-	/// </summary>
-	public string? Name                            { get; protected set; }
-
-	/// <summary>
-	/// Returns a string which constitutes a reference to a local (using the <c>%</c> prefix character) or a global
-	/// (using the <c>@</c> prefix character) variable, ready for use in the generated code wherever variables are
-	/// referenced.
-	/// </summary>
-	public virtual string Reference {
-		get {
-			if (String.IsNullOrEmpty (Name)) {
-				throw new InvalidOperationException ("Variable doesn't have a name, it cannot be referenced");
-			}
-			return $"{NamePrefix}{Name}";
-		}
-	}
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrVariableReference"/> class.
-	/// </summary>
-	/// <param name="name">The name of the variable.</param>
-	protected LlvmIrVariableReference (string? name)
-	{
-		Name = name;
-	}
-}
-/// <summary>
-/// Represents a reference to a global LLVM IR variable.
-/// </summary>
-class LlvmIrGlobalVariableReference : LlvmIrVariableReference
-{
-	/// <summary>
-	/// Gets a value indicating that this is a global variable reference.
-	/// </summary>
-	public override bool Global => true;
-	/// <summary>
-	/// Gets the global variable prefix character '@'.
-	/// </summary>
-	public override string NamePrefix => "@";
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrGlobalVariableReference"/> class.
-	/// </summary>
-	/// <param name="name">The name of the global variable.</param>
-	public LlvmIrGlobalVariableReference (string name)
-		: base (name)
-	{}
-}
-
-/// <summary>
-/// Abstract base class for LLVM IR variables that can hold values and be referenced in LLVM IR code.
-/// </summary>
-abstract class LlvmIrVariable : LlvmIrVariableReference, IEquatable<LlvmIrVariable>
-{
-	/// <summary>
-	/// Gets or sets the .NET type of this variable.
-	/// </summary>
-	public Type Type                               { get; protected set; }
-	/// <summary>
-	/// Gets or sets the write options that control how this variable is output in LLVM IR.
-	/// </summary>
-	/// <remarks>
-	/// Defaults to <see cref="LlvmIrVariableWriteOptions.ArrayWriteIndexComments"/>.
-	/// </remarks>
-	public LlvmIrVariableWriteOptions WriteOptions { get; set; } = LlvmIrVariableWriteOptions.ArrayWriteIndexComments;
-
-	/// <summary>
-	/// Number of columns an array that is written in rows should have.  By default, arrays are written one item in a line, but
-	/// when the <see cref="LlvmIrVariableWriteOptions.ArrayFormatInRows"/> flag is set in <see cref="WriteOptions"/>, then
-	/// the value of this property dictates how many items are to be placed in a single row.
-	/// </summary>
-	public uint ArrayStride                        { get; set; } = 8;
-	/// <summary>
-	/// Gets or sets the value stored in this variable.
-	/// </summary>
-	public object? Value                           { get; set; }
-	/// <summary>
-	/// Gets or sets a comment to be written alongside this variable in the LLVM IR output.
-	/// </summary>
-	public string? Comment                         { get; set; }
-
-	/// <summary>
-	/// Gets or sets the number format to use when writing numeric values.
-	/// </summary>
-	/// <remarks>
-	/// Defaults to <see cref="LlvmIrVariableNumberFormat.Decimal"/>.
-	/// </remarks>
-	public LlvmIrVariableNumberFormat NumberFormat { get; set; } = LlvmIrVariableNumberFormat.Decimal;
-
-	/// <summary>
-	/// Both global and local variables will want their names to matter in equality checks, but function
-	/// parameters must not take it into account, thus this property.  If set to <c>false</c>, <see cref="Equals(LlvmIrVariable)"/>
-	/// will ignore name when checking for equality.
-	/// </summary>
-	protected bool NameMatters { get; set; } = true;
-
-	/// <summary>
-	/// <para>
-	/// Certain data must be calculated when the target architecture is known, because it may depend on certain aspects of
-	/// the target (e.g. its bitness).  This callback, if set, will be invoked before the variable is written to the output
-	/// stream, allowing updating of any such data as described above.
-	/// </para>
-	/// <para>
-	/// First parameter passed to the callback is the variable itself, second parameter is the current
-	/// <see cref="LlvmIrModuleTarget"/> and the third is the value previously assigned to <see cref="BeforeWriteCallbackCallerState"/>
-	/// </para>
-	/// </summary>
-	public Action<LlvmIrVariable, LlvmIrModuleTarget, object?>? BeforeWriteCallback { get; set; }
-
-	/// <summary>
-	/// Object passed to the <see cref="BeforeWriteCallback"/> method, if any, as the caller state.
-	/// </summary>
-	public object? BeforeWriteCallbackCallerState { get; set; }
-
-	/// <summary>
-	/// <para>
-	/// Callback used when processing array variables, called for each item of the array in order to obtain the item's comment, if any.
-	/// </para>
-	/// <para>
-	/// The first argument is the variable which contains the array, second is the item index, third is the item value and fourth is
-	/// the caller state object, previously assigned to the <see cref="GetArrayItemCommentCallbackCallerState"/> property.  The callback
-	/// can return an empty string or <c>null</c>, in which case no comment is written.
-	/// </para>
-	/// </summary>
-	public Func<LlvmIrVariable, LlvmIrModuleTarget, ulong, object?, object?, string?>? GetArrayItemCommentCallback { get; set; }
-
-	/// <summary>
-	/// Object passed to the <see cref="GetArrayItemCommentCallback"/> method, if any, as the caller state.
-	/// </summary>
-	public object? GetArrayItemCommentCallbackCallerState { get; set; }
-
-	/// <summary>
-	/// Constructs an abstract variable. <paramref name="type"/> is translated to one of the LLVM IR first class types (see
-	/// https://llvm.org/docs/LangRef.html#t-firstclass) only if it's an integral or floating point type.  In all other cases it
-	/// is treated as an opaque pointer type.
-	/// </summary>
-	/// <param name="type">The .NET type of the variable.</param>
-	/// <param name="name">The optional name of the variable.</param>
-	protected LlvmIrVariable (Type type, string? name = null)
-		: base (name)
-	{
-		Type = type;
-		Name = name;
-	}
-
-	/// <summary>
-	/// Returns a hash code for this variable based on its type and name.
-	/// </summary>
-	/// <returns>A hash code for the current object.</returns>
-	public override int GetHashCode ()
-	{
-		return Type.GetHashCode () ^ (Name?.GetHashCode () ?? 0);
-	}
-
-	/// <summary>
-	/// Determines whether the specified object is equal to the current variable.
-	/// </summary>
-	/// <param name="obj">The object to compare with the current variable.</param>
-	/// <returns>true if the specified object is equal to the current variable; otherwise, false.</returns>
-	public override bool Equals (object obj)
-	{
-		var irVar = obj as LlvmIrVariable;
-		if (irVar == null) {
-			return false;
-		}
-
-		return Equals (irVar);
-	}
-
-	/// <summary>
-	/// Determines whether the specified LLVM IR variable is equal to the current variable.
-	/// </summary>
-	/// <param name="other">The LLVM IR variable to compare with the current variable.</param>
-	/// <returns>true if the specified variable is equal to the current variable; otherwise, false.</returns>
-	public virtual bool Equals (LlvmIrVariable other)
-	{
-		if (other == null) {
-			return false;
-		}
-
-		return
-			Global == other.Global &&
-			Type == other.Type &&
-			MonoAndroidHelper.StringEquals (NamePrefix, other.NamePrefix) &&
-			(!NameMatters || MonoAndroidHelper.StringEquals (Name, other.Name));
-	}
-}
-
-/// <summary>
-/// Represents a local LLVM IR variable.
-/// </summary>
-class LlvmIrLocalVariable : LlvmIrVariable
-{
-	/// <summary>
-	/// Gets a value indicating that this is not a global variable.
-	/// </summary>
-	public override bool Global => false;
-	/// <summary>
-	/// Gets the local variable prefix character '%'.
-	/// </summary>
-	public override string NamePrefix => "%";
-
-	/// <summary>
-	/// Constructs a local variable. <paramref name="type"/> is translated to one of the LLVM IR first class types (see
-	/// https://llvm.org/docs/LangRef.html#t-firstclass) only if it's an integral or floating point type.  In all other cases it
-	/// is treated as an opaque pointer type.  <paramref name="name"/> is optional because local variables can be unnamed, in
-	/// which case they will be assigned a sequential number when function code is generated.
-	/// </summary>
-	/// <param name="type">The .NET type of the variable.</param>
-	/// <param name="name">The optional name of the variable.</param>
-	public LlvmIrLocalVariable (Type type, string? name = null)
-		: base (type, name)
-	{}
-
-	/// <summary>
-	/// Assigns a numeric name to this local variable.
-	/// </summary>
-	/// <param name="n">The number to assign as the variable name.</param>
-	public void AssignNumber (ulong n)
-	{
-		Name = n.ToString (CultureInfo.InvariantCulture);
-	}
-}
-
-/// <summary>
-/// Represents the state of a streamed array data provider.
-/// </summary>
-enum LlvmIrStreamedArrayDataProviderState
-{
-	/// <summary>
-	/// More sections are available after this one.
-	/// </summary>
-	NextSection,
-	/// <summary>
-	/// This is the last section with data.
-	/// </summary>
-	LastSection,
-	/// <summary>
-	/// More sections are available but this one has no data.
-	/// </summary>
-	NextSectionNoData,
-	/// <summary>
-	/// This is the last section and it has no data.
-	/// </summary>
-	LastSectionNoData,
-}
-
-/// <summary>
-/// Abstract base class for providing streamed array data to LLVM IR variables.
-/// </summary>
-abstract class LlvmIrStreamedArrayDataProvider
-{
-	/// <summary>
-	/// Type of every member of the array returned by <see cref="GetData ()"/>.  Generator will check
-	/// every member type against this property, allowing also derived types.
-	/// </summary>
-	public Type ArrayElementType { get; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrStreamedArrayDataProvider"/> class.
-	/// </summary>
-	/// <param name="arrayElementType">The type of elements in the arrays returned by this provider.</param>
-	protected LlvmIrStreamedArrayDataProvider (Type arrayElementType)
-	{
-		ArrayElementType = arrayElementType;
-	}
-
-	/// <summary>
-	/// Whenever <see cref="GetData ()"/> returns the generator will call this method to obtain the new section
-	/// comment, if any, to be output before the actual data.  Returning `String.Empty` prevents the comment
-	/// from being added.
-	/// </summary>
-	/// <param name="target">The target module for which to get the comment.</param>
-	/// <returns>The section start comment or an empty string if no comment should be added.</returns>
-	public virtual string GetSectionStartComment (LlvmIrModuleTarget target) => String.Empty;
-
-	/// <summary>
-	/// Provide the next chunk of data for the specified target (ABI).  Implementations need to return at least one
-	/// non-empty collection of data.  The returned collection **must** be exactly the size of contained data (e.g. it cannot be
-	/// a byte array rented from a byte pool, because these can be bigger than requested.  When returning the last (or the only) section,
-	/// <paramref name="status"/> must have a value of <see cref="LlvmIrStreamedArrayDataProviderState.LastSection"/>.
-	/// Each section may be preceded by a comment, <see cref="GetSectionStartComment"/>.
-	/// </summary>
-	/// <param name="target">The target module for which to get data.</param>
-	/// <returns>A tuple containing the provider state and the data collection.</returns>
-	public abstract (LlvmIrStreamedArrayDataProviderState status, ICollection data) GetData (LlvmIrModuleTarget target);
-
-	/// <summary>
-	/// Provide the total data size for the specified target (ABI).  This needs to be used instead of <see cref="LlvmIrVariable.ArrayItemCount"/>
-	/// because a variable instance is created once and shared by all targets, while per-target data sets might have different sizes.
-	/// </summary>
-	/// <param name="target">The target module for which to get the total data size.</param>
-	/// <returns>The total size of data that will be provided for the specified target.</returns>
-	public abstract ulong GetTotalDataSize (LlvmIrModuleTarget target);
-}
-
-/// <summary>
-/// Represents a global LLVM IR variable.
-/// </summary>
-class LlvmIrGlobalVariable : LlvmIrVariable
-{
-	/// <summary>
-	/// By default a global variable is constant and exported.
-	/// </summary>
-	public static readonly LlvmIrVariableOptions DefaultOptions = LlvmIrVariableOptions.GlobalConstant;
-
-	/// <summary>
-	/// Gets a value indicating that this is a global variable.
-	/// </summary>
-	public override bool Global => true;
-	/// <summary>
-	/// Gets the global variable prefix character '@'.
-	/// </summary>
-	public override string NamePrefix => "@";
-
-	/// <summary>
-	/// Specify variable options. If omitted, it defaults to <see cref="DefaultOptions"/>.
-	/// <seealso href="https://llvm.org/docs/LangRef.html#global-variables"/>
-	/// </summary>
-	public virtual LlvmIrVariableOptions? Options { get; set; }
-
-	/// <summary>
-	/// There are situations when a variable differs enough between architectures, that the difference cannot be
-	/// handled with <seealso cref="BeforeWriteCallback"/>.  In such situations one can create a separate variable
-	/// for each architecture and set this property.
-	/// </summary>
-	public AndroidTargetArch? TargetArch { get; set; }
-
-	/// <summary>
-	/// If set to `true`, initialize the array with a shortcut zero-initializer statement.  Useful when pre-allocating
-	/// space for runtime use that won't be filled in with any data at the build time.
-	/// </summary>
-	public bool ZeroInitializeArray { get; set; }
-
-	/// <summary>
-	/// Specify number of items in an array. Used in cases when we want to pre-allocate an array without giving it any
-	/// value, thus making it impossible for the generator to discover the number of items automatically.  This is useful
-	/// when using <seealso cref="ZeroInitializeArray" />.  This property is used **only** if the variable <see cref="LlvmIrVariable.Value"/>
-	/// is `null`.
-	/// </summary>
-	public ulong ArrayItemCount { get; set; }
-
-	/// <summary>
-	/// If set, it will override any automatically calculated alignment for this variable
-	/// </summary>
-	public ulong? Alignment                        { get; set; }
-
-	/// <summary>
-	/// If set, the provider will be called to obtain all the data to be placed in an array variable. The total amount
-	/// of data that will be returned by the provider **must** be specified in the <see cref="ArrayItemCount"/> property,
-	/// in order for the generator to properly declare the variable.  The generator will verify that the amount of data
-	/// is exactly that much and throw an exception otherwise.
-	/// </summary>
-	public LlvmIrStreamedArrayDataProvider? ArrayDataProvider { get; set; }
-
-	/// <summary>
-	/// Constructs a global variable. <paramref name="type"/> is translated to one of the LLVM IR first class types (see
-	/// https://llvm.org/docs/LangRef.html#t-firstclass) only if it's an integral or floating point type.  In all other cases it
-	/// is treated as an opaque pointer type.  <paramref name="name"/> is required because global variables must be named.
-	/// </summary>
-	/// <param name="type">The .NET type of the variable.</param>
-	/// <param name="name">The name of the global variable.</param>
-	/// <param name="options">Optional variable options.</param>
-	/// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is null or empty.</exception>
-	public LlvmIrGlobalVariable (Type type, string name, LlvmIrVariableOptions? options = null)
-		: base (type, name)
-	{
-		if (String.IsNullOrEmpty (name)) {
-			throw new ArgumentException ("must not be null or empty", nameof (name));
-		}
-
-		Options = options;
-	}
-
-	/// <summary>
-	/// Constructs a local variable and sets the <see cref="Value"/> property to <paramref name="value"/> and <see cref="Type"/>
-	/// property to its type.  For that reason, <paramref name="value"/> **must not** be <c>null</c>.  <paramref name="name"/> is
-	/// required because global variables must be named.
-	/// </summary>
-	/// <param name="value">The value to assign to the variable. Must not be null.</param>
-	/// <param name="name">The name of the global variable.</param>
-	/// <param name="options">Optional variable options.</param>
-	/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is null.</exception>
-	public LlvmIrGlobalVariable (object value, string name, LlvmIrVariableOptions? options = null)
-		: this ((value ?? throw new ArgumentNullException (nameof (value))).GetType (), name, options)
-	{
-		Value = value;
-	}
-
-	/// <summary>
-	/// This is, unfortunately, needed to be able to address scenarios when a single symbol can have a different type when
-	/// generating output for a specific target (e.g. 32-bit vs 64-bit integer variables).  If the variable requires such
-	/// type changes, this should be done at generation time from within the <see cref="BeforeWriteCallback"/> method.
-	/// </summary>
-	/// <param name="newType">The new type to assign to the variable.</param>
-	/// <param name="newValue">The new value to assign to the variable.</param>
-	public void OverrideTypeAndValue (Type newType, object? newValue)
-	{
-		Type = newType;
-		Value = newValue;
-	}
-
-	/// <summary>
-	/// Overrides the name of this global variable.
-	/// </summary>
-	/// <param name="newName">The new name for the variable.</param>
-	public void OverrideName (string newName)
-	{
-		Name = newName;
-	}
-}
-
-/// <summary>
-/// Represents a string variable in LLVM IR with specific encoding and formatting options.
-/// </summary>
-class LlvmIrStringVariable : LlvmIrGlobalVariable
-{
-	/// <summary>
-	/// Gets the string encoding used for this variable.
-	/// </summary>
-	public LlvmIrStringEncoding Encoding { get; }
-	/// <summary>
-	/// Gets the LLVM IR type string for this string variable.
-	/// </summary>
-	public string IrType { get; }
-	/// <summary>
-	/// Gets a value indicating whether this string should be output as a constant string literal.
-	/// </summary>
-	public bool IsConstantStringLiteral { get; }
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrStringVariable"/> class.
-	/// </summary>
-	/// <param name="name">The name of the string variable.</param>
-	/// <param name="value">The string value holder containing the string data and encoding.</param>
-	/// <param name="options">Optional variable options, defaults to global constant string pointer.</param>
-	public LlvmIrStringVariable (string name, StringHolder value, LlvmIrVariableOptions? options = null)
-		: base (typeof(string), name, options ?? LlvmIrVariableOptions.GlobalConstantStringPointer)
-	{
-		Value = value;
-		Encoding = value.Encoding;
-
-		switch (value.Encoding) {
-			case LlvmIrStringEncoding.UTF8:
-				IrType = "i8";
-				IsConstantStringLiteral = true;
-				break;
-
-			case LlvmIrStringEncoding.Unicode:
-				IrType = "i16";
-				break;
-
-			default:
-				throw new InvalidOperationException ($"Internal error: unsupported string encoding {value.Encoding}");
-		}
-	}
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="LlvmIrStringVariable"/> class.
-	/// </summary>
-	/// <param name="name">The name of the string variable.</param>
-	/// <param name="value">The string value.</param>
-	/// <param name="encoding">The encoding to use for the string.</param>
-	/// <param name="comparison">The string comparison method to use.</param>
-	/// <param name="options">Optional variable options.</param>
-	public LlvmIrStringVariable (string name, string value, LlvmIrStringEncoding encoding, StringComparison comparison = StringComparison.Ordinal, LlvmIrVariableOptions? options = null)
-		: this (name, new StringHolder (value, encoding, comparison), options)
-	{}
-}
-
-/// <summary>
-/// This is to address my dislike to have single-line variables separated by empty lines :P.
-/// When an instance of this "variable" is first encountered, it enables variable grouping, that is
-/// they will be followed by just a single newline.  The next instance of this "variable" turns
-/// grouping off, meaning the following variables will be followed by two newlines.
-/// </summary>
-class LlvmIrGroupDelimiterVariable : LlvmIrGlobalVariable
-{
-	public LlvmIrGroupDelimiterVariable ()
-		: base (typeof(void), ".:!GroupDelimiter!:.", LlvmIrVariableOptions.LocalConstant)
-	{}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariableOptions.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariableOptions.cs
deleted file mode 100644
index 775f6eaec0a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrVariableOptions.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Represents options for LLVM IR variables, controlling linkage, visibility, writability, and other attributes.
-	/// Provides predefined option sets for common variable types.
-	/// </summary>
-	class LlvmIrVariableOptions
-	{
-		/// <summary>
-		/// Options for a global, writable, symbol with locally (module wide) unimportant address
-		/// </summary>
-		public static readonly LlvmIrVariableOptions Default = new LlvmIrVariableOptions {
-			Writability = LlvmIrWritability.Writable,
-			AddressSignificance = LlvmIrAddressSignificance.LocalUnnamed,
-		};
-
-		/// <summary>
-		/// Options for a global, read-only, symbol with locally (module wide) unimportant address
-		/// </summary>
-		public static readonly LlvmIrVariableOptions GlobalConstant = new LlvmIrVariableOptions {
-			Writability = LlvmIrWritability.Constant,
-			AddressSignificance = LlvmIrAddressSignificance.LocalUnnamed,
-		};
-
-		/// <summary>
-		/// Options for a global, writable, symbol
-		/// </summary>
-		public static readonly LlvmIrVariableOptions GlobalWritable = new LlvmIrVariableOptions {
-			Writability = LlvmIrWritability.Writable,
-			AddressSignificance = LlvmIrAddressSignificance.LocalUnnamed,
-		};
-
-		/// <summary>
-		/// Options for a local, read-only, symbol
-		/// </summary>
-		public static readonly LlvmIrVariableOptions LocalConstant = new LlvmIrVariableOptions {
-			Linkage = LlvmIrLinkage.Internal,
-			Writability = LlvmIrWritability.Constant,
-		};
-
-		/// <summary>
-		/// Options for a local, writable, symbol
-		/// </summary>
-		public static readonly LlvmIrVariableOptions LocalWritable = new LlvmIrVariableOptions {
-			Linkage = LlvmIrLinkage.Internal,
-			Writability = LlvmIrWritability.Writable,
-		};
-
-		/// <summary>
-		/// Options for a local, writable, insignificant address symbol
-		/// </summary>
-		public static readonly LlvmIrVariableOptions LocalWritableInsignificantAddr = new LlvmIrVariableOptions {
-			Linkage = LlvmIrLinkage.Internal,
-			Writability = LlvmIrWritability.Writable,
-			AddressSignificance = LlvmIrAddressSignificance.Unnamed,
-		};
-
-		/// <summary>
-		/// Options for a local, read-only, string which will end up in a strings ELF section
-		/// </summary>
-		public static readonly LlvmIrVariableOptions LocalString = new LlvmIrVariableOptions {
-			Linkage = LlvmIrLinkage.Private,
-			Writability = LlvmIrWritability.Constant,
-			AddressSignificance = LlvmIrAddressSignificance.Unnamed,
-			RuntimePreemption = LlvmIrRuntimePreemption.Default,
-		};
-
-		/// <summary>
-		/// Options for a local, read-only, C++ constexpr style string which will remain in the rodata ELF section
-		/// </summary>
-		public static readonly LlvmIrVariableOptions LocalConstexprString = new LlvmIrVariableOptions {
-			Linkage = LlvmIrLinkage.Internal,
-			Writability = LlvmIrWritability.Constant,
-		};
-
-		/// <summary>
-		/// Options for a global, read-only, C++ constexpr style string which will remain in the rodata ELF section.
-		/// </summary>
-		public static readonly LlvmIrVariableOptions GlobalConstexprString = new LlvmIrVariableOptions {
-			Writability = LlvmIrWritability.Constant,
-		};
-
-		/// <summary>
-		/// Options for a global, read-only, constant pointer to string
-		/// </summary>
-		public static readonly LlvmIrVariableOptions GlobalConstantStringPointer = new LlvmIrVariableOptions {
-			Writability = LlvmIrWritability.Constant,
-			AddressSignificance = LlvmIrAddressSignificance.LocalUnnamed,
-		};
-
-		/// <summary>
-		/// Gets or sets the linkage type for the variable.
-		/// </summary>
-		public LlvmIrLinkage Linkage { get; set; } = LlvmIrLinkage.Default;
-		/// <summary>
-		/// Gets or sets the runtime preemption setting for the variable.
-		/// </summary>
-		public LlvmIrRuntimePreemption RuntimePreemption { get; set; } = LlvmIrRuntimePreemption.DSOLocal;
-		/// <summary>
-		/// Gets or sets the visibility of the variable.
-		/// </summary>
-		public LlvmIrVisibility Visibility { get; set; } = LlvmIrVisibility.Default;
-		/// <summary>
-		/// Gets or sets the address significance of the variable.
-		/// </summary>
-		public LlvmIrAddressSignificance AddressSignificance { get; set; } = LlvmIrAddressSignificance.Default;
-		/// <summary>
-		/// Gets or sets whether the variable is writable or constant.
-		/// </summary>
-		public LlvmIrWritability Writability { get; set; } = LlvmIrWritability.Writable;
-
-		/// <summary>
-		/// Gets a value indicating whether this variable has global linkage.
-		/// </summary>
-		public bool IsGlobal => Linkage == LlvmIrLinkage.Default || (Linkage != LlvmIrLinkage.Private && Linkage != LlvmIrLinkage.Internal);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrWritability.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrWritability.cs
deleted file mode 100644
index 15e32bc64a8..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrWritability.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#nullable enable
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Specifies whether a variable is writable or constant, see https://llvm.org/docs/LangRef.html#global-variables
-	/// </summary>
-	[Flags]
-	enum LlvmIrWritability
-	{
-		/// <summary>
-		/// Variable is constant and cannot be modified.
-		/// </summary>
-		Constant = 1 << 0,
-		/// <summary>
-		/// Variable is writable and can be modified.
-		/// </summary>
-		Writable = 1 << 1,
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmVisibility.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmVisibility.cs
deleted file mode 100644
index 3ccc73cf678..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmVisibility.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Visibility style, see https://llvm.org/docs/BitCodeFormat.html#visibility
-	/// </summary>
-	[Flags]
-	enum LlvmIrVisibility
-	{
-		/// <summary>
-		/// Default visibility - symbol is visible to other modules.
-		/// </summary>
-		Default   = 1 << 0,
-		/// <summary>
-		/// Hidden visibility - symbol is not visible to other modules.
-		/// </summary>
-		Hidden    = 1 << 1,
-		/// <summary>
-		/// Protected visibility - symbol is visible but not overrideable.
-		/// </summary>
-		Protected = 1 << 2,
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/MemberInfoUtilities.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/MemberInfoUtilities.cs
deleted file mode 100644
index 5ee1dad4d5d..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/MemberInfoUtilities.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System;
-using System.Reflection;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Provides utility methods for working with member information in the context of LLVM IR generation.
-	/// </summary>
-	static class MemberInfoUtilities
-	{
-		/// <summary>
-		/// Determines whether a member is marked as a native pointer.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>true if the member is a native pointer; otherwise, false.</returns>
-		public static bool IsNativePointer (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			return cache.GetNativePointerAttribute (mi) != null;
-		}
-
-		/// <summary>
-		/// Determines whether a member is a native pointer that points to a pre-allocated buffer.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <param name="requiredBufferSize">When this method returns, contains the required buffer size if the member points to a pre-allocated buffer; otherwise, 0.</param>
-		/// <returns>true if the member points to a pre-allocated buffer; otherwise, false.</returns>
-		public static bool IsNativePointerToPreallocatedBuffer (this MemberInfo mi, LlvmIrTypeCache cache, out ulong requiredBufferSize)
-		{
-			var attr = cache.GetNativePointerAttribute (mi);
-			if (attr == null) {
-				requiredBufferSize = 0;
-				return false;
-			}
-
-			requiredBufferSize = attr.PreAllocatedBufferSize;
-			return attr.PointsToPreAllocatedBuffer;
-		}
-
-		/// <summary>
-		/// Determines whether a member points to a symbol and gets the symbol name.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <param name="symbolName">When this method returns, contains the symbol name if the member points to a symbol; otherwise, null.</param>
-		/// <returns>true if the member points to a symbol; otherwise, false.</returns>
-		public static bool PointsToSymbol (this MemberInfo mi, LlvmIrTypeCache cache, out string? symbolName)
-		{
-			var attr = cache.GetNativePointerAttribute (mi);
-			if (attr == null || attr.PointsToSymbol == null) {
-				symbolName = null;
-				return false;
-			}
-
-			symbolName = attr.PointsToSymbol;
-			return true;
-		}
-
-		/// <summary>
-		/// Determines whether a string member should use Unicode (UTF-16) encoding.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>true if the member should use Unicode encoding; otherwise, false.</returns>
-		public static bool IsUnicodeString (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			if (attr == null) {
-				return false;
-			}
-
-			return attr.IsUTF16;
-		}
-
-		/// <summary>
-		/// Gets the string encoding to use for a member.
-		/// </summary>
-		/// <param name="mi">The member info to get encoding for.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>The string encoding to use for the member.</returns>
-		public static LlvmIrStringEncoding GetStringEncoding (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			const LlvmIrStringEncoding DefaultStringEncoding = LlvmIrStringEncoding.UTF8;
-
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			if (attr == null) {
-				return DefaultStringEncoding;
-			}
-
-			return attr.IsUTF16 ? LlvmIrStringEncoding.Unicode : DefaultStringEncoding;
-		}
-
-		/// <summary>
-		/// Gets the overridden name for a member if specified in attributes.
-		/// </summary>
-		/// <param name="mi">The member info to get the overridden name for.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>The overridden name if specified; otherwise, null.</returns>
-		public static string? GetOverriddenName (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			return attr != null ? attr.MemberName : null;
-		}
-
-		/// <summary>
-		/// Gets the valid target specification for a member.
-		/// </summary>
-		/// <param name="mi">The member info to get the valid target for.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>The valid target specification for the member.</returns>
-		public static NativeAssemblerValidTarget GetValidTarget (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			return attr != null ? attr.ValidTarget : NativeAssemblerValidTarget.Any;
-		}
-
-		/// <summary>
-		/// Determines whether a member should be ignored during native assembler generation.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>true if the member should be ignored; otherwise, false.</returns>
-		public static bool ShouldBeIgnored (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			return attr != null && attr.Ignore;
-		}
-
-		/// <summary>
-		/// Determines whether a member uses a data provider for dynamic data generation.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>true if the member uses a data provider; otherwise, false.</returns>
-		public static bool UsesDataProvider (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			return attr != null && attr.UsesDataProvider;
-		}
-
-		/// <summary>
-		/// Determines whether a member represents an inline array.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>true if the member is an inline array; otherwise, false.</returns>
-		public static bool IsInlineArray (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			return attr != null && attr.InlineArray;
-		}
-
-		/// <summary>
-		/// Gets the size of an inline array member.
-		/// </summary>
-		/// <param name="mi">The member info to get the array size for.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>The size of the inline array, or -1 if the member is not an inline array.</returns>
-		public static int GetInlineArraySize (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			if (attr == null || !attr.InlineArray) {
-				return -1;
-			}
-
-			return attr.InlineArraySize;
-		}
-
-		/// <summary>
-		/// Determines whether an inline array member needs padding.
-		/// </summary>
-		/// <param name="mi">The member info to check.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>true if the inline array needs padding; otherwise, false.</returns>
-		public static bool InlineArrayNeedsPadding (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			if (attr == null || !attr.InlineArray) {
-				return false;
-			}
-
-			return attr.NeedsPadding;
-		}
-
-		/// <summary>
-		/// Gets the number format to use for a member.
-		/// </summary>
-		/// <param name="mi">The member info to get the number format for.</param>
-		/// <param name="cache">The LLVM IR type cache.</param>
-		/// <returns>The number format to use for the member.</returns>
-		public static LlvmIrVariableNumberFormat GetNumberFormat (this MemberInfo mi, LlvmIrTypeCache cache)
-		{
-			var attr = cache.GetNativeAssemblerAttribute (mi);
-			if (attr == null) {
-				return LlvmIrVariableNumberFormat.Default;
-			}
-
-			return attr.NumberFormat;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerAttribute.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerAttribute.cs
deleted file mode 100644
index cb0d6edf3d2..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerAttribute.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Specifies the target architectures for which a native assembler member is valid.
-	/// </summary>
-	enum NativeAssemblerValidTarget
-	{
-		/// <summary>
-		/// Valid for any target architecture.
-		/// </summary>
-		Any,
-		/// <summary>
-		/// Valid only for 32-bit target architectures.
-		/// </summary>
-		ThirtyTwoBit,
-		/// <summary>
-		/// Valid only for 64-bit target architectures.
-		/// </summary>
-		SixtyFourBit,
-	}
-
-	/// <summary>
-	/// Attribute that controls how fields and properties are handled during native assembler generation.
-	/// Provides fine-grained control over member inclusion, formatting, and target-specific behavior.
-	/// </summary>
-	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Property, Inherited = true)]
-	class NativeAssemblerAttribute : Attribute
-	{
-		/// <summary>
-		/// Tells the generator to ignore structure/class member if set to <c>true</c>
-		/// </summary>
-		public bool Ignore           { get; set; }
-
-		/// <summary>
-		/// Indicates that structure/class member uses a data context provider to obtain some data dynamically,
-		/// based on instances of the given structure/class. <see cref="NativeAssemblerStructContextDataProvider"/>
-		/// </summary>
-		public bool UsesDataProvider { get; set; }
-
-		/// <summary>
-		/// Indicates that the member is an array contained directly in the structure, as opposed to a pointer to array.
-		/// Size of the array is either specified statically in <see cref="InlineArraySize"/> or by the data context
-		/// provider's <see cref="NativeAssemblerStructContextDataProvider.GetBufferSize"/> method.
-		/// </summary>
-		public bool InlineArray      { get; set; }
-
-		/// <summary>
-		/// Size of <see cref="InlineArray"/>, if set to a positive value.
-		/// </summary>
-		public int  InlineArraySize  { get; set; } = -1;
-
-		/// <summary>
-		/// Indicates that the <see cref="InlineArray"/> member needs to be padded to a certain size.  Maximum array
-		/// size to which the member must be padded is specified by <see cref="NativeAssemblerStructContextDataProvider.GetMaxInlineWidth"/>
-		/// </summary>
-		public bool NeedsPadding     { get; set; }
-
-		public LLVMIR.LlvmIrVariableNumberFormat NumberFormat { get; set; } = LLVMIR.LlvmIrVariableNumberFormat.Default;
-
-		/// <summary>
-		/// Taken into account only for fields of string types.  If set to <c>true</c>, the string is output as an UTF16 in
-		/// the native assembly file.
-		/// </summary>
-		public bool IsUTF16 { get; set; }
-
-		/// <summary>
-		/// Allows choosing that a structure/class field/property will be considered only for the target of
-		/// specific bitness. Mainly useful when dealing with hash fields.
-		/// </summary>
-		public NativeAssemblerValidTarget ValidTarget { get; set; } = NativeAssemblerValidTarget.Any;
-
-		/// <summary>
-		/// Allows overriding of the field name when mapping the structure. This is purely cosmetic, but allows to avoid
-		/// confusion when dealing with fields/properties that have a different size for 32-bit and 64-bit targets. In such
-		/// case the structure being mapped will have a separate member per bitness, with the members requiring different names
-		/// while in reality they have the same name in the native world, regardless of bitness.
-		///
-		/// This field is only considered only when <see cref="ValidTarget" /> is not set to <see cref="NativeAssemblerValidTarget.Any"/>
-		/// </summary>
-		public string? MemberName { get; set; }
-	}
-
-	/// <summary>
-	/// Attribute that specifies a context data provider for a native assembler structure.
-	/// The provider allows for dynamic data generation based on structure instances.
-	/// </summary>
-	[AttributeUsage (AttributeTargets.Class, Inherited = true)]
-	class NativeAssemblerStructContextDataProviderAttribute : Attribute
-	{
-		/// <summary>
-		/// Gets the type of the context data provider.
-		/// </summary>
-		public Type Type { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="NativeAssemblerStructContextDataProviderAttribute"/> class.
-		/// </summary>
-		/// <param name="type">The type of the context data provider. Must be derived from <see cref="NativeAssemblerStructContextDataProvider"/>.</param>
-		/// <exception cref="ArgumentException">Thrown when the type is not derived from <see cref="NativeAssemblerStructContextDataProvider"/>.</exception>
-		public NativeAssemblerStructContextDataProviderAttribute (Type type)
-		{
-			if (!type.IsSubclassOf (typeof(NativeAssemblerStructContextDataProvider))) {
-				throw new ArgumentException (nameof (type), "Must be derived from the AssemblerStructContextDataProvider class");
-			}
-
-			Type = type;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerContextDataProvider.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerContextDataProvider.cs
deleted file mode 100644
index 821ff04aadc..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeAssemblerContextDataProvider.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Base class for providing context-specific data for native assembler structure generation.
-	/// Allows dynamic data generation based on structure instances during LLVM IR generation.
-	/// </summary>
-	class NativeAssemblerStructContextDataProvider
-	{
-		/// <summary>
-		/// Return size of a buffer <paramref name="fieldName"/> will point to, based on data passed in <paramref name="data"/>
-		/// </summary>
-		/// <param name="data">The structure instance data.</param>
-		/// <param name="fieldName">The name of the field that needs buffer sizing.</param>
-		/// <returns>The size of the buffer in bytes.</returns>
-		public virtual ulong GetBufferSize (object data, string fieldName)
-		{
-			return 0;
-		}
-
-		/// <summary>
-		/// Return comment for the specified field, based on instance data passed in <paramref name="data"/>
-		/// </summary>
-		/// <param name="data">The structure instance data.</param>
-		/// <param name="fieldName">The name of the field that needs a comment.</param>
-		/// <returns>The comment string for the field.</returns>
-		public virtual string GetComment (object data, string fieldName)
-		{
-			return String.Empty;
-		}
-
-		/// <summary>
-		/// Get maximum width of data buffer allocated inline (that is as part of structure)
-		/// </summary>
-		/// <param name="data">The structure instance data.</param>
-		/// <param name="fieldName">The name of the field that needs inline width information.</param>
-		/// <returns>The maximum inline width in bytes.</returns>
-		public virtual uint GetMaxInlineWidth (object data, string fieldName)
-		{
-			return 0;
-		}
-
-		/// <summary>
-		/// Returns name of the symbol the given field is supposed to point to. <c>null</c> or <c>String.Empty</c>
-		/// can be returned to make the pointer <c>null</c>
-		/// </summary>
-		/// <param name="data">The structure instance data.</param>
-		/// <param name="fieldName">The name of the field that needs symbol name information.</param>
-		/// <returns>The symbol name the field should point to, or null for a null pointer.</returns>
-		public virtual string? GetPointedToSymbolName (object data, string fieldName)
-		{
-			return null;
-		}
-
-		/// <summary>
-		/// Ensures that the provided data object is of the expected type.
-		/// </summary>
-		/// <typeparam name="T">The expected type of the data object.</typeparam>
-		/// <param name="data">The data object to validate.</param>
-		/// <returns>The data object cast to the expected type.</returns>
-		/// <exception cref="InvalidOperationException">Thrown when the data object is not of the expected type.</exception>
-		protected T EnsureType <T> (object data) where T: class
-		{
-			var ret = data as T;
-			if (ret == null) {
-				throw new InvalidOperationException ($"Invalid data type, expected an instance of {typeof(T)}");
-			}
-
-			return ret;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeClassAttribute.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeClassAttribute.cs
deleted file mode 100644
index d7dfc5f2a4a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativeClassAttribute.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-#nullable enable
-using System;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Attribute that marks a class as representing a native structure for LLVM IR generation.
-	/// Classes decorated with this attribute will be treated as native structures during code generation.
-	/// </summary>
-	[AttributeUsage (AttributeTargets.Class, Inherited = true)]
-	class NativeClassAttribute : Attribute
-	{
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativePointerAttribute.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativePointerAttribute.cs
deleted file mode 100644
index f46a3983a10..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/NativePointerAttribute.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Attribute that marks a field or property as representing a native pointer in LLVM IR generation.
-	/// This provides control over how the pointer is handled during code generation.
-	/// </summary>
-	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Property, Inherited = true)]
-	class NativePointerAttribute : Attribute
-	{
-		/// <summary>
-		/// Indicates that the member points to a buffer pre-allocated at the compilation time, with size
-		/// provided by <see cref="NativeAssemblerStructContextDataProvider.GetBufferSize"/> or, if present,
-		/// by the <see cref="PreAllocatedBufferSize"/> property.
-		/// </summary>
-		public bool PointsToPreAllocatedBuffer { get; set; }
-
-		/// <summary>
-		/// Indicates that the member points to a buffer pre-allocated at the compilation time, with size
-		/// specified by the value of this property, unless the value is <c>0</c> in which case
-		/// <see cref="NativeAssemblerStructContextDataProvider.GetBufferSize"/> is used.
-		/// </summary>
-		public ulong PreAllocatedBufferSize { get; set; } = 0;
-
-		/// <summary>
-		/// Indicates the symbol to point to. If <c>null</c> the attribute is ignored, if <c>String.Empty</c>
-		/// the data context provider is queried (if the type uses it)
-		/// </summary>
-		public string? PointsToSymbol { get; set; }
-
-		/// <summary>
-		/// A shortcut way to initialize a pointer to <c>null</c> without having to involve context data provider
-		/// </summary>
-		public bool IsNull { get; set; }
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StringHolder.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StringHolder.cs
deleted file mode 100644
index a963ec2f4ad..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StringHolder.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR;
-
-/// <summary>
-/// Holds a string with its encoding information and comparison semantics for use in LLVM IR generation.
-/// </summary>
-class StringHolder : IComparable, IComparable<StringHolder>, IEquatable<StringHolder>
-{
-	/// <summary>
-	/// Gets the encoding used for this string.
-	/// </summary>
-	public LlvmIrStringEncoding Encoding { get; }
-	/// <summary>
-	/// Gets the string data.
-	/// </summary>
-	public string? Data { get; }
-
-	StringComparison comparison;
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="StringHolder"/> class.
-	/// </summary>
-	/// <param name="data">The string data to hold.</param>
-	/// <param name="encoding">The encoding to use for the string.</param>
-	/// <param name="comparison">The string comparison method to use.</param>
-	public StringHolder (string? data, LlvmIrStringEncoding encoding = LlvmIrStringEncoding.UTF8, StringComparison comparison = StringComparison.Ordinal)
-	{
-		Data = data;
-		Encoding = encoding;
-		this.comparison = comparison;
-	}
-
-	/// <summary>
-	/// Converts an object to a StringHolder, handling both string and StringHolder inputs.
-	/// </summary>
-	/// <param name="value">The value to convert (string or StringHolder).</param>
-	/// <param name="encoding">The encoding to use if creating a new StringHolder.</param>
-	/// <param name="comparison">The comparison method to use if creating a new StringHolder.</param>
-	/// <returns>A StringHolder containing the value.</returns>
-	/// <exception cref="InvalidOperationException">Thrown when value is not a string or StringHolder.</exception>
-	public static StringHolder AsHolder (object? value, LlvmIrStringEncoding encoding = LlvmIrStringEncoding.UTF8, StringComparison comparison = StringComparison.Ordinal)
-	{
-		if (value == null) {
-			return new StringHolder ((string?)value);
-		}
-
-		StringHolder holder;
-		if (value is string) {
-			holder = new StringHolder ((string)value, encoding, comparison);
-		} else if (value is StringHolder) {
-			holder = (StringHolder)value;
-		} else {
-			throw new InvalidOperationException ($"Internal error: expected 'string' type, got '{value.GetType ()}' instead.");
-		}
-
-		return holder;
-	}
-
-	/// <summary>
-	/// Compares this StringHolder to an object.
-	/// </summary>
-	/// <param name="obj">The object to compare to.</param>
-	/// <returns>A signed integer that indicates the relative values of this instance and value.</returns>
-	public int CompareTo (object obj) => CompareTo (obj as StringHolder);
-
-	/// <summary>
-	/// Compares this StringHolder to another StringHolder.
-	/// </summary>
-	/// <param name="other">The StringHolder to compare to.</param>
-	/// <returns>A signed integer that indicates the relative values of this instance and other.</returns>
-	public int CompareTo (StringHolder? other)
-	{
-		if (other == null) {
-			return 1;
-		}
-
-		int encodingCompare = Encoding.CompareTo (other.Encoding);
-		if (Data == null) {
-			if (other.Data != null) {
-				// We are "smaller", because the other holder actually has a valid string
-				return -1;
-			}
-
-			// Both strings are null, so we care only about the encoding
-			return encodingCompare;
-		}
-
-		int dataCompare = other.Data == null ? Data.CompareTo (other.Data) : String.Compare (Data, other.Data, comparison);
-		// If encodings are identical, we compare strings, allowing any result of the comparisons
-		if (encodingCompare == 0) {
-			return dataCompare;
-		}
-
-		// However if encodings aren't the same, we mustn't allow Data comparison to return 0
-		// as the strings are **not** equal, even though their Data values are.  In this case,
-		// we fall back to encoding for comparison result.
-		return dataCompare != 0 ? dataCompare : encodingCompare;
-	}
-
-	/// <summary>
-	/// Returns a hash code for this StringHolder.
-	/// </summary>
-	/// <returns>A hash code for the current object.</returns>
-	public override int GetHashCode ()
-	{
-		int hc = 0;
-		if (Data != null) {
-			hc ^= Data.GetHashCode ();
-		}
-
-		return hc ^ Encoding.GetHashCode ();
-	}
-
-	/// <summary>
-	/// Determines whether the specified object is equal to the current StringHolder.
-	/// </summary>
-	/// <param name="obj">The object to compare with the current StringHolder.</param>
-	/// <returns>true if the specified object is equal to the current StringHolder; otherwise, false.</returns>
-	public override bool Equals (object obj) => Equals (obj as StringHolder);
-
-	/// <summary>
-	/// Determines whether the specified StringHolder is equal to the current StringHolder.
-	/// </summary>
-	/// <param name="other">The StringHolder to compare with the current StringHolder.</param>
-	/// <returns>true if the specified StringHolder is equal to the current StringHolder; otherwise, false.</returns>
-	public bool Equals (StringHolder? other)
-	{
-		if (other == null || Encoding != other.Encoding) {
-			return false;
-		}
-
-		return MonoAndroidHelper.StringEquals (Data, other.Data, comparison);
-	}
-
-	/// <summary>
-	/// Determines whether one StringHolder is greater than another.
-	/// </summary>
-	/// <param name="a">The first StringHolder to compare.</param>
-	/// <param name="b">The second StringHolder to compare.</param>
-	/// <returns>true if a is greater than b; otherwise, false.</returns>
-	public static bool operator > (StringHolder a, StringHolder b)
-	{
-		return a.CompareTo (b) > 0;
-	}
-
-	/// <summary>
-	/// Determines whether one StringHolder is less than another.
-	/// </summary>
-	/// <param name="a">The first StringHolder to compare.</param>
-	/// <param name="b">The second StringHolder to compare.</param>
-	/// <returns>true if a is less than b; otherwise, false.</returns>
-	public static bool operator < (StringHolder a, StringHolder b)
-	{
-		return a.CompareTo (b) < 0;
-	}
-
-	/// <summary>
-	/// Determines whether one StringHolder is greater than or equal to another.
-	/// </summary>
-	/// <param name="a">The first StringHolder to compare.</param>
-	/// <param name="b">The second StringHolder to compare.</param>
-	/// <returns>true if a is greater than or equal to b; otherwise, false.</returns>
-	public static bool operator >= (StringHolder a, StringHolder b)
-	{
-		return a.CompareTo (b) >= 0;
-	}
-
-	/// <summary>
-	/// Determines whether one StringHolder is less than or equal to another.
-	/// </summary>
-	/// <param name="a">The first StringHolder to compare.</param>
-	/// <param name="b">The second StringHolder to compare.</param>
-	/// <returns>true if a is less than or equal to b; otherwise, false.</returns>
-	public static bool operator <= (StringHolder a, StringHolder b)
-	{
-		return a.CompareTo (b) <= 0;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInfo.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInfo.cs
deleted file mode 100644
index 5a1600086dc..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInfo.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	// TODO: add cache for members and data provider info
-	sealed class StructureInfo
-	{
-		Type type;
-		readonly LlvmIrTypeCache cache;
-
-		public Type Type => type;
-		public string Name                                            { get; } = String.Empty;
-		public ulong Size                                             { get; }
-		public IList<StructureMemberInfo> Members                     { get; } = new List<StructureMemberInfo> ();
-		public NativeAssemblerStructContextDataProvider? DataProvider { get; }
-		public ulong MaxFieldAlignment                                { get; private set; } = 0;
-		public bool HasStrings                                        { get; private set; }
-		public bool HasPreAllocatedBuffers                            { get; private set; }
-		public bool HasPointers                                       { get; private set; }
-
-		public bool IsOpaque                                          => Members.Count == 0;
-		public string NativeTypeDesignator                            { get; }
-
-		public StructureInfo (LlvmIrModule module, Type type, LlvmIrTypeCache cache)
-		{
-			this.type = type;
-			this.cache = cache;
-			Name = type.GetShortName ();
-			Size = GatherMembers (type, module);
-			DataProvider = type.GetDataProvider ();
-			NativeTypeDesignator = type.IsNativeClass () ? "class" : "struct";
-		}
-
-		public string? GetCommentFromProvider (StructureMemberInfo smi, StructureInstance instance)
-		{
-			if (DataProvider == null || !smi.Info.UsesDataProvider (cache)) {
-				return null;
-			}
-
-			string ret = DataProvider.GetComment (instance.Obj, smi.Info.Name);
-			if (ret.Length == 0) {
-				return null;
-			}
-
-			return ret;
-		}
-
-		public ulong GetBufferSizeFromProvider (StructureMemberInfo smi, StructureInstance instance)
-		{
-			if (DataProvider == null) {
-				return 0;
-			}
-
-			return DataProvider.GetBufferSize (instance.Obj, smi.Info.Name);
-		}
-
-		ulong GatherMembers (Type type, LlvmIrModule module, bool storeMembers = true)
-		{
-			ulong size = 0;
-			foreach (MemberInfo mi in type.GetMembers ()) {
-				if (mi.ShouldBeIgnored (cache) || (!(mi is FieldInfo) && !(mi is PropertyInfo))) {
-					continue;
-				}
-
-				var info = new StructureMemberInfo (mi, module, cache);
-				if (info.IsNativePointer) {
-					HasPointers = true;
-				}
-
-				if (storeMembers) {
-					Members.Add (info);
-					size += info.Size;
-
-					if (info.Alignment > MaxFieldAlignment) {
-						MaxFieldAlignment = info.Alignment;
-					}
-				}
-
-				if (!HasStrings && info.MemberType == typeof (string)) {
-					HasStrings = true;
-				}
-
-				if (!HasPreAllocatedBuffers && info.Info.IsNativePointerToPreallocatedBuffer (cache, out ulong _)) {
-					HasPreAllocatedBuffers = true;
-				}
-
-				// If we encounter an embedded struct (as opposed to a pointer), we need to descend and check if that struct contains any strings or buffers, but we
-				// do NOT want to store any members while doing that, as the struct should have been mapped by the composer previously.
-				// The presence of strings/buffers is important at the generation time as it is used to decide whether we need separate stream writers for them and
-				// if the owning structure does **not** have any of those, the generated code would be invalid
-				if (info.IsIRStruct) {
-					GatherMembers (info.MemberType, module, storeMembers: false);
-				}
-			}
-
-			return size;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInstance.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInstance.cs
deleted file mode 100644
index f5bdf4874b8..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInstance.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-#nullable disable
-
-using System;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	enum StructureInstanceType
-	{
-		/// <summary>
-		/// Instance describes actual data to be output. Guarantees that the
-		/// <see cref="StructureInstance.Obj"/> property isn't `null`.
-		/// </summary>
-		Data,
-
-		/// <summary>
-		/// Instance marks the beginning of section in an array of
-		/// structures. Ignored if we're not outputting an array of structures.
-		/// <see cref="StructureInstance.Obj"/> property will **always** be `null`
-		/// in such instances.
-		/// </summary>
-		ArraySection,
-	}
-
-	abstract class StructureInstance
-	{
-		StructureInfo info;
-
-		public object? Obj { get; }
-		public Type Type  => info.Type;
-		public StructureInfo Info => info;
-		public StructureInstanceType InstanceType { get; }
-		public string? Comment { get; }
-
-		/// <summary>
-		/// Do **not** set this property, it is used internally by <see cref="LlvmIrModule.AddStructureArrayGlobalVariable"/>,
-		/// <see cref="LlvmIrBufferManager"/> and <see cref="LlvmIrGenerator"/> when dealing with arrays of objects where each
-		/// array index contains the same object instance
-		/// </summary>
-		internal ulong IndexInArray { get; set; }
-
-		/// <summary>
-		/// This is a cludge to support zero-initialized structures.  In order to output proper variable type
-		/// when a structure is used, the generator must be able to read the structure descrption, which is
-		/// provided in the <see cref="Info"/> property and, thus, it requires a variable of structural type to
-		/// **always** have a non-null value.  To support zero initialization of such structures, this property
-		/// can be set to <c>true</c>
-		/// </summary>
-		public bool IsZeroInitialized { get; set; }
-
-		protected StructureInstance (StructureInfo info, object instance, string? comment = null)
-		{
-			if (instance == null) {
-				throw new ArgumentNullException (nameof (instance));
-			}
-
-			InstanceType = StructureInstanceType.Data;
-			if (!info.Type.IsAssignableFrom (instance.GetType ())) {
-				throw new ArgumentException ($"must be an instance of, or derived from, the {info.Type} type, or `null` (was {instance})", nameof (instance));
-			}
-
-			this.info = info;
-			Obj = instance;
-			Comment = comment;
-		}
-
-		protected StructureInstance (StructureInfo info, string? comment = null)
-		{
-			InstanceType = StructureInstanceType.ArraySection;
-			this.info = info;
-			Comment = comment;
-		}
-	}
-
-	/// <summary>
-	/// Represents a typed structure instance, derived from the <see cref="StructureInstance"/> class.  The slightly weird
-	/// approach is because on one hand we need to operate on a heterogenous set of structures (in which generic types would
-	/// only get in the way), but on the other hand we need to be able to get the structure type (whose instance is in
-	/// <see cref="Obj"/> and <see cref="Instance"/>) only by looking at the **type**.  This is needed in situations when we have
-	/// an array of some structures that is empty - we wouldn't be able to gleam the structure type from any instance and we still
-	/// need to output a strongly typed LLVM IR declaration of the structure array.  With this class, most of the code will use the
-	/// abstract <see cref="StructureInstance"/> type, and knowing we have only one non-abstract implementation of the class allows
-	/// us to use StructureInstance&lt;T&gt; in a cast, to get <c>T</c> via reflection.
-	/// <summary>
-	sealed class StructureInstance<T> : StructureInstance
-	{
-		public T? Instance => (T)Obj;
-
-		public StructureInstance (StructureInfo info, T instance, string? comment = null)
-			: base (info, instance, comment)
-		{}
-
-		public StructureInstance (StructureInfo info, string? comment = null)
-			: base (info, comment)
-		{}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureMemberInfo.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureMemberInfo.cs
deleted file mode 100644
index dafdb2da10f..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureMemberInfo.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-#nullable disable
-
-using System;
-using System.Reflection;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	sealed class StructureMemberInfo
-	{
-		public string IRType        { get; }
-		public MemberInfo Info      { get; }
-		public Type MemberType      { get; }
-
-		/// <summary>
-		/// Size of a variable with this IR type. May differ from <see cref="BaseTypeSize"/> because the field
-		/// can be a pointer to type or a struct
-		/// </summary>
-		public ulong Size           { get; }
-		public ulong Alignment      { get; }
-		public ulong ArrayElements  { get; }
-
-		/// <summary>
-		/// Size of the member's base IR type.  If the variable is a pointer, this property will represent
-		/// the size of a base type, not the pointer.
-		/// </summary>
-		public ulong BaseTypeSize   { get; }
-		public bool IsNativePointer { get; }
-		public bool IsNativeArray   { get; }
-		public bool IsInlineArray   { get; }
-		public bool NeedsPadding    { get; }
-
-		/// <summary>
-		/// Whether this member is written out as an LLVM IR structure, as opposed to a simple
-		/// value, a string or a pointer.  Computed once during construction: it depends only on
-		/// the member's type and attributes, both of which are fixed, while the value is queried
-		/// once per member for *every* structure instance being generated.
-		/// </summary>
-		public bool IsIRStruct      { get; }
-
-		/// <summary>
-		/// Some fields/properties may override their name for presentation purposes, <see cref="NativeAssemblerAttribute.MemberName" />.
-		/// In such instances, this property will return the overridden/mapped name, otherwise it returns <see cref="Info.Name"/>.
-		/// This property should be used only for "presentation" purposes - for instance when generating comments which refer to
-		/// native field names.
-		/// </summary>
-		public string MappedName {
-			get {
-				string? name = Info.GetOverriddenName (typeCache);
-				return String.IsNullOrEmpty (name) ? Info.Name : name;
-			}
-		}
-
-		readonly LlvmIrTypeCache typeCache;
-
-		public StructureMemberInfo (MemberInfo mi, LlvmIrModule module, LlvmIrTypeCache cache)
-		{
-			Info = mi;
-			typeCache = cache;
-
-			MemberType = mi switch {
-				FieldInfo fi => fi.FieldType,
-				PropertyInfo pi => pi.PropertyType,
-				_ => throw new InvalidOperationException ($"Unsupported member type {mi}")
-			};
-
-			// MemberType.IsStructure () handles checks for primitive types, enums etc
-			IsIRStruct =
-				MemberType != typeof(string) &&
-				!mi.IsInlineArray (cache) &&
-				!mi.IsNativePointer (cache) &&
-				(MemberType.IsStructure () || MemberType.IsClass);
-
-			ulong size = 0;
-			bool isPointer = false;
-			if (MemberType != typeof(string) && !MemberType.IsArray && (MemberType.IsStructure () || MemberType.IsClass)) {
-				IRType = $"%struct.{MemberType.GetShortName ()}";
-				// TODO: figure out how to get structure size if it isn't a pointer
-			} else {
-				IRType = LlvmIrGenerator.MapToIRType (MemberType, cache, out size, out isPointer);
-			}
-			IsNativePointer = isPointer;
-
-			if (!IsNativePointer) {
-				IsNativePointer = mi.IsNativePointer (cache);
-				if (IsNativePointer) {
-					IRType = LlvmIrGenerator.IRPointerType;
-				}
-			}
-
-			BaseTypeSize = size;
-			ArrayElements = 0;
-			IsInlineArray = false;
-			NeedsPadding = false;
-			Alignment = 0;
-
-			if (IsNativePointer) {
-				size = 0; // Real size will be determined when code is generated and we know the target architecture
-			} else if (mi.IsInlineArray (cache)) {
-				if (!MemberType.IsArray) {
-					throw new InvalidOperationException ($"Internal error: member {mi.Name} of structure {mi.DeclaringType.Name} is marked as inline array, but is not of an array type.");
-				}
-
-				IsInlineArray = true;
-				IsNativeArray = true;
-				NeedsPadding = mi.InlineArrayNeedsPadding (cache);
-				int arrayElements = mi.GetInlineArraySize (cache);
-				if (arrayElements < 0) {
-					arrayElements = GetArraySizeFromProvider (MemberType.GetDataProvider (), mi.Name);
-				}
-
-				if (arrayElements < 0) {
-					throw new InvalidOperationException ($"Array cannot have negative size (got {arrayElements})");
-				}
-
-				IRType = $"[{arrayElements} x {IRType}]";
-				ArrayElements = (ulong)arrayElements;
-			} else if (IsIRStruct) {
-				StructureInfo si = module.GetStructureInfo (MemberType);
-				size = si.Size;
-				Alignment = (ulong)si.MaxFieldAlignment;
-			}
-
-			if (MemberType.IsArray && !IsInlineArray) {
-				throw new InvalidOperationException ("Out of line arrays in structures aren't currently supported");
-			}
-
-			Size = size;
-			if (Alignment == 0) {
-				Alignment = size;
-			}
-		}
-
-		public bool IsSupportedForTarget (LlvmIrModuleTarget target)
-		{
-			NativeAssemblerValidTarget validTarget = Info.GetValidTarget (typeCache);
-			return validTarget switch {
-				NativeAssemblerValidTarget.Any => true,
-				NativeAssemblerValidTarget.ThirtyTwoBit => !target.Is64Bit,
-				NativeAssemblerValidTarget.SixtyFourBit => target.Is64Bit,
-				_ => throw new NotSupportedException ($"Internal error: unsupported native assembler valid target value: {validTarget}")
-			};
-		}
-
-		public object? GetValue (object instance)
-		{
-			if (Info is FieldInfo fi) {
-				return fi.GetValue (instance);
-			}
-
-			var pi = Info as PropertyInfo;
-			return pi.GetValue (instance);
-		}
-
-		int GetArraySizeFromProvider (NativeAssemblerStructContextDataProvider? provider, string fieldName)
-		{
-			if (provider == null) {
-				return -1;
-			}
-
-			return (int)provider.GetMaxInlineWidth (null, fieldName);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/TypeUtilities.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/TypeUtilities.cs
deleted file mode 100644
index f265b8df95c..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/TypeUtilities.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Xamarin.Android.Tasks.LLVMIR
-{
-	/// <summary>
-	/// Provides utility methods for working with types in the context of LLVM IR generation.
-	/// </summary>
-	static class TypeUtilities
-	{
-		/// <summary>
-		/// Gets the short name of a type (without namespace or containing type information).
-		/// </summary>
-		/// <param name="type">The type to get the short name for.</param>
-		/// <returns>The short name of the type.</returns>
-		/// <exception cref="InvalidOperationException">Thrown when the type is unnamed or has an invalid name.</exception>
-		public static string GetShortName (this Type type)
-		{
-			string? fullName = type.FullName;
-
-			if (String.IsNullOrEmpty (fullName)) {
-				throw new InvalidOperationException ($"Unnamed types aren't supported ({type})");
-			}
-
-			int lastCharIdx = fullName.LastIndexOf ('.');
-			string ret;
-			if (lastCharIdx < 0) {
-				ret = fullName;
-			} else {
-				ret = fullName.Substring (lastCharIdx + 1);
-			}
-
-			lastCharIdx = ret.LastIndexOf ('+');
-			if (lastCharIdx >= 0) {
-				ret = ret.Substring (lastCharIdx + 1);
-			}
-
-			if (String.IsNullOrEmpty (ret)) {
-				throw new InvalidOperationException ($"Invalid type name ({type})");
-			}
-
-			return ret;
-		}
-
-		/// <summary>
-		/// Determines whether a type represents a structure (value type that is not an enum, primitive, or array).
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>true if the type is a structure; otherwise, false.</returns>
-		public static bool IsStructure (this Type type)
-		{
-			return type.IsValueType &&
-				!type.IsEnum &&
-				!type.IsPrimitive &&
-				!type.IsArray &&
-				type != typeof (decimal) &&
-				type != typeof (DateTime) &&
-				type != typeof (object);
-		}
-
-		/// <summary>
-		/// Gets the data provider for a type if it has a NativeAssemblerStructContextDataProviderAttribute.
-		/// </summary>
-		/// <param name="t">The type to get the data provider for.</param>
-		/// <returns>The data provider instance, or null if the type doesn't have a data provider attribute.</returns>
-		public static NativeAssemblerStructContextDataProvider? GetDataProvider (this Type t)
-		{
-			var attr = t.GetCustomAttribute<NativeAssemblerStructContextDataProviderAttribute> ();
-			if (attr == null) {
-				return null;
-			}
-
-			return Activator.CreateInstance (attr.Type) as NativeAssemblerStructContextDataProvider;
-		}
-
-		/// <summary>
-		/// Determines whether a type is marked with the NativeClassAttribute.
-		/// </summary>
-		/// <param name="t">The type to check.</param>
-		/// <returns>true if the type has the NativeClassAttribute; otherwise, false.</returns>
-		public static bool IsNativeClass (this Type t)
-		{
-			var attr = t.GetCustomAttribute<NativeClassAttribute> ();
-			return attr != null;
-		}
-
-		/// <summary>
-		/// Determines whether a type implements a specific interface.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <param name="requiredIfaceType">The interface type to check for.</param>
-		/// <returns>true if the type implements the interface; otherwise, false.</returns>
-		public static bool ImplementsInterface (this Type type, Type requiredIfaceType)
-		{
-			if (type == null || requiredIfaceType == null) {
-				return false;
-			}
-
-			if (type == requiredIfaceType) {
-				return true;
-			}
-
-			bool generic = requiredIfaceType.IsGenericType;
-			foreach (Type iface in type.GetInterfaces ()) {
-				if (iface == requiredIfaceType) {
-					return true;
-				}
-
-				if (generic) {
-					if (!iface.IsGenericType) {
-						continue;
-					}
-
-					if (iface.GetGenericTypeDefinition () == requiredIfaceType.GetGenericTypeDefinition ()) {
-						return true;
-					}
-				}
-			}
-
-			return false;
-		}
-
-		/// <summary>
-		/// Determines whether a type is a StructureInstance generic type and gets the structure type.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <param name="structureType">When this method returns, contains the structure type if the type is a StructureInstance; otherwise, null.</param>
-		/// <returns>true if the type is a StructureInstance; otherwise, false.</returns>
-		public static bool IsStructureInstance (this Type type, out Type? structureType)
-		{
-			structureType = null;
-			if (!type.IsGenericType) {
-				return false;
-			}
-
-			if (type.GetGenericTypeDefinition () != typeof(StructureInstance<>)) {
-				return false;
-			}
-
-			structureType = type.GetGenericArguments ()[0];
-			return true;
-		}
-
-		/// <summary>
-		/// Return element type of a single-dimensional (with one exception, see below) array.  Parameter <paramref name="type"/> **MUST**
-		/// correspond to one of the following array types: T[], ICollection&lt;T&gt; or IDictionary&lt;string, string&gt;.  The latter is
-		/// used to comfortably represent name:value arrays, which are output as single dimensional arrays in the native code.
-		/// </summary>
-		/// <param name="type">The array type to get the element type for.</param>
-		/// <returns>The element type of the array.</returns>
-		/// <exception cref="System.InvalidOperationException">
-		/// Thrown when <paramref name="type"/> is not one of the array types listed above.
-		/// </exception>
-		public static Type GetArrayElementType (this Type type)
-		{
-			if (type.IsArray) {
-				return type.GetElementType ();
-			}
-
-			if (!type.IsGenericType) {
-				throw WrongTypeException ();
-			}
-
-			Type genericType = type.GetGenericTypeDefinition ();
-			if (genericType.ImplementsInterface (typeof(ICollection<>))) {
-				Type[] genericArgs = type.GetGenericArguments ();
-				return genericArgs[0];
-			}
-
-			if (!genericType.ImplementsInterface (typeof(IDictionary<string, string>))) {
-				throw WrongTypeException ();
-			}
-
-			return typeof(string);
-
-			// Dictionary
-			Exception WrongTypeException () => new InvalidOperationException ($"Internal error: type '{type}' is not an array, ICollection<T> or IDictionary<string, string>");
-		}
-
-		/// <summary>
-		/// Determine whether type represents an array, in our understanding.  That means the type has to be
-		/// a standard single-dimensional language array (i.e. <c>T[]</c>), implement ICollection&lt;T&gt; together with ICollection or,
-		/// as a special case for name:value pair collections, implement IDictionary&lt;string, string&gt;
-		/// </summary>
-		/// <param name="t">The type to check.</param>
-		/// <returns>true if the type represents an array; otherwise, false.</returns>
-		/// <exception cref="NotSupportedException">Thrown when multi-dimensional arrays are encountered.</exception>
-		public static bool IsArray (this Type t)
-		{
-			if (t.IsPrimitive) {
-				return false;
-			}
-
-			if (t == typeof(string)) {
-				return false;
-			}
-
-			if (t.IsArray) {
-				if (t.GetArrayRank () > 1) {
-					throw new NotSupportedException ("Internal error: multi-dimensional arrays aren't supported");
-				}
-
-				return true;
-			}
-
-			// TODO: cache results here
-			// IDictionary<string, string> is a special case for name:value string arrays which we use for some constructs.
-			return (t.ImplementsInterface (typeof(ICollection<>)) || t.ImplementsInterface (typeof(ICollection))) ||
-				t.ImplementsInterface (typeof(IDictionary<string, string>));
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrHelpers.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrHelpers.cs
deleted file mode 100644
index d78f44bccb4..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrHelpers.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Xamarin.Android.Tasks.LLVMIR;
-
-namespace Xamarin.Android.Tasks;
-
-class LlvmIrHelpers
-{
-	sealed class AppEnvironmentVariableContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override string GetComment (object data, string fieldName)
-		{
-			var envVar = EnsureType<AppEnvironmentVariable> (data);
-
-			if (MonoAndroidHelper.StringEquals ("name_index", fieldName)) {
-				return $" '{envVar.Name}'";
-			}
-
-			if (MonoAndroidHelper.StringEquals ("value_index", fieldName)) {
-				return $" '{envVar.Value}'";
-			}
-
-			return String.Empty;
-		}
-	}
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh AppEnvironmentVariable structure
-	[NativeAssemblerStructContextDataProvider (typeof (AppEnvironmentVariableContextDataProvider))]
-	internal sealed class AppEnvironmentVariable
-	{
-		[NativeAssembler (Ignore = true)]
-		public string? Name;
-
-		[NativeAssembler (Ignore = true)]
-		public string? Value;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint name_index;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint value_index;
-	}
-
-	public static void DeclareDummyFunction (LlvmIrModule module, LlvmIrGlobalVariableReference symref)
-	{
-		if (symref.Name.IsNullOrEmpty ()) {
-			throw new InvalidOperationException ("Internal error: variable reference must have a name");
-		}
-
-		// Just a dummy declaration, we don't care about the arguments
-		var funcSig = new LlvmIrFunctionSignature (symref.Name!, returnType: typeof(void));
-		var _ = module.DeclareExternalFunction (funcSig);
-	}
-
-	public static List<StructureInstance<AppEnvironmentVariable>> MakeEnvironmentVariableList (
-		TaskLoggingHelper log,
-		IDictionary<string, string>? environmentVariables,
-		LlvmIrStringBlob envVarsBlob,
-		StructureInfo? appEnvironmentVariableStructureInfo)
-	{
-		var ret = new List<StructureInstance<AppEnvironmentVariable>> ();
-		if (environmentVariables == null || environmentVariables.Count == 0) {
-			return ret;
-		}
-
-		foreach (var kvp in environmentVariables) {
-			string? name = kvp.Key.Trim ();
-			if (String.IsNullOrEmpty (name)) {
-				log.LogDebugMessage ($"Not adding environment variable without a name. Value: '{kvp.Value}'");
-				continue;
-			}
-			(int nameOffset, int _) = envVarsBlob.Add (name);
-			(int valueOffset, int _) = envVarsBlob.Add (kvp.Value);
-
-			var appEnvVar = new LlvmIrHelpers.AppEnvironmentVariable {
-				Name = name,
-				Value = kvp.Value,
-
-				name_index = (uint)nameOffset,
-				value_index = (uint)valueOffset,
-			};
-			ret.Add (new StructureInstance<LlvmIrHelpers.AppEnvironmentVariable> (appEnvironmentVariableStructureInfo, appEnvVar));
-		}
-
-		return ret;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrTarget.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrTarget.cs
new file mode 100644
index 00000000000..7d1b45b5192
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrTarget.cs
@@ -0,0 +1,106 @@
+#nullable enable
+using System;
+
+using Xamarin.Android.Tools;
+
+namespace Xamarin.Android.Tasks;
+
+/// <summary>
+/// Per-ABI constants used when writing textual LLVM IR modules.  The data layouts and triples
+/// are the ones used by the Android NDK clang for the respective targets.
+/// </summary>
+sealed class LlvmIrTarget
+{
+	public static readonly LlvmIrTarget Arm = new (
+		AndroidTargetArch.Arm,
+		triple: "armv7-unknown-linux-android21",
+		dataLayout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64",
+		pointerSize: 4,
+		moduleFlags: [
+			"i32 1, !\"min_enum_size\", i32 4",
+		]
+	);
+
+	public static readonly LlvmIrTarget Arm64 = new (
+		AndroidTargetArch.Arm64,
+		triple: "aarch64-unknown-linux-android21",
+		dataLayout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+		pointerSize: 8,
+		moduleFlags: [
+			"i32 1, !\"branch-target-enforcement\", i32 0",
+			"i32 1, !\"sign-return-address\", i32 0",
+			"i32 1, !\"sign-return-address-all\", i32 0",
+			"i32 1, !\"sign-return-address-with-bkey\", i32 0",
+		]
+	);
+
+	public static readonly LlvmIrTarget X86 = new (
+		AndroidTargetArch.X86,
+		triple: "i686-unknown-linux-android21",
+		dataLayout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",
+		pointerSize: 4,
+		moduleFlags: [
+			"i32 1, !\"NumRegisterParameters\", i32 0",
+		]
+	);
+
+	public static readonly LlvmIrTarget X86_64 = new (
+		AndroidTargetArch.X86_64,
+		triple: "x86_64-unknown-linux-android21",
+		dataLayout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+		pointerSize: 8,
+		moduleFlags: []
+	);
+
+	public AndroidTargetArch Arch { get; }
+	public string Triple { get; }
+	public string DataLayout { get; }
+	public uint PointerSize { get; }
+	public bool Is64Bit => PointerSize == 8;
+
+	/// <summary>
+	/// Target-specific entries appended to the <c>!llvm.module.flags</c> metadata.
+	/// </summary>
+	public string[] ModuleFlags { get; }
+
+	LlvmIrTarget (AndroidTargetArch arch, string triple, string dataLayout, uint pointerSize, string[] moduleFlags)
+	{
+		Arch = arch;
+		Triple = triple;
+		DataLayout = dataLayout;
+		PointerSize = pointerSize;
+		ModuleFlags = moduleFlags;
+	}
+
+	public static LlvmIrTarget Get (AndroidTargetArch arch)
+	{
+		return arch switch {
+			AndroidTargetArch.Arm    => Arm,
+			AndroidTargetArch.Arm64  => Arm64,
+			AndroidTargetArch.X86    => X86,
+			AndroidTargetArch.X86_64 => X86_64,
+			_ => throw new InvalidOperationException ($"Unsupported Android target ABI {arch}")
+		};
+	}
+
+	/// <summary>
+	/// Returns the alignment of an aggregate (array or structure) whose most strictly aligned
+	/// field requires <paramref name="maxFieldAlignment"/> and whose data is <paramref name="dataSize"/>
+	/// bytes long.  For arrays of structures, and for structures, <paramref name="dataSize"/> is computed
+	/// using the sum of sizes of all the non-pointer structure members (i.e. excluding any padding and
+	/// pointers), in order to produce the same symbol alignment the native code has always been built with.
+	/// </summary>
+	public ulong GetAggregateAlignment (ulong maxFieldAlignment, ulong dataSize)
+	{
+		// System V ABI for x86_64 mandates that any aggregates 16 bytes or more long will
+		// be aligned at at least 16 bytes
+		//
+		//  See: https://refspecs.linuxbase.org/elf/x86_64-abi-0.99.pdf (Section '3.1.2 Data Representation', "Aggregates and Unions")
+		//
+		if (Arch == AndroidTargetArch.X86_64 && dataSize >= 16 && maxFieldAlignment < 16) {
+			return 16;
+		}
+
+		return maxFieldAlignment;
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
new file mode 100644
index 00000000000..62883cffa6d
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
@@ -0,0 +1,414 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+using Xamarin.Android.Tools;
+
+namespace Xamarin.Android.Tasks;
+
+/// <summary>
+/// Minimal helper used by the native assembly generators to write textual LLVM IR.  The generators
+/// write the IR text themselves (mostly as interpolated raw string literals), this class merely
+/// takes care of the parts shared by all of them: the module header and metadata footer, optional
+/// comments, string literals and alignment of global symbols.
+/// </summary>
+sealed class LlvmIrWriter
+{
+	// Symbol attributes, see https://llvm.org/docs/LangRef.html#global-variables
+	public const string GlobalConstant = "dso_local local_unnamed_addr constant";
+	public const string GlobalWritable = "dso_local local_unnamed_addr global";
+	public const string LocalConstant  = "internal dso_local constant";
+	public const string LocalString    = "private unnamed_addr constant";
+
+	readonly TextWriter output;
+
+	public LlvmIrTarget Target { get; }
+
+	/// <summary>
+	/// Whether descriptive comments are written to the generated LLVM IR.  Comments make the
+	/// output easier to read, but they can account for the majority of the file's size and
+	/// have no effect on the code <c>llc</c> produces.
+	/// </summary>
+	public bool EmitComments { get; }
+
+	public LlvmIrWriter (TextWriter output, LlvmIrTarget target, bool emitComments)
+	{
+		this.output = output ?? throw new ArgumentNullException (nameof (output));
+		Target = target ?? throw new ArgumentNullException (nameof (target));
+		EmitComments = emitComments;
+	}
+
+	/// <summary>
+	/// Writes <paramref name="text"/> verbatim, except that line breaks (which may come from the
+	/// C# source files the raw string literals live in) are written using the output's newline
+	/// sequence.
+	/// </summary>
+	public void Write (string text)
+	{
+		string newLine = output.NewLine;
+		if (text.IndexOf ('\n') < 0 || (MonoAndroidHelper.StringEquals ("\n", newLine) && text.IndexOf ('\r') < 0)) {
+			output.Write (text);
+			return;
+		}
+
+		int start = 0;
+		while (start < text.Length) {
+			int eol = text.IndexOf ('\n', start);
+			if (eol < 0) {
+				output.Write (text.Substring (start));
+				break;
+			}
+
+			int end = eol > start && text [eol - 1] == '\r' ? eol - 1 : eol;
+			output.Write (text.Substring (start, end - start));
+			output.Write (newLine);
+			start = eol + 1;
+		}
+	}
+
+	public void WriteLine (string text = "")
+	{
+		Write (text);
+		output.WriteLine ();
+	}
+
+	/// <summary>
+	/// Returns <paramref name="text"/> as an LLVM IR comment (i.e. prefixed with <c>;</c>) if comments are
+	/// enabled, an empty string otherwise.  The text is expected to contain any leading whitespace.
+	/// </summary>
+	public string Comment (string? text) => EmitComments && !text.IsNullOrEmpty () ? $";{SanitizeComment (text)}" : "";
+
+	/// <summary>
+	/// Returns a comment which follows a value on the same line (separated with a space), if comments are enabled.
+	/// </summary>
+	public string TrailingComment (string? text) => EmitComments && !text.IsNullOrEmpty () ? $" ;{SanitizeComment (text)}" : "";
+
+	public void WriteCommentLine (string? text)
+	{
+		if (!EmitComments || text.IsNullOrEmpty ()) {
+			return;
+		}
+
+		WriteLine ($";{SanitizeComment (text)}");
+	}
+
+	// Comments end at the end of line, a line break in e.g. an environment variable value would
+	// turn the rest of the comment into (invalid) IR code
+	static string SanitizeComment (string text)
+	{
+		if (text.IndexOf ('\n') < 0 && text.IndexOf ('\r') < 0) {
+			return text;
+		}
+
+		return text.Replace ("\r", "\\r").Replace ("\n", "\\n");
+	}
+
+	public void WriteHeader (string fileName)
+	{
+		string name = Path.GetFileName (fileName);
+
+		WriteCommentLine ($" ModuleID = '{name}'");
+		Write ($$"""
+			source_filename = "{{name}}"
+			target datalayout = "{{Target.DataLayout}}"
+			target triple = "{{Target.Triple}}"
+
+			""");
+	}
+
+	/// <summary>
+	/// Writes a global symbol definition.  <paramref name="value"/> may span several lines.
+	/// </summary>
+	public void WriteGlobal (string name, string attributes, string type, string value, ulong alignment, string? comment = null)
+	{
+		WriteLine ();
+		WriteCommentLine (comment);
+		WriteLine ($"@{name} = {attributes} {type} {value}, align {Number (alignment)}");
+	}
+
+	/// <summary>
+	/// Renders an array initializer in which every element is written on its own line.  Elements must
+	/// already be indented.  <paramref name="getElementComment"/> may return a comment which is
+	/// placed after the element when comments are enabled.
+	/// </summary>
+	public string ArrayValue (IList<string> elements, Func<int, string?>? getElementComment = null)
+	{
+		if (elements.Count == 0) {
+			return "zeroinitializer";
+		}
+
+		var sb = new StringBuilder ();
+		sb.Append ("[\n");
+		for (int i = 0; i < elements.Count; i++) {
+			if (i > 0) {
+				sb.Append (',');
+				AppendCommentOrNewline (i - 1);
+			}
+			sb.Append (elements [i]);
+		}
+		AppendCommentOrNewline (elements.Count - 1);
+		sb.Append (']');
+
+		return sb.ToString ();
+
+		void AppendCommentOrNewline (int index)
+		{
+			sb.Append (getElementComment != null ? TrailingComment (getElementComment (index)) : "");
+			sb.Append ('\n');
+		}
+	}
+
+	/// <summary>
+	/// Returns the conventional array element comment, i.e. the element index.
+	/// </summary>
+	public static string IndexComment (int index) => $" {Number (index)}";
+
+	/// <summary>
+	/// Alignment of a structure or an array with elements of the given size and alignment.
+	/// </summary>
+	public ulong GetAggregateAlignment (ulong maxFieldAlignment, ulong dataSize) => Target.GetAggregateAlignment (maxFieldAlignment, dataSize);
+
+	public ulong GetPointerArrayAlignment (int count) => GetAggregateAlignment (Target.PointerSize, (ulong)count * Target.PointerSize);
+
+	/// <summary>
+	/// Writes the module metadata (module flags, identification and the type based alias analysis
+	/// descriptors), which ends every module.
+	/// </summary>
+	public void WriteMetadata ()
+	{
+		var flags = new StringBuilder ("!0, !1");
+		var targetFlags = new StringBuilder ();
+		for (int i = 0; i < Target.ModuleFlags.Length; i++) {
+			int n = i + 7;
+			flags.Append ($", !{Number (n)}");
+			targetFlags.Append ($"!{Number (n)} = !{{{Target.ModuleFlags [i]}}}\n");
+		}
+
+		WriteLine ();
+		WriteCommentLine (" Metadata");
+		Write ($$"""
+			!llvm.module.flags = !{{{flags}}}
+			!0 = !{i32 1, !"wchar_size", i32 4}
+			!1 = !{i32 7, !"PIC Level", i32 2}
+			!llvm.ident = !{!2}
+			!2 = !{!".NET for Android {{XABuildConfig.XamarinAndroidBranch}} @ {{XABuildConfig.XamarinAndroidCommitHash}}"}
+			!3 = !{!4, !4, i64 0}
+			!4 = !{!"any pointer", !5, i64 0}
+			!5 = !{!"omnipotent char", !6, i64 0}
+			!6 = !{!"Simple C++ TBAA"}
+
+			""");
+		Write (targetFlags.ToString ());
+	}
+
+	/// <summary>
+	/// Writes declarations of external functions.  All of them use the same, dummy, signature since
+	/// we only care about being able to take their address.
+	/// </summary>
+	public void WriteExternalFunctionDeclarations (ICollection<string> names)
+	{
+		if (names.Count == 0) {
+			return;
+		}
+
+		var sorted = new List<string> (names);
+		sorted.Sort ((string a, string b) => a.CompareTo (b));
+
+		WriteLine ();
+		Write (Comment (" External functions"));
+		foreach (string name in sorted) {
+			WriteLine ();
+			Write ($"declare void @{name}() local_unnamed_addr");
+		}
+	}
+
+	public static string Number (int value) => value.ToString (CultureInfo.InvariantCulture);
+	public static string Number (uint value) => value.ToString (CultureInfo.InvariantCulture);
+	public static string Number (ulong value) => value.ToString (CultureInfo.InvariantCulture);
+
+	public static string Hex (uint value) => $"u0x{value.ToString ("x8", CultureInfo.InvariantCulture)}";
+
+	public static string Bool (bool value) => value ? "true" : "false";
+
+	/// <summary>
+	/// Renders <paramref name="bytes"/> as an LLVM IR string constant (<c>c"..."</c>), escaping all the
+	/// characters which aren't printable ASCII as well as <c>"</c> and <c>\</c>.
+	/// </summary>
+	public static string QuoteBytes (byte[] bytes, bool nullTerminated)
+	{
+		var sb = new StringBuilder (bytes.Length + 8);
+		sb.Append ("c\"");
+		AppendEscaped (sb, bytes);
+		if (nullTerminated) {
+			sb.Append ("\\00");
+		}
+		sb.Append ('"');
+
+		return sb.ToString ();
+	}
+
+	public static void AppendEscaped (StringBuilder sb, byte[] bytes)
+	{
+		foreach (byte b in bytes) {
+			if (b != (byte)'"' && b != (byte)'\\' && b >= 32 && b < 127) {
+				sb.Append ((char)b);
+				continue;
+			}
+
+			sb.Append ('\\');
+			sb.Append (b.ToString ("X2", CultureInfo.InvariantCulture));
+		}
+	}
+}
+
+/// <summary>
+/// Collects NUL-terminated UTF-8 strings which are written out as a single byte array, with the
+/// strings referred to by their offset into the array.  Identical strings are stored only once.
+/// </summary>
+sealed class LlvmIrStringBlob
+{
+	readonly Dictionary<string, int> offsets = new (StringComparer.Ordinal);
+	readonly List<byte[]> segments = new ();
+
+	public ulong Size { get; private set; }
+
+	public int Add (string s)
+	{
+		if (offsets.TryGetValue (s, out int offset)) {
+			return offset;
+		}
+
+		byte[] bytes = MonoAndroidHelper.Utf8StringToBytes (s);
+		offset = (int)Size;
+		segments.Add (bytes);
+		offsets.Add (s, offset);
+		Size += (ulong)bytes.Length + 1;
+
+		return offset;
+	}
+
+	public string Type => $"[{LlvmIrWriter.Number (Size)} x i8]";
+
+	public string Value ()
+	{
+		var sb = new StringBuilder ((int)Size + 2);
+		sb.Append ("c\"");
+		foreach (byte[] bytes in segments) {
+			LlvmIrWriter.AppendEscaped (sb, bytes);
+			sb.Append ("\\00");
+		}
+		sb.Append ('"');
+
+		return sb.ToString ();
+	}
+
+	public void Write (LlvmIrWriter writer, string name)
+	{
+		writer.WriteGlobal (name, LlvmIrWriter.GlobalConstant, Type, Value (), writer.GetAggregateAlignment (1, Size));
+	}
+}
+
+/// <summary>
+/// Private string literals referred to by pointers stored in global symbols.  Every unique string
+/// is emitted once, into the group used when it was first requested.  Strings are written at the
+/// end of the module, grouped, in the order in which they were first requested.
+/// </summary>
+sealed class LlvmIrStringPool
+{
+	sealed class Group
+	{
+		public readonly string SymbolPrefix;
+		public readonly string? Comment;
+		public readonly List<(string Symbol, string Value)> Strings = new ();
+
+		public Group (string symbolPrefix, string? comment)
+		{
+			SymbolPrefix = symbolPrefix;
+			Comment = comment;
+		}
+	}
+
+	const string DefaultGroupName = "str";
+
+	readonly Dictionary<string, string> symbols = new (StringComparer.Ordinal);
+	readonly Dictionary<string, Group> groupsByName = new (StringComparer.Ordinal);
+	readonly List<Group> groups = new ();
+
+	public bool IsEmpty => symbols.Count == 0;
+
+	/// <summary>
+	/// Returns name of the symbol which contains <paramref name="value"/>.  Symbols in the default
+	/// group are named <c>.str.N</c>, those in named groups <c>.{group}.N_{suffix}</c>.
+	/// </summary>
+	public string GetSymbol (string value, string? groupName = null, string? symbolSuffix = null)
+	{
+		if (symbols.TryGetValue (value, out string? existing)) {
+			return existing;
+		}
+
+		if (groups.Count == 0) {
+			AddGroup (DefaultGroupName, comment: null);
+		}
+
+		if (groupName.IsNullOrEmpty ()) {
+			groupName = DefaultGroupName;
+		}
+
+		if (!groupsByName.TryGetValue (groupName, out Group? group)) {
+			group = AddGroup (groupName, groupName);
+		}
+
+		string symbol = $"{group.SymbolPrefix}.{LlvmIrWriter.Number (group.Strings.Count)}";
+		if (!symbolSuffix.IsNullOrEmpty ()) {
+			symbol = $"{symbol}_{symbolSuffix}";
+		}
+		group.Strings.Add ((symbol, value));
+		symbols.Add (value, symbol);
+
+		return symbol;
+	}
+
+	/// <summary>
+	/// Returns a pointer to the string, or <c>null</c> if <paramref name="value"/> is <c>null</c>.
+	/// </summary>
+	public string GetPointer (string? value, string? groupName = null, string? symbolSuffix = null)
+	{
+		if (value == null) {
+			return "null";
+		}
+
+		return $"@{GetSymbol (value, groupName, symbolSuffix)}";
+	}
+
+	Group AddGroup (string name, string? comment)
+	{
+		var group = new Group ($".{name}", comment);
+		groups.Add (group);
+		groupsByName.Add (name, group);
+
+		return group;
+	}
+
+	public void Write (LlvmIrWriter writer)
+	{
+		if (IsEmpty) {
+			return;
+		}
+
+		writer.WriteLine ();
+		writer.Write (writer.Comment (" Strings"));
+		foreach (Group group in groups) {
+			writer.WriteLine ();
+			writer.WriteCommentLine (group.Comment);
+
+			foreach ((string symbol, string value) in group.Strings) {
+				byte[] bytes = MonoAndroidHelper.Utf8StringToBytes (value);
+				ulong size = (ulong)bytes.Length + 1;
+				writer.WriteLine ($"@{symbol} = {LlvmIrWriter.LocalString} [{LlvmIrWriter.Number (size)} x i8] {LlvmIrWriter.QuoteBytes (bytes, nullTerminated: true)}, align {LlvmIrWriter.Number (writer.GetAggregateAlignment (1, size))}");
+			}
+		}
+	}
+}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
index 210512de964..49f3aaf4f6a 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
@@ -1,77 +1,47 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
+using System.IO;
+
 using Microsoft.Build.Utilities;
-using Xamarin.Android.Tasks.LLVMIR;
+using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Tasks;
 
-class NativeAotEnvironmentNativeAssemblyGenerator : LlvmIrComposer
+class NativeAotEnvironmentNativeAssemblyGenerator
 {
-	readonly EnvironmentBuilder envBuilder;
-	StructureInfo? appEnvironmentVariableStructureInfo;
+	readonly AppEnvironmentVariableTable environmentVariables;
+	readonly AppEnvironmentVariableTable systemProperties;
 
-	public NativeAotEnvironmentNativeAssemblyGenerator (TaskLoggingHelper log, EnvironmentBuilder envBuilder)
-		: base (log)
-	{
-		this.envBuilder = envBuilder;
-	}
+	/// <summary>
+	/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+	/// </summary>
+	public bool EmitComments { get; set; }
 
-	protected override void Construct (LlvmIrModule module)
+	public NativeAotEnvironmentNativeAssemblyGenerator (TaskLoggingHelper log, EnvironmentBuilder envBuilder)
 	{
-		MapStructures (module);
-
-		SortedDictionary<string, string>? environmentVariables = null;
-		if (envBuilder.EnvironmentVariables.Count > 0) {
-			environmentVariables = new (envBuilder.EnvironmentVariables, StringComparer.Ordinal);
-		}
-
-		SortedDictionary<string, string>? systemProperties = null;
-		if (envBuilder.SystemProperties.Count > 0) {
-			systemProperties = new (envBuilder.SystemProperties, StringComparer.Ordinal);
-		} else {
-			systemProperties = new (StringComparer.Ordinal);
+		if (log == null) {
+			throw new ArgumentNullException (nameof (log));
 		}
 
-		var envVarsBlob = new LlvmIrStringBlob ();
-		List<StructureInstance<LlvmIrHelpers.AppEnvironmentVariable>> appEnvVars = LlvmIrHelpers.MakeEnvironmentVariableList (
-			Log,
-			environmentVariables,
-			envVarsBlob,
-			appEnvironmentVariableStructureInfo
-		);
+		environmentVariables = new AppEnvironmentVariableTable (log, new SortedDictionary<string, string> (envBuilder.EnvironmentVariables, StringComparer.Ordinal));
+		systemProperties = new AppEnvironmentVariableTable (log, new SortedDictionary<string, string> (envBuilder.SystemProperties, StringComparer.Ordinal));
+	}
 
-		var envVarsCount = new LlvmIrGlobalVariable ((uint)appEnvVars.Count, "__naot_android_app_environment_variable_count");
-		module.Add (envVarsCount);
+	public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
+	{
+		var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		w.WriteHeader (fileName);
+		AppEnvironmentVariableTable.WriteDeclaration (w);
 
-		var envVars = new LlvmIrGlobalVariable (appEnvVars, "__naot_android_app_environment_variables") {
-			Comment = " Application environment variables array, name:value",
-			Options = LlvmIrVariableOptions.GlobalConstant,
-		};
-		module.Add (envVars);
-		module.AddGlobalVariable ("__naot_android_app_environment_variable_contents", envVarsBlob, LlvmIrVariableOptions.GlobalConstant);
+		w.WriteGlobal ("__naot_android_app_environment_variable_count", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (environmentVariables.Count), 4);
+		environmentVariables.Write (w, "__naot_android_app_environment_variables", "__naot_android_app_environment_variable_contents", " Application environment variables array, name:value");
 
+		w.WriteGlobal ("__naot_android_app_system_property_count", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (systemProperties.Count), 4);
 		// We reuse the same structure as for environment variables, there's no point in adding a new, identical, one
-		var sysPropsBlob = new LlvmIrStringBlob ();
-		List<StructureInstance<LlvmIrHelpers.AppEnvironmentVariable>> appSysProps = LlvmIrHelpers.MakeEnvironmentVariableList (
-			Log,
-			systemProperties,
-			sysPropsBlob,
-			appEnvironmentVariableStructureInfo
-		);
-
-		var sysPropsCount = new LlvmIrGlobalVariable ((uint)appSysProps.Count, "__naot_android_app_system_property_count");
-		module.Add (sysPropsCount);
+		systemProperties.Write (w, "__naot_android_app_system_properties", "__naot_android_app_system_property_contents", " System properties defined by the application");
 
-		var sysProps = new LlvmIrGlobalVariable (appSysProps, "__naot_android_app_system_properties") {
-			Comment = " System properties defined by the application",
-			Options = LlvmIrVariableOptions.GlobalConstant,
-		};
-		module.Add (sysProps);
-		module.AddGlobalVariable ("__naot_android_app_system_property_contents", sysPropsBlob, LlvmIrVariableOptions.GlobalConstant);
-	}
-
-	void MapStructures (LlvmIrModule module)
-	{
-		appEnvironmentVariableStructureInfo = module.MapStructure<LlvmIrHelpers.AppEnvironmentVariable> ();
+		w.WriteMetadata ();
+		output.Flush ();
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
index a865295d8d9..d222081c578 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
@@ -1,33 +1,34 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using Microsoft.Build.Utilities;
 using Xamarin.Android.Tasks;
-using Xamarin.Android.Tasks.LLVMIR;
+using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Build.Tasks;
 
-class NativeAotJniInitNativeAssemblyGenerator : LlvmIrComposer
+class NativeAotJniInitNativeAssemblyGenerator
 {
-	readonly List<string>? runtimeComponentsJniOnLoadHandlers;
-	readonly List<string>? customJniOnLoadHandlers;
+	readonly List<string> jniOnLoadNames = new ();
+
+	/// <summary>
+	/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+	/// </summary>
+	public bool EmitComments { get; set; }
 
 	public NativeAotJniInitNativeAssemblyGenerator (TaskLoggingHelper log, List<string>? runtimeComponentsJniOnLoadHandlers, List<string>? customJniOnLoadHandlers)
-		: base (log)
 	{
-		this.runtimeComponentsJniOnLoadHandlers = runtimeComponentsJniOnLoadHandlers;
-		this.customJniOnLoadHandlers = customJniOnLoadHandlers;
-	}
+		if (log == null) {
+			throw new ArgumentNullException (nameof (log));
+		}
 
-	protected override void Construct (LlvmIrModule module)
-	{
-		var jniOnLoadNames = new List<string> ();
 		var seenNames = new HashSet<string> (StringComparer.Ordinal);
 
 		// We call BCL/runtime handlers first, to make sure user libraries can rely on them being initialized (just in case)
 		CollectHandlers (runtimeComponentsJniOnLoadHandlers);
 		CollectHandlers (customJniOnLoadHandlers);
-		JniOnLoadNativeAssemblerHelper.GenerateJniOnLoadHandlerCode (jniOnLoadNames, module);
 
 		void CollectHandlers (List<string>? handlers)
 		{
@@ -36,12 +37,38 @@ void CollectHandlers (List<string>? handlers)
 			}
 
 			foreach (string name in handlers) {
-				if (seenNames.Contains (name)) {
-					continue;
+				if (seenNames.Add (name)) {
+					jniOnLoadNames.Add (name);
 				}
-				seenNames.Add (name);
-				jniOnLoadNames.Add (name);
 			}
 		}
 	}
+
+	public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
+	{
+		var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		var strings = new LlvmIrStringPool ();
+
+		w.WriteHeader (fileName);
+		w.WriteGlobal ("__jni_on_load_handler_count", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (jniOnLoadNames.Count), 4);
+
+		var handlers = new List<string> (jniOnLoadNames.Count);
+		var names = new List<string> (jniOnLoadNames.Count);
+		foreach (string name in jniOnLoadNames) {
+			handlers.Add ($"\tptr @{name}");
+			names.Add ($"\tptr {strings.GetPointer (name)}");
+		}
+
+		string type = $"[{LlvmIrWriter.Number (handlers.Count)} x ptr]";
+		ulong alignment = w.GetPointerArrayAlignment (handlers.Count);
+		w.WriteGlobal ("__jni_on_load_handlers", LlvmIrWriter.GlobalConstant, type, w.ArrayValue (handlers, LlvmIrWriter.IndexComment), alignment);
+		w.WriteGlobal ("__jni_on_load_handler_names", LlvmIrWriter.GlobalConstant, type, w.ArrayValue (names, i => $" {LlvmIrWriter.Number (i)} ('{jniOnLoadNames [i]}')"), alignment);
+
+		strings.Write (w);
+
+		// All the handlers are declared with the same dummy signature, we only need to take their address
+		w.WriteExternalFunctionDeclarations (jniOnLoadNames);
+		w.WriteMetadata ();
+		output.Flush ();
+	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeRuntimeComponents.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeRuntimeComponents.cs
index 26f08c2e2eb..9720601731e 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeRuntimeComponents.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/NativeRuntimeComponents.cs
@@ -1,148 +1,55 @@
 #nullable enable
-using System;
 using System.Collections.Generic;
 
-using Microsoft.Build.Framework;
-
 namespace Xamarin.Android.Tasks;
 
+/// <summary>
+/// Static archives of the native runtime components, used by NativeAOT builds to find
+/// the JNI initialization functions of BCL components used by the application.
+/// </summary>
 class NativeRuntimeComponents
 {
-	public sealed class KnownSets
-	{
-		public const string BCL = "bcl";
-		public const string CoreClrRuntime = "coreclr";
-		public const string CompilerRuntime = "compiler-rt";
-		public const string XamarinAndroidRuntime = "xaruntime";
-	}
-
-	internal class Archive
+	internal sealed class Archive
 	{
 		public readonly string Name;
 		public readonly string? JniOnLoadName;
-		public bool Include => shouldInclude (this);
-		public readonly bool WholeArchive;
-		public bool DontExportSymbols { get; set; }
-		public HashSet<string>? SymbolsToPreserve { get; set; }
-		public string SetName { get; }
 
-		public readonly bool NeedsClrHack;
-
-		Func<Archive, bool> shouldInclude;
-
-		public Archive (string name, string setName, Func<Archive, bool>? include = null, bool wholeArchive = false, string? jniOnLoadName = null)
+		public Archive (string name, string? jniOnLoadName = null)
 		{
 			Name = name;
-			SetName = setName;
-			shouldInclude = include ?? (_ => true);
-			WholeArchive = wholeArchive;
 			JniOnLoadName = jniOnLoadName;
 		}
 	}
 
-	sealed class ClangBuiltinsArchive : Archive
-	{
-		public ClangBuiltinsArchive (string clangAbi)
-			: base ($"libclang_rt.builtins-{clangAbi}-android.a", KnownSets.CompilerRuntime)
-		{}
-	}
-
-	class AndroidArchive : Archive
-	{
-		public AndroidArchive (string name, bool wholeArchive = false)
-			: base (name, KnownSets.XamarinAndroidRuntime, wholeArchive: wholeArchive)
-		{}
-	}
-
-	sealed class BclArchive : Archive
-	{
-		public BclArchive (string name, bool wholeArchive = false, string? jniOnLoadName = null)
-			: base (name, KnownSets.BCL, wholeArchive: wholeArchive, jniOnLoadName: jniOnLoadName)
-		{
-			DontExportSymbols = true;
-		}
-	}
-
-	sealed class ClrArchive : Archive
-	{
-		public ClrArchive (string name, bool wholeArchive = false)
-			: base (name, KnownSets.CoreClrRuntime, wholeArchive: wholeArchive)
-		{
-			DontExportSymbols = true;
-		}
-	}
-
-	readonly ITaskItem[]? monoComponents;
-
 	public readonly List<Archive> KnownArchives;
-	public readonly List<string> NativeLibraries;
-	public readonly List<string> LinkStartFiles;
-	public readonly List<string> LinkEndFiles;
 
-	public NativeRuntimeComponents (ITaskItem[]? monoComponents)
+	public NativeRuntimeComponents ()
 	{
-		this.monoComponents = monoComponents;
 		KnownArchives = new () {
 			// CoreCLR runtime + BCL
-			new ClrArchive ("libcoreclr_static.a"),
-			new ClrArchive ("libbrotlienc.a"),
-			new ClrArchive ("libbrotlidec.a"),
-			new ClrArchive ("libbrotlicommon.a"),
+			new Archive ("libcoreclr_static.a"),
+			new Archive ("libbrotlienc.a"),
+			new Archive ("libbrotlidec.a"),
+			new Archive ("libbrotlicommon.a"),
 
-			new BclArchive ("libSystem.Globalization.Native.a"),
-			new BclArchive ("libSystem.IO.Compression.Native.a"),
-			new BclArchive ("libSystem.Native.a"),
-			new BclArchive ("libSystem.Security.Cryptography.Native.Android.a", jniOnLoadName: "AndroidCryptoNative_InitLibraryOnLoad") {
-				SymbolsToPreserve = new (StringComparer.Ordinal) {
-					// This isn't referenced directly by any code in libSystem.Security.Cryptography.Native.Android.  It is instead
-					// referenced by the Java code shipped with the component (`DotnetProxyTrustManager`), as a native Java method:
-					//
-					//   static native boolean verifyRemoteCertificate(long sslStreamProxyHandle);
-					//
-					// Therefore we must reference it explicitly
-					"Java_net_dot_android_crypto_DotnetProxyTrustManager_verifyRemoteCertificate"
-				},
-
-				// For now, we have to export all the symbols from this archive because we need the above `Java_net*` symbol to be
-				// externally visible, and the linker's `--exclude-libs` flag works on the archive (.a) level.
-				//
-				// TODO: use `llvm-ar` to extract the relevant object file and link it separately?
-				DontExportSymbols = false,
-			},
+			new Archive ("libSystem.Globalization.Native.a"),
+			new Archive ("libSystem.IO.Compression.Native.a"),
+			new Archive ("libSystem.Native.a"),
+			new Archive ("libSystem.Security.Cryptography.Native.Android.a", jniOnLoadName: "AndroidCryptoNative_InitLibraryOnLoad"),
 
 			// .NET for Android
-			new AndroidArchive ("libnet-android.release-static-release.a", wholeArchive: true),
-			new AndroidArchive ("libruntime-base-common-release.a"),
-			new AndroidArchive ("libruntime-base-release.a"),
-			new AndroidArchive ("libxa-java-interop-release.a"),
-			new AndroidArchive ("libxa-shared-bits-release.a"),
-			new AndroidArchive ("libxamarin-startup-release.a"),
+			new Archive ("libnet-android.release-static-release.a"),
+			new Archive ("libruntime-base-common-release.a"),
+			new Archive ("libruntime-base-release.a"),
+			new Archive ("libxa-java-interop-release.a"),
+			new Archive ("libxa-shared-bits-release.a"),
+			new Archive ("libxamarin-startup-release.a"),
 
 			// LLVM clang built-ins archives
-			new ClangBuiltinsArchive ("aarch64"),
-			new ClangBuiltinsArchive ("arm"),
-			new ClangBuiltinsArchive ("i686"),
-			new ClangBuiltinsArchive ("x86_64"),
-		};
-
-		// Just the base names of libraries to link into the unified runtime.  Must have all the dependencies of all the static archives we
-		// link into the final library.
-		NativeLibraries = new () {
-			"c",
-			"dl",
-			"log",
-			"m",
-			"z",
-		};
-
-		// Files that will be linked before any other object/archive/library files
-		LinkStartFiles = new () {
-			"crtbegin_so.o",
-		};
-
-		// Files that will be linked after any other object/archive/library files
-		LinkEndFiles = new () {
-			"crtend_so.o",
+			new Archive ("libclang_rt.builtins-aarch64-android.a"),
+			new Archive ("libclang_rt.builtins-arm-android.a"),
+			new Archive ("libclang_rt.builtins-i686-android.a"),
+			new Archive ("libclang_rt.builtins-x86_64-android.a"),
 		};
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
deleted file mode 100644
index 251fd345d66..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tasks.LLVMIR;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-class PreservePinvokesNativeAssemblyGenerator : LlvmIrComposer
-{
-	sealed class PInvoke
-	{
-		public readonly LlvmIrFunction NativeFunction;
-		public readonly uint Hash;
-
-		public PInvoke (LlvmIrModule module, PinvokeScanner.PinvokeEntryInfo pinfo)
-		{
-			Hash = TypeMapHelper.HashNameForCLR (pinfo.EntryName);
-
-			// All the p/invoke functions use the same dummy signature.  The only thing we care about is
-			// a way to reference to the symbol at build time so that we can return pointer to it.  For
-			// that all we need is a known name, signature doesn't matter to us.
-			var funcSig = new LlvmIrFunctionSignature (name: pinfo.EntryName, returnType: typeof(void));
-			NativeFunction = module.DeclareExternalFunction (funcSig);
-		}
-	}
-
-	sealed class Component
-	{
-		public readonly string Name;
-		public readonly uint NameHash;
-		public readonly List<PInvoke> PInvokes;
-
-		public Component (string name)
-		{
-			Name = name;
-			NameHash = TypeMapHelper.HashNameForCLR (name);
-			PInvokes = new ();
-		}
-
-		public void Add (LlvmIrModule module, PinvokeScanner.PinvokeEntryInfo pinfo)
-		{
-			PInvokes.Add (new PInvoke (module, pinfo));
-		}
-
-		public void Sort ()
-		{
-			PInvokes.Sort ((PInvoke a, PInvoke b) => a.Hash.CompareTo (b.Hash));
-		}
-	}
-
-	sealed class ConstructionState
-	{
-		public LlvmIrFunction Func = null!;
-		public LlvmIrFunctionLabelItem ReturnLabel = null!;
-		public LlvmIrFunctionParameter EntryPointHashParam = null!;
-		public LlvmIrInstructions.Phi Phi = null!;
-	}
-
-	// Maps a component name after ridding it of the `lib` prefix and the extension to a "canonical"
-	// name of a library, as used in `[DllImport]` attributes.
-	readonly Dictionary<string, string> libraryNameMap = new (StringComparer.Ordinal) {
-		{ "xa-java-interop",             "java-interop" },
-		{ "mono-android.release-static", String.Empty },
-		{ "mono-android.release",        String.Empty },
-	};
-
-	readonly AndroidTargetArch targetArch;
-	readonly List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos;
-	readonly ITaskItem[] monoComponents;
-
-	public PreservePinvokesNativeAssemblyGenerator (TaskLoggingHelper log, AndroidTargetArch targetArch, List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos, ITaskItem[] monoComponents)
-		: base (log)
-	{
-		this.targetArch = targetArch;
-		this.pinvokeInfos = pinvokeInfos ?? throw new ArgumentNullException (nameof (pinvokeInfos));
-		this.monoComponents = monoComponents;
-	}
-
-	protected override void Construct (LlvmIrModule module)
-	{
-		Log.LogDebugMessage ($"[{targetArch}] Constructing p/invoke preserve code");
-		if (pinvokeInfos.Count == 0) {
-			// This is a very unlikely scenario, but we will work just fine.  The module that this generator produces will merely result
-			// in an empty (but valid) .ll file and an "empty" object file to link into the shared library.
-			return;
-		}
-
-		Log.LogDebugMessage ("  Looking for enabled native components");
-		var componentNames = new HashSet<string> (StringComparer.Ordinal);
-		var componentLoadHandlers = new Dictionary<string, string> (StringComparer.Ordinal);
-		var componentPreservedSymbols = new Dictionary<string, HashSet<LlvmIrGlobalVariableReference>> (StringComparer.Ordinal);
-		var nativeComponents = new NativeRuntimeComponents (monoComponents);
-		foreach (NativeRuntimeComponents.Archive archiveItem in nativeComponents.KnownArchives) {
-			if (!archiveItem.Include) {
-				continue;
-			}
-
-			Log.LogDebugMessage ($"    {archiveItem.Name}");
-			componentNames.Add (archiveItem.Name);
-			if (!archiveItem.JniOnLoadName.IsNullOrEmpty ()) {
-				componentLoadHandlers.Add (archiveItem.Name, archiveItem.JniOnLoadName!);
-			}
-
-			if (archiveItem.SymbolsToPreserve == null || archiveItem.SymbolsToPreserve.Count == 0) {
-				continue;
-			}
-
-			var preservedSymbols = new HashSet<LlvmIrGlobalVariableReference> ();
-			foreach (string symbolName in archiveItem.SymbolsToPreserve) {
-				preservedSymbols.Add (new LlvmIrGlobalVariableReference (symbolName));
-			}
-			componentPreservedSymbols.Add (archiveItem.Name, preservedSymbols);
-		}
-
-		if (componentNames.Count == 0) {
-			Log.LogDebugMessage ("No native framework components are included in the build, not scanning for p/invoke usage");
-			return;
-		}
-
-		switch (targetArch) {
-			case AndroidTargetArch.Arm64:
-			case AndroidTargetArch.X86_64:
-			case AndroidTargetArch.Arm:
-			case AndroidTargetArch.X86:
-				break;
-			default:
-				throw new NotSupportedException ($"Architecture {targetArch} is not supported here");
-		}
-
-		Log.LogDebugMessage ("  Checking discovered p/invokes against the list of components");
-		var preservedPerComponent = new Dictionary<string, Component> (StringComparer.OrdinalIgnoreCase);
-		var processedCache = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
-		var jniOnLoadNames = new HashSet<string> (StringComparer.Ordinal);
-		bool haveLoadHandlers = componentLoadHandlers.Count > 0;
-		bool havePreservedSymbols = componentPreservedSymbols.Count > 0;
-
-		var symbolsToExplicitlyPreserve = new HashSet<LlvmIrGlobalVariableReference> ();
-
-		foreach (PinvokeScanner.PinvokeEntryInfo pinfo in pinvokeInfos) {
-			Log.LogDebugMessage ($"    p/invoke: {pinfo.EntryName} in {pinfo.LibraryName}");
-			string key = $"{pinfo.LibraryName}/${pinfo.EntryName}";
-			if (processedCache.Contains (key)) {
-				Log.LogDebugMessage ($"      already processed");
-				continue;
-			}
-
-			processedCache.Add (key);
-			(bool preserve, string? componentName) = MustPreserve (pinfo, componentNames);
-			if (!preserve) {
-				Log.LogDebugMessage ("      no need to preserve");
-				continue;
-			}
-			Log.LogDebugMessage ("      must be preserved");
-
-			if (!componentName.IsNullOrEmpty ()) {
-				if (haveLoadHandlers  && componentLoadHandlers.TryGetValue (componentName!, out string jniOnLoadName)) {
-					if (jniOnLoadNames.Add (jniOnLoadName)) {
-						Log.LogDebugMessage ($"      component '{componentName}' registers a load handler '{jniOnLoadName}'");
-					}
-				}
-
-				if (havePreservedSymbols && componentPreservedSymbols.TryGetValue (componentName!, out HashSet<LlvmIrGlobalVariableReference> preservedSymbols)) {
-					foreach (LlvmIrGlobalVariableReference vref in preservedSymbols) {
-						LlvmIrHelpers.DeclareDummyFunction (module, vref);
-						symbolsToExplicitlyPreserve.Add (vref);
-					}
-					componentPreservedSymbols.Remove (componentName!);
-				}
-			}
-
-			if (!preservedPerComponent.TryGetValue (pinfo.LibraryName, out Component? component)) {
-				component = new Component (pinfo.LibraryName);
-				preservedPerComponent.Add (component.Name, component);
-			}
-			component.Add (module, pinfo);
-		}
-
-		JniOnLoadNativeAssemblerHelper.GenerateJniOnLoadHandlerCode (jniOnLoadNames, module);
-		module.AddGlobalVariable ("__explicitly_preserved_symbols", symbolsToExplicitlyPreserve, LlvmIrVariableOptions.GlobalConstant);
-		var components = new List<Component> (preservedPerComponent.Values);
-		AddFindPinvoke (module, components);
-	}
-
-	void AddFindPinvoke (LlvmIrModule module, List<Component> components)
-	{
-		var parameters = new List<LlvmIrFunctionParameter> {
-			new LlvmIrFunctionParameter (typeof(uint), "library_name_hash") {
-				NoUndef = true,
-			},
-
-			new LlvmIrFunctionParameter (typeof(uint), "entrypoint_hash") {
-				NoUndef = true,
-			},
-
-			new LlvmIrFunctionParameter (typeof(IntPtr), "known_library") {
-				Align = 1, // it's a reference to C++ `bool`
-				Dereferenceable = 1,
-				IsCplusPlusReference = true,
-				NoCapture = true,
-				NonNull = true,
-				NoUndef = true,
-				WriteOnly = true,
-			},
-		};
-
-		var sig = new LlvmIrFunctionSignature (
-			name: "find_pinvoke",
-			returnType: typeof(IntPtr),
-			parameters: parameters,
-			new LlvmIrFunctionSignature.ReturnTypeAttributes {
-				NoUndef = true,
-			}
-		);
-
-		var func = new LlvmIrFunction (sig, MakeFindPinvokeAttributeSet (module)) {
-			CallingConvention = LlvmIrCallingConvention.Fastcc,
-			Visibility = LlvmIrVisibility.Hidden,
-		};
-		LlvmIrLocalVariable retval = func.CreateLocalVariable (typeof(IntPtr), "retval");
-		var state = new ConstructionState {
-			Func = func,
-			ReturnLabel = new LlvmIrFunctionLabelItem ("return"),
-			EntryPointHashParam = parameters[1],
-			Phi = new LlvmIrInstructions.Phi (retval),
-		};
-		module.Add (state.Func);
-		state.Func.Body.Add (new LlvmIrFunctionLabelItem ("entry"));
-
-		var libraryNameSwitchEpilog = new LlvmIrFunctionLabelItem ("libNameSW.epilog");
-		var componentSwitch = new LlvmIrInstructions.Switch<uint> (parameters[0], libraryNameSwitchEpilog, "sw.libname");
-
-		state.Func.Body.Add (componentSwitch);
-		state.Phi.AddNode (libraryNameSwitchEpilog, null);
-
-		components.Sort ((Component a, Component b) => a.NameHash.CompareTo (b.NameHash));
-		Log.LogDebugMessage ("  Components to be preserved:");
-		uint componentID = 1;
-
-		foreach (Component component in components) {
-			Log.LogDebugMessage ($"    {component.Name} (hash: 0x{component.NameHash:x}; {component.PInvokes.Count} p/invoke(s))");
-
-			string comment = $" {component.Name} (p/invoke count: {component.PInvokes.Count})";
-			LlvmIrFunctionLabelItem componentLabel = AddSwitchItem (componentSwitch, component.NameHash, comment, null);
-
-			func.Body.Add (componentLabel, comment);
-			AddPInvokeSwitch (state, componentLabel, component, componentID++);
-		}
-
-		func.Body.Add (libraryNameSwitchEpilog);
-
-		var setKnownLib = new LlvmIrInstructions.Store (false, parameters[2]);
-		func.Body.Add (setKnownLib);
-		AddReturnBranch (func, state.ReturnLabel);
-
-		func.Body.Add (state.ReturnLabel);
-		func.Body.Add (state.Phi);
-		func.Body.Add (new LlvmIrInstructions.Ret (typeof (IntPtr), retval));
-	}
-
-	void AddPInvokeSwitch (ConstructionState state, LlvmIrFunctionLabelItem componentLabel, Component component, uint id)
-	{
-		var pinvokeSwitchEpilog = new LlvmIrFunctionLabelItem ($"pinvokeSW.epilog.{id}");
-		state.Phi.AddNode (pinvokeSwitchEpilog, null);
-
-		var pinvokeSwitch = new LlvmIrInstructions.Switch<uint> (state.EntryPointHashParam, pinvokeSwitchEpilog, $"sw.pinvoke.{id}");
-		state.Func.Body.Add (pinvokeSwitch);
-
-		component.Sort ();
-		bool first = true;
-		foreach (PInvoke pi in component.PInvokes) {
-			string pinvokeName = pi.NativeFunction.Signature.Name;
-			string comment = $" {pinvokeName}";
-			LlvmIrFunctionLabelItem pinvokeLabel = AddSwitchItem (pinvokeSwitch, pi.Hash, comment, first ? state.ReturnLabel : null);
-
-			// First item of every component switch block "reuses" the block's label
-			if (first) {
-				first = false;
-			} else {
-				state.Func.Body.Add (pinvokeLabel, comment);
-				AddReturnBranch (state.Func, state.ReturnLabel);
-			}
-
-			state.Phi.AddNode (pinvokeLabel == state.ReturnLabel ? componentLabel : pinvokeLabel, new LlvmIrGlobalVariableReference (pinvokeName));
-		}
-
-		state.Func.Body.Add (pinvokeSwitchEpilog);
-		AddReturnBranch (state.Func, state.ReturnLabel);
-	}
-
-	void AddReturnBranch (LlvmIrFunction func, LlvmIrFunctionLabelItem returnLabel)
-	{
-		var branch = new LlvmIrInstructions.Br (returnLabel);
-		func.Body.Add (branch);
-	}
-
-	LlvmIrFunctionLabelItem AddSwitchItem (LlvmIrInstructions.Switch<uint> sw, uint hash, string? comment, LlvmIrFunctionLabelItem? label)
-	{
-		return sw.Add (hash, dest: label, comment: comment);
-	}
-
-	LlvmIrFunctionAttributeSet MakeFindPinvokeAttributeSet (LlvmIrModule module)
-	{
-		var attrSet = new LlvmIrFunctionAttributeSet {
-			new MustprogressFunctionAttribute (),
-			new NofreeFunctionAttribute (),
-			new NorecurseFunctionAttribute (),
-			new NosyncFunctionAttribute (),
-			new NounwindFunctionAttribute (),
-			new WillreturnFunctionAttribute (),
-			new MemoryFunctionAttribute {
-				Default = MemoryAttributeAccessKind.Write,
-				Argmem = MemoryAttributeAccessKind.None,
-				InaccessibleMem = MemoryAttributeAccessKind.None,
-			},
-			new UwtableFunctionAttribute (),
-			new NoTrappingMathFunctionAttribute (true),
-		};
-
-		return module.AddAttributeSet (attrSet);
-	}
-
-	// Returns `true` for all p/invokes that we know are part of our set of components, otherwise returns `false`.
-	// Returning `false` merely means that the p/invoke isn't in any of BCL or our code and therefore we shouldn't
-	// care.  It doesn't mean the p/invoke will be removed in any way.
-	(bool preserve, string? componentName) MustPreserve (PinvokeScanner.PinvokeEntryInfo pinfo, ICollection<string> components)
-	{
-		if (MonoAndroidHelper.StringEquals ("xa-internal-api", pinfo.LibraryName, StringComparison.Ordinal)) {
-			return (true, null);
-		}
-
-		foreach (string component in components) {
-			// The most common pattern for the BCL - file name without extension
-			string componentName = Path.GetFileNameWithoutExtension (component);
-			if (Matches (pinfo.LibraryName, componentName)) {
-				return (true, componentName);
-			}
-
-			// If it starts with `lib`, drop the prefix
-			if (componentName.StartsWith ("lib", StringComparison.Ordinal)) {
-				if (Matches (pinfo.LibraryName, componentName.Substring (3))) {
-					return (true, componentName);
-				}
-			}
-
-			// Might require mapping of component name to a canonical one
-			if (libraryNameMap.TryGetValue (componentName, out string? mappedComponentName) && !mappedComponentName.IsNullOrEmpty ()) {
-				if (Matches (pinfo.LibraryName, mappedComponentName)) {
-					return (true, componentName);
-				}
-			}
-
-			// Try full file name, as the last resort
-			if (Matches (pinfo.LibraryName, Path.GetFileName (component))) {
-				return (true, componentName);
-			}
-		}
-
-		return (false, null);
-
-		bool Matches (string libraryName, string componentName)
-		{
-			return MonoAndroidHelper.StringEquals (libraryName, componentName, StringComparison.Ordinal);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 5a54c3d1c1e..aef387cbfcc 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -59,7 +59,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateLibraryResources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateManagedAidlProxies" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeApplicationConfigSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeRuntimeLinkingSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesigner" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesignerAssembly" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GeneratePackageManagerJava" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -1505,14 +1504,6 @@ because xbuild doesn't support framework reference assemblies.
     Mode="compressed">
       <Output TaskParameter="AssemblySources" ItemName="_CompressedAssembliesAssemblySource" />
   </PrepareAbiItems>
-  <PrepareAbiItems
-    Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' "
-    BuildTargetAbis="@(_BuildTargetAbis)"
-    NativeSourcesDir="$(_NativeAssemblySourceDir)"
-    Debug="$(AndroidIncludeDebugSymbols)"
-    Mode="runtime_linking">
-      <Output TaskParameter="AssemblySources" ItemName="_RuntimeLinkingAssemblySource" />
-  </PrepareAbiItems>
 </Target>
 
 <Target Name="_GenerateEnvironmentFiles" DependsOnTargets="_AndroidConfigureHotReloadEnvironment">
@@ -1673,18 +1664,9 @@ because xbuild doesn't support framework reference assemblies.
       >
   </GenerateNativeApplicationConfigSources>
 
-  <GenerateNativeRuntimeLinkingSources
-      Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' "
-      MonoComponents="@(_MonoComponent)"
-      EnvironmentOutputDirectory="$(IntermediateOutputPath)android"
-      ResolvedAssemblies="@(_ResolvedAssemblies)"
-      SupportedAbis="@(_BuildTargetAbis)">
-  </GenerateNativeRuntimeLinkingSources>
-
   <Touch Files="$(_AndroidStampDirectory)_GeneratePackageManagerJava.stamp" AlwaysCreate="True" />
   <ItemGroup>
     <FileWrites Include="@(_EnvironmentAssemblySource)" />
-    <FileWrites Condition=" '$(_AndroidEnableNativeRuntimeLinking)' == 'true' " Include="@(_RuntimeLinkingAssemblySource)" />
   </ItemGroup>
 </Target>
 
@@ -1812,7 +1794,6 @@ because xbuild doesn't support framework reference assemblies.
 	<_CompileToDalvikDependsOnTargets>
 		_CompileJava;
 		_CreateApplicationSharedLibraries;
-		$(_NativeRuntimeLinking);
 		$(_BeforeCompileToDalvik);
 		_GetLibraryImports;
 		_SetProguardMappingFileProperty;
@@ -1907,9 +1888,6 @@ because xbuild doesn't support framework reference assemblies.
     <_NativeAssemblyTarget Include="@(_AndroidRemapAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
       <abi>%(_AndroidRemapAssemblySource.abi)</abi>
     </_NativeAssemblyTarget>
-    <_NativeAssemblyTarget Include="@(_RuntimeLinkingAssemblySource->'$([System.IO.Path]::ChangeExtension('%(Identity)', '.o'))')">
-      <abi>%(_RuntimeLinkingAssemblySource.abi)</abi>
-    </_NativeAssemblyTarget>
   </ItemGroup>
 </Target>
 
@@ -1931,10 +1909,10 @@ because xbuild doesn't support framework reference assemblies.
 
 <Target Name="_CompileNativeAssemblySources"
     DependsOnTargets="_PrepareNativeAssemblyItems;_GenerateCompressedAssembliesNativeSourceFiles"
-    Inputs="@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_AndroidRemapAssemblySource);@(_RuntimeLinkingAssemblySource)"
+    Inputs="@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_AndroidRemapAssemblySource)"
     Outputs="@(_NativeAssemblyTarget)">
   <CompileNativeAssembly
-      Sources="@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_AndroidRemapAssemblySource);@(_RuntimeLinkingAssemblySource)"
+      Sources="@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_AndroidRemapAssemblySource)"
       DebugBuild="$(AndroidIncludeDebugSymbols)"
       WorkingDirectory="$(_NativeAssemblySourceDir)"
       AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
@@ -1955,8 +1933,7 @@ because xbuild doesn't support framework reference assemblies.
 <Target Name="_CreateApplicationSharedLibraries"
     DependsOnTargets="_CompileNativeAssemblySources;_PrepareApplicationSharedLibraryItems"
     Inputs="@(_NativeAssemblyTarget)"
-    Outputs="@(_ApplicationSharedLibrary)"
-    Condition=" '$(_AndroidEnableNativeRuntimeLinking)' != 'true' ">
+    Outputs="@(_ApplicationSharedLibrary)">
   <LinkApplicationSharedLibraries
       IntermediateOutputPath="$(IntermediateOutputPath)"
       ObjectFiles="@(_NativeAssemblyTarget)"

From 50ae9121a35d2fca2e2c54d6ea9e76f45393de76 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 13:20:33 +0200
Subject: [PATCH 38/58] Inline LLVM IR structure comments and numeric
 formatting

Keep static structure comments directly in IR literals and render numeric values under a scoped invariant culture instead of using number and hex formatting wrappers. Preserve safe escaping for comments containing dynamic input.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ...rateNativeApplicationConfigSourcesTests.cs |   1 +
 .../Tasks/LlvmIrWriterTests.cs                |  35 +++-
 .../Utilities/EnvironmentHelper.cs            |   2 +-
 .../Utilities/AppEnvironmentVariableTable.cs  |  12 +-
 ...pplicationConfigNativeAssemblyGenerator.cs | 166 +++++++++---------
 ...ressedAssembliesNativeAssemblyGenerator.cs |  26 +--
 .../JniRemappingAssemblyGenerator.cs          |  48 ++---
 .../Utilities/LlvmIrWriter.cs                 |  41 ++---
 ...veAotEnvironmentNativeAssemblyGenerator.cs |   8 +-
 ...NativeAotJniInitNativeAssemblyGenerator.cs |  12 +-
 10 files changed, 188 insertions(+), 163 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
index 30f2bb79ae4..4f10f54f831 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
@@ -50,6 +50,7 @@ public void EmitsApplicationConfigForAllAbis (bool emitComments)
 			Assert.That (source, Does.Contain ("@assembly_store = "), abi);
 			Assert.That (source, Does.Contain ("@dso_cache = "), abi);
 			Assert.That (source, Does.Contain ("!llvm.module.flags = "), abi);
+			Assert.That (source, Does.Contain ("i1, ; bool uses_assembly_preload"), abi);
 			Assert.That (source, emitComments ? Does.Contain ("; Application environment variables") : Does.Not.Contain ("; Application environment variables"), abi);
 		}
 	}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
index 705ca785eb1..ac1ba811428 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -39,7 +40,7 @@ public void StringBlobDeduplicatesStringsByOffset ()
 	public void CommentsCannotInjectLinesIntoIr ()
 	{
 		using var output = new StringWriter ();
-		var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments: true);
+		using var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments: true);
 
 		Assert.That (writer.Comment (" first\nsecond"), Does.Not.Contain ("\n"));
 		Assert.That (writer.TrailingComment (" first\rsecond"), Does.Not.Contain ("\r"));
@@ -47,6 +48,38 @@ public void CommentsCannotInjectLinesIntoIr ()
 		Assert.That (output.ToString ().Split ('\n'), Has.Length.EqualTo (2));
 	}
 
+	[TestCase (false)]
+	[TestCase (true)]
+	public void InlineStructureCommentsAreUnconditional (bool emitComments)
+	{
+		using var output = new StringWriter ();
+		using var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments);
+		writer.Write ("i32, ; field\nptr ; final field");
+
+		string text = output.ToString ();
+		Assert.That (text, Does.Contain ("i32, ; field"));
+		Assert.That (text, Does.Contain ("ptr ; final field"));
+	}
+
+	[Test]
+	public void WriterRestoresCulture ()
+	{
+		CultureInfo originalCulture = CultureInfo.CurrentCulture;
+		try {
+			CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo ("fr-FR");
+			using var output = new StringWriter ();
+			using (var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments: false)) {
+				Assert.That (CultureInfo.CurrentCulture, Is.EqualTo (CultureInfo.InvariantCulture));
+				writer.WriteGlobal ("number", LlvmIrWriter.GlobalConstant, "i32", 42.ToString (), 4);
+			}
+
+			Assert.That (output.ToString (), Does.Contain ("i32 42, align 4"));
+			Assert.That (CultureInfo.CurrentCulture, Is.EqualTo (CultureInfo.GetCultureInfo ("fr-FR")));
+		} finally {
+			CultureInfo.CurrentCulture = originalCulture;
+		}
+	}
+
 	[Test]
 	public void NativeAotJniInitDeduplicatesHandlers ()
 	{
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
index ba548184277..14d3bbeb782 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
@@ -935,7 +935,7 @@ static byte ConvertFieldToByte (string fieldName, string llvmAssemblerEnvFile, s
 			return fv;
 		}
 
-		// These fields are always uint32_t/uint64_t and LlvmIrWriter.Number writes unsigned decimal values,
+		// These fields are always uint32_t/uint64_t and the IR writer emits unsigned decimal values,
 		// so parse them directly as unsigned.
 		static bool TryParseInteger (string value, out uint fv)
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs b/src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs
index bd9c32791ab..06d02a03890 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/AppEnvironmentVariableTable.cs
@@ -47,8 +47,8 @@ public static void WriteDeclaration (LlvmIrWriter w)
 		w.Write ($$"""
 
 			%struct.AppEnvironmentVariable = type {
-				i32, {{w.Comment (" uint32_t name_index")}}
-				i32 {{w.Comment (" uint32_t value_index")}}
+				i32, ; uint32_t name_index
+				i32 ; uint32_t value_index
 			}
 
 			""");
@@ -60,8 +60,8 @@ public void Write (LlvmIrWriter w, string arrayName, string contentsName, string
 		foreach (var e in entries) {
 			elements.Add ($$"""
 					%struct.AppEnvironmentVariable {
-						i32 {{LlvmIrWriter.Number (e.NameIndex)}}, {{w.Comment ($" '{e.Name}'")}}
-						i32 {{LlvmIrWriter.Number (e.ValueIndex)}}{{w.Comment ($" '{e.Value}'")}}
+						i32 {{e.NameIndex}}, {{w.Comment ($" '{e.Name}'")}}
+						i32 {{e.ValueIndex}}{{w.Comment ($" '{e.Value}'")}}
 					}
 				""");
 		}
@@ -69,8 +69,8 @@ public void Write (LlvmIrWriter w, string arrayName, string contentsName, string
 		w.WriteGlobal (
 			arrayName,
 			LlvmIrWriter.GlobalConstant,
-			$"[{LlvmIrWriter.Number (elements.Count)} x %struct.AppEnvironmentVariable]",
-			w.ArrayValue (elements, LlvmIrWriter.IndexComment),
+			$"[{elements.Count} x %struct.AppEnvironmentVariable]",
+			w.ArrayValue (elements, i => $" {i}"),
 			w.GetAggregateAlignment (StructureAlignment, (ulong)elements.Count * StructureSize),
 			comment
 		);
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
index d2bf8dcc9e4..5d679bcdc94 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
@@ -77,7 +77,7 @@ public State (AppEnvironmentVariableTable environmentVariables, AppEnvironmentVa
 	State? state;
 
 	/// <summary>
-	/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+	/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
 	/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
 	/// </summary>
 	public bool EmitComments { get; set; }
@@ -194,7 +194,7 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 	{
 		State data = EnsureState ();
 
-		var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
 		var strings = new LlvmIrStringPool ();
 		ulong structAlignment = Math.Max (w.Target.PointerSize, NonPointerMemberAlignment);
 
@@ -203,69 +203,69 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 		w.Write ($$"""
 
 			%struct.ApplicationConfig = type {
-				i1, {{w.Comment (" bool uses_assembly_preload")}}
-				i1, {{w.Comment (" bool marshal_methods_enabled")}}
-				i1, {{w.Comment (" bool ignore_split_configs")}}
-				i32, {{w.Comment (" uint32_t number_of_runtime_properties")}}
-				i32, {{w.Comment (" uint32_t package_naming_policy")}}
-				i32, {{w.Comment (" uint32_t environment_variable_count")}}
-				i32, {{w.Comment (" uint32_t system_property_count")}}
-				i32, {{w.Comment (" uint32_t number_of_assemblies_in_apk")}}
-				i32, {{w.Comment (" uint32_t bundled_assembly_name_width")}}
-				i32, {{w.Comment (" uint32_t number_of_dso_cache_entries")}}
-				i32, {{w.Comment (" uint32_t number_of_shared_libraries")}}
-				i32, {{w.Comment (" uint32_t android_runtime_jnienv_class_token")}}
-				i32, {{w.Comment (" uint32_t jnienv_initialize_method_token")}}
-				i32, {{w.Comment (" uint32_t jni_remapping_replacement_type_count")}}
-				i32, {{w.Comment (" uint32_t jni_remapping_replacement_method_index_entry_count")}}
-				ptr, {{w.Comment (" char* android_package_name")}}
-				i1 {{w.Comment (" bool have_assembly_store")}}
+				i1, ; bool uses_assembly_preload
+				i1, ; bool marshal_methods_enabled
+				i1, ; bool ignore_split_configs
+				i32, ; uint32_t number_of_runtime_properties
+				i32, ; uint32_t package_naming_policy
+				i32, ; uint32_t environment_variable_count
+				i32, ; uint32_t system_property_count
+				i32, ; uint32_t number_of_assemblies_in_apk
+				i32, ; uint32_t bundled_assembly_name_width
+				i32, ; uint32_t number_of_dso_cache_entries
+				i32, ; uint32_t number_of_shared_libraries
+				i32, ; uint32_t android_runtime_jnienv_class_token
+				i32, ; uint32_t jnienv_initialize_method_token
+				i32, ; uint32_t jni_remapping_replacement_type_count
+				i32, ; uint32_t jni_remapping_replacement_method_index_entry_count
+				ptr, ; char* android_package_name
+				i1 ; bool have_assembly_store
 			}
 
 			%struct.AssemblyStoreAssemblyDescriptor = type {
-				i32, {{w.Comment (" uint32_t data_offset")}}
-				i32, {{w.Comment (" uint32_t data_size")}}
-				i32, {{w.Comment (" uint32_t debug_data_offset")}}
-				i32, {{w.Comment (" uint32_t debug_data_size")}}
-				i32, {{w.Comment (" uint32_t config_data_offset")}}
-				i32 {{w.Comment (" uint32_t config_data_size")}}
+				i32, ; uint32_t data_offset
+				i32, ; uint32_t data_size
+				i32, ; uint32_t debug_data_offset
+				i32, ; uint32_t debug_data_size
+				i32, ; uint32_t config_data_offset
+				i32 ; uint32_t config_data_size
 			}
 
 			%struct.AssemblyStoreRuntimeData = type {
-				ptr, {{w.Comment (" uint8_t data_start")}}
-				i32, {{w.Comment (" uint32_t assembly_count")}}
-				i32, {{w.Comment (" uint32_t index_entry_count")}}
-				ptr {{w.Comment (" AssemblyStoreAssemblyDescriptor assemblies")}}
+				ptr, ; uint8_t data_start
+				i32, ; uint32_t assembly_count
+				i32, ; uint32_t index_entry_count
+				ptr ; AssemblyStoreAssemblyDescriptor assemblies
 			}
 
 			%struct.AssemblyStoreSingleAssemblyRuntimeData = type {
-				ptr, {{w.Comment (" uint8_t image_data")}}
-				ptr, {{w.Comment (" uint8_t debug_info_data")}}
-				ptr, {{w.Comment (" uint8_t config_data")}}
-				ptr {{w.Comment (" AssemblyStoreAssemblyDescriptor descriptor")}}
+				ptr, ; uint8_t image_data
+				ptr, ; uint8_t debug_info_data
+				ptr, ; uint8_t config_data
+				ptr ; AssemblyStoreAssemblyDescriptor descriptor
 			}
 
 			%struct.DSOCacheEntry = type {
-				i32, {{w.Comment (" uint32_t hash")}}
-				i1, {{w.Comment (" bool ignore")}}
-				i1, {{w.Comment (" bool is_jni_library")}}
-				i32, {{w.Comment (" uint32_t name_index")}}
-				ptr {{w.Comment (" void* handle")}}
+				i32, ; uint32_t hash
+				i1, ; bool ignore
+				i1, ; bool is_jni_library
+				i32, ; uint32_t name_index
+				ptr ; void* handle
 			}
 
 			%struct.XamarinAndroidBundledAssembly = type {
-				i32, {{w.Comment (" int32_t file_fd")}}
-				ptr, {{w.Comment (" char* file_name")}}
-				i32, {{w.Comment (" uint32_t data_offset")}}
-				i32, {{w.Comment (" uint32_t data_size")}}
-				ptr, {{w.Comment (" uint8_t data")}}
-				i32, {{w.Comment (" uint32_t name_length")}}
-				ptr {{w.Comment (" char* name")}}
+				i32, ; int32_t file_fd
+				ptr, ; char* file_name
+				i32, ; uint32_t data_offset
+				i32, ; uint32_t data_size
+				ptr, ; uint8_t data
+				i32, ; uint32_t name_length
+				ptr ; char* name
 			}
 
 			""");
 
-		w.WriteGlobal ("format_tag", LlvmIrWriter.GlobalConstant, "i64", LlvmIrWriter.Number (FORMAT_TAG), 8, $" 0x{FORMAT_TAG:x}");
+		w.WriteGlobal ("format_tag", LlvmIrWriter.GlobalConstant, "i64", FORMAT_TAG.ToString (), 8, $" 0x{FORMAT_TAG:x}");
 
 		data.EnvironmentVariables.Write (w, "app_environment_variables", "app_environment_variable_contents", " Application environment variables array, name:value");
 		data.SystemProperties.Write (w, "app_system_properties", "app_system_property_contents", " System properties defined by the application");
@@ -273,23 +273,23 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 		ApplicationConfig cfg = data.ApplicationConfig;
 		w.WriteGlobal ("application_config", LlvmIrWriter.GlobalConstant, "%struct.ApplicationConfig", $$"""
 			{
-				i1 {{LlvmIrWriter.Bool (cfg.uses_assembly_preload)}}, {{w.Comment (" bool uses_assembly_preload")}}
-				i1 {{LlvmIrWriter.Bool (cfg.marshal_methods_enabled)}}, {{w.Comment (" bool marshal_methods_enabled")}}
-				i1 {{LlvmIrWriter.Bool (cfg.ignore_split_configs)}}, {{w.Comment (" bool ignore_split_configs")}}
-				i32 {{LlvmIrWriter.Number (cfg.number_of_runtime_properties)}}, {{w.Comment (" uint32_t number_of_runtime_properties")}}
-				i32 {{LlvmIrWriter.Number (cfg.package_naming_policy)}}, {{w.Comment (" uint32_t package_naming_policy")}}
-				i32 {{LlvmIrWriter.Number (cfg.environment_variable_count)}}, {{w.Comment (" uint32_t environment_variable_count")}}
-				i32 {{LlvmIrWriter.Number (cfg.system_property_count)}}, {{w.Comment (" uint32_t system_property_count")}}
-				i32 {{LlvmIrWriter.Number (cfg.number_of_assemblies_in_apk)}}, {{w.Comment (" uint32_t number_of_assemblies_in_apk")}}
-				i32 {{LlvmIrWriter.Number (cfg.bundled_assembly_name_width)}}, {{w.Comment (" uint32_t bundled_assembly_name_width")}}
-				i32 {{LlvmIrWriter.Number (cfg.number_of_dso_cache_entries)}}, {{w.Comment (" uint32_t number_of_dso_cache_entries")}}
-				i32 {{LlvmIrWriter.Number (cfg.number_of_shared_libraries)}}, {{w.Comment (" uint32_t number_of_shared_libraries")}}
-				i32 {{LlvmIrWriter.Hex (cfg.android_runtime_jnienv_class_token)}}, {{w.Comment (" uint32_t android_runtime_jnienv_class_token")}}
-				i32 {{LlvmIrWriter.Hex (cfg.jnienv_initialize_method_token)}}, {{w.Comment (" uint32_t jnienv_initialize_method_token")}}
-				i32 {{LlvmIrWriter.Hex (cfg.jni_remapping_replacement_type_count)}}, {{w.Comment (" uint32_t jni_remapping_replacement_type_count")}}
-				i32 {{LlvmIrWriter.Number (cfg.jni_remapping_replacement_method_index_entry_count)}}, {{w.Comment (" uint32_t jni_remapping_replacement_method_index_entry_count")}}
-				ptr {{strings.GetPointer (cfg.android_package_name, "ApplicationConfig", "android_package_name")}}, {{w.Comment (" char* android_package_name")}}
-				i1 {{LlvmIrWriter.Bool (cfg.have_assembly_store)}}{{w.Comment (" bool have_assembly_store")}}
+				i1 {{(cfg.uses_assembly_preload ? "true" : "false")}}, ; bool uses_assembly_preload
+				i1 {{(cfg.marshal_methods_enabled ? "true" : "false")}}, ; bool marshal_methods_enabled
+				i1 {{(cfg.ignore_split_configs ? "true" : "false")}}, ; bool ignore_split_configs
+				i32 {{cfg.number_of_runtime_properties}}, ; uint32_t number_of_runtime_properties
+				i32 {{cfg.package_naming_policy}}, ; uint32_t package_naming_policy
+				i32 {{cfg.environment_variable_count}}, ; uint32_t environment_variable_count
+				i32 {{cfg.system_property_count}}, ; uint32_t system_property_count
+				i32 {{cfg.number_of_assemblies_in_apk}}, ; uint32_t number_of_assemblies_in_apk
+				i32 {{cfg.bundled_assembly_name_width}}, ; uint32_t bundled_assembly_name_width
+				i32 {{cfg.number_of_dso_cache_entries}}, ; uint32_t number_of_dso_cache_entries
+				i32 {{cfg.number_of_shared_libraries}}, ; uint32_t number_of_shared_libraries
+				i32 u0x{{cfg.android_runtime_jnienv_class_token:x8}}, ; uint32_t android_runtime_jnienv_class_token
+				i32 u0x{{cfg.jnienv_initialize_method_token:x8}}, ; uint32_t jnienv_initialize_method_token
+				i32 u0x{{cfg.jni_remapping_replacement_type_count:x8}}, ; uint32_t jni_remapping_replacement_type_count
+				i32 {{cfg.jni_remapping_replacement_method_index_entry_count}}, ; uint32_t jni_remapping_replacement_method_index_entry_count
+				ptr {{strings.GetPointer (cfg.android_package_name, "ApplicationConfig", "android_package_name")}}, ; char* android_package_name
+				i1 {{(cfg.have_assembly_store ? "true" : "false")}}; bool have_assembly_store
 			}
 			""", w.GetAggregateAlignment (structAlignment, ApplicationConfigDataSize));
 
@@ -304,8 +304,8 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 		w.WriteGlobal (
 			"init_runtime_property_names",
 			LlvmIrWriter.GlobalConstant,
-			$"[{LlvmIrWriter.Number (names.Count)} x ptr]",
-			w.ArrayValue (names, i => $" {LlvmIrWriter.Number (i)} ('{data.RuntimePropertyNames [i]}')"),
+			$"[{names.Count} x ptr]",
+			w.ArrayValue (names, i => $" {i} ('{data.RuntimePropertyNames [i]}')"),
 			w.GetPointerArrayAlignment (names.Count),
 			"Names of properties passed to coreclr_initialize"
 		);
@@ -317,20 +317,20 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 		w.WriteGlobal (
 			"init_runtime_property_values",
 			LlvmIrWriter.GlobalWritable,
-			$"[{LlvmIrWriter.Number (values.Count)} x ptr]",
-			w.ArrayValue (values, i => $" {LlvmIrWriter.Number (i)} ('{data.RuntimePropertyValues [i]}')"),
+			$"[{values.Count} x ptr]",
+			w.ArrayValue (values, i => $" {i} ('{data.RuntimePropertyValues [i]}')"),
 			w.GetPointerArrayAlignment (values.Count),
 			"Values of properties passed to coreclr_initialize"
 		);
 
 		ulong assemblyCount = (ulong)NumberOfAssembliesInApk;
-		w.WriteGlobal ("assembly_store_bundled_assemblies", LlvmIrWriter.GlobalWritable, $"[{LlvmIrWriter.Number (assemblyCount)} x %struct.AssemblyStoreSingleAssemblyRuntimeData]", "zeroinitializer", w.GetAggregateAlignment (w.Target.PointerSize, assemblyCount * AssemblyStoreSingleAssemblyRuntimeDataDataSize));
+		w.WriteGlobal ("assembly_store_bundled_assemblies", LlvmIrWriter.GlobalWritable, $"[{assemblyCount} x %struct.AssemblyStoreSingleAssemblyRuntimeData]", "zeroinitializer", w.GetAggregateAlignment (w.Target.PointerSize, assemblyCount * AssemblyStoreSingleAssemblyRuntimeDataDataSize));
 		w.WriteGlobal ("assembly_store", LlvmIrWriter.GlobalWritable, "%struct.AssemblyStoreRuntimeData", $$"""
 			{
-				ptr null, {{w.Comment (" uint8_t* data_start")}}
-				i32 0, {{w.Comment (" uint32_t assembly_count")}}
-				i32 0, {{w.Comment (" uint32_t index_entry_count")}}
-				ptr null{{w.Comment (" AssemblyStoreAssemblyDescriptor* assemblies")}}
+				ptr null, ; uint8_t* data_start
+				i32 0, ; uint32_t assembly_count
+				i32 0, ; uint32_t index_entry_count
+				ptr null; AssemblyStoreAssemblyDescriptor* assemblies
 			}
 			""", w.GetAggregateAlignment (structAlignment, AssemblyStoreRuntimeDataDataSize));
 
@@ -349,24 +349,24 @@ void WriteDsoCache (LlvmIrWriter w, State state, ulong structAlignment)
 		foreach (DSOCacheEntry entry in state.DsoCache) {
 			entries.Add ($$"""
 					%struct.DSOCacheEntry {
-						i32 {{LlvmIrWriter.Hex (entry.hash)}}, {{w.Comment ($" from name: {entry.HashedName}")}}
-						i1 {{LlvmIrWriter.Bool (entry.ignore)}}, {{w.Comment (" bool ignore")}}
-						i1 {{LlvmIrWriter.Bool (entry.is_jni_library)}}, {{w.Comment (" bool is_jni_library")}}
-						i32 {{LlvmIrWriter.Number (entry.name_index)}}, {{w.Comment ($" name: {entry.RealName}")}}
-						ptr null{{w.Comment (" void* handle")}}
+						i32 u0x{{entry.hash:x8}}, {{w.Comment ($" from name: {entry.HashedName}")}}
+						i1 {{(entry.ignore ? "true" : "false")}}, ; bool ignore
+						i1 {{(entry.is_jni_library ? "true" : "false")}}, ; bool is_jni_library
+						i32 {{entry.name_index}}, {{w.Comment ($" name: {entry.RealName}")}}
+						ptr null; void* handle
 					}
 				""");
 		}
 		w.WriteGlobal (
 			"dso_cache",
 			LlvmIrWriter.GlobalWritable,
-			$"[{LlvmIrWriter.Number (entries.Count)} x %struct.DSOCacheEntry]",
-			w.ArrayValue (entries, LlvmIrWriter.IndexComment),
+			$"[{entries.Count} x %struct.DSOCacheEntry]",
+			w.ArrayValue (entries, i => $" {i}"),
 			w.GetAggregateAlignment (structAlignment, (ulong)entries.Count * DSOCacheEntryDataSize),
 			" DSO cache entries"
 		);
 
-		w.WriteGlobal ("dso_jni_preloads_idx_stride", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (state.NameMutationsCount), 4);
+		w.WriteGlobal ("dso_jni_preloads_idx_stride", LlvmIrWriter.GlobalConstant, "i32", state.NameMutationsCount.ToString (), 4);
 
 		// Indices array MUST NOT be sorted, since it groups alias entries together with the main entry
 		var indices = new List<string> (state.JniPreloadDSOs.Count);
@@ -377,16 +377,16 @@ void WriteDsoCache (LlvmIrWriter w, State state, ulong structAlignment)
 				throw new InvalidOperationException ($"Internal error: DSO entry in JNI preload list not found in the DSO cache list.");
 			}
 
-			indices.Add ($"\ti32 {LlvmIrWriter.Number (dsoIdx)}");
+			indices.Add ($"\ti32 {dsoIdx}");
 			indexNames.Add (preload.HashedName);
 		}
 
 		// Historically, the count has always been a 64-bit integer
-		w.WriteGlobal ("dso_jni_preloads_idx_count", LlvmIrWriter.GlobalConstant, "i64", LlvmIrWriter.Number (indices.Count), 8);
+		w.WriteGlobal ("dso_jni_preloads_idx_count", LlvmIrWriter.GlobalConstant, "i64", indices.Count.ToString (), 8);
 		w.WriteGlobal (
 			"dso_jni_preloads_idx",
 			LlvmIrWriter.GlobalConstant,
-			$"[{LlvmIrWriter.Number (indices.Count)} x i32]",
+			$"[{indices.Count} x i32]",
 			w.ArrayValue (indices, i => $" {indexNames [i]}"),
 			w.GetAggregateAlignment (4, (ulong)indices.Count * 4),
 			" Indices into dso_cache[] of DSO libraries to preload because of JNI use"
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
index d209f3d1245..65fb870ad0c 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
@@ -36,7 +36,7 @@ sealed class CompressedAssemblyDescriptor
 		readonly Dictionary<AndroidTargetArch, uint> archBufferSizes = new ();
 
 		/// <summary>
-		/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+		/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
 		/// </summary>
 		public bool EmitComments { get; set; }
 
@@ -80,14 +80,14 @@ public CompressedAssembliesNativeAssemblyGenerator (TaskLoggingHelper log, IDict
 
 		public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 		{
-			var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+			using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
 			w.WriteHeader (fileName);
 			w.Write ($$"""
 
 				%struct.CompressedAssemblyDescriptor = type {
-					i32, {{w.Comment (" uint32_t uncompressed_file_size")}}
-					i1, {{w.Comment (" bool loaded")}}
-					i32 {{w.Comment (" uint32_t buffer_offset")}}
+					i32, ; uint32_t uncompressed_file_size
+					i1, ; bool loaded
+					i32 ; uint32_t buffer_offset
 				}
 
 				""");
@@ -113,7 +113,7 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 
 		static void WriteCount (LlvmIrWriter w, uint count)
 		{
-			w.WriteGlobal (CompressedAssemblyCountSymbolName, LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (count), 4);
+			w.WriteGlobal (CompressedAssemblyCountSymbolName, LlvmIrWriter.GlobalConstant, "i32", count.ToString (), 4);
 		}
 
 		static void WriteDescriptors (LlvmIrWriter w, List<CompressedAssemblyDescriptor> descriptors)
@@ -122,9 +122,9 @@ static void WriteDescriptors (LlvmIrWriter w, List<CompressedAssemblyDescriptor>
 			foreach (CompressedAssemblyDescriptor d in descriptors) {
 				elements.Add ($$"""
 						%struct.CompressedAssemblyDescriptor {
-							i32 {{LlvmIrWriter.Number (d.uncompressed_file_size)}}, {{w.Comment (" uint32_t uncompressed_file_size")}}
-							i1 false, {{w.Comment (" bool loaded")}}
-							i32 {{LlvmIrWriter.Number (d.buffer_offset)}}{{w.Comment (" uint32_t buffer_offset")}}
+							i32 {{d.uncompressed_file_size}}, ; uint32_t uncompressed_file_size
+							i1 false, ; bool loaded
+							i32 {{d.buffer_offset}}; uint32_t buffer_offset
 						}
 					""");
 			}
@@ -132,16 +132,16 @@ static void WriteDescriptors (LlvmIrWriter w, List<CompressedAssemblyDescriptor>
 			w.WriteGlobal (
 				DescriptorsArraySymbolName,
 				LlvmIrWriter.GlobalWritable,
-				$"[{LlvmIrWriter.Number (descriptors.Count)} x %struct.CompressedAssemblyDescriptor]",
-				w.ArrayValue (elements, i => $" {LlvmIrWriter.Number (i)}: {descriptors [i].AssemblyName}"),
+				$"[{descriptors.Count} x %struct.CompressedAssemblyDescriptor]",
+				w.ArrayValue (elements, i => $" {i}: {descriptors [i].AssemblyName}"),
 				w.GetAggregateAlignment (DescriptorAlignment, (ulong)descriptors.Count * DescriptorDataSize)
 			);
 		}
 
 		static void WriteBuffer (LlvmIrWriter w, uint bufferSize)
 		{
-			w.WriteGlobal (UncompressedAssembliesBufferSizeSymbolName, LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (bufferSize), 4);
-			w.WriteGlobal (UncompressedAssembliesBufferSymbolName, LlvmIrWriter.GlobalWritable, $"[{LlvmIrWriter.Number (bufferSize)} x i8]", "zeroinitializer", w.GetAggregateAlignment (1, bufferSize));
+			w.WriteGlobal (UncompressedAssembliesBufferSizeSymbolName, LlvmIrWriter.GlobalConstant, "i32", bufferSize.ToString (), 4);
+			w.WriteGlobal (UncompressedAssembliesBufferSymbolName, LlvmIrWriter.GlobalWritable, $"[{bufferSize} x i8]", "zeroinitializer", w.GetAggregateAlignment (1, bufferSize));
 		}
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
index 90817da13a1..12f231e779f 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
@@ -122,7 +122,7 @@ public JniRemappingTypeReplacementEntry (JniRemappingTypeReplacement mtr)
 		public int ReplacementMethodIndexEntryCount { get; private set; } = 0;
 
 		/// <summary>
-		/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+		/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
 		/// </summary>
 		public bool EmitComments { get; set; }
 
@@ -173,7 +173,7 @@ public JniRemappingAssemblyGenerator (TaskLoggingHelper log, List<JniRemappingTy
 
 		public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 		{
-			var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+			using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
 			var strings = new LlvmIrStringPool ();
 			ulong alignment = GetAlignment (w);
 
@@ -181,31 +181,31 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 			w.Write ($$"""
 
 				%struct.JniRemappingIndexMethodEntry = type {
-					%struct.JniRemappingString, {{w.Comment (" JniRemappingString name")}}
-					%struct.JniRemappingString, {{w.Comment (" JniRemappingString signature")}}
-					%struct.JniRemappingReplacementMethod {{w.Comment (" JniRemappingReplacementMethod replacement")}}
+					%struct.JniRemappingString, ; JniRemappingString name
+					%struct.JniRemappingString, ; JniRemappingString signature
+					%struct.JniRemappingReplacementMethod ; JniRemappingReplacementMethod replacement
 				}
 
 				%struct.JniRemappingIndexTypeEntry = type {
-					%struct.JniRemappingString, {{w.Comment (" JniRemappingString name")}}
-					i32, {{w.Comment (" uint32_t method_count")}}
-					ptr {{w.Comment (" JniRemappingIndexMethodEntry methods")}}
+					%struct.JniRemappingString, ; JniRemappingString name
+					i32, ; uint32_t method_count
+					ptr ; JniRemappingIndexMethodEntry methods
 				}
 
 				%struct.JniRemappingReplacementMethod = type {
-					ptr, {{w.Comment (" char* target_type")}}
-					ptr, {{w.Comment (" char* target_name")}}
-					i1 {{w.Comment (" bool is_static")}}
+					ptr, ; char* target_type
+					ptr, ; char* target_name
+					i1 ; bool is_static
 				}
 
 				%struct.JniRemappingString = type {
-					i32, {{w.Comment (" uint32_t length")}}
-					ptr {{w.Comment (" char* str")}}
+					i32, ; uint32_t length
+					ptr ; char* str
 				}
 
 				%struct.JniRemappingTypeReplacementEntry = type {
-					%struct.JniRemappingString, {{w.Comment (" JniRemappingString name")}}
-					ptr {{w.Comment (" char* replacement")}}
+					%struct.JniRemappingString, ; JniRemappingString name
+					ptr ; char* replacement
 				}
 
 				""");
@@ -234,9 +234,9 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 									{{RenderString (w, strings, method.name)}}, {{w.Comment ($" name: {method.name.str}")}}
 									{{RenderString (w, strings, method.signature)}}, {{w.Comment (signatureComment)}}
 									%struct.JniRemappingReplacementMethod {
-										ptr {{strings.GetPointer (method.target_type, "JniRemappingReplacementMethod", "target_type")}}, {{w.Comment (" char* target_type")}}
-										ptr {{strings.GetPointer (method.target_name, "JniRemappingReplacementMethod", "target_name")}}, {{w.Comment (" char* target_name")}}
-										i1 {{LlvmIrWriter.Bool (method.is_static)}}{{w.Comment (" bool is_static")}}
+										ptr {{strings.GetPointer (method.target_type, "JniRemappingReplacementMethod", "target_type")}}, ; char* target_type
+										ptr {{strings.GetPointer (method.target_name, "JniRemappingReplacementMethod", "target_name")}}, ; char* target_name
+										i1 {{(method.is_static ? "true" : "false")}}; bool is_static
 									}{{w.Comment ($" replacement: {method.target_type}.{method.target_name}")}}
 								}
 							""");
@@ -249,8 +249,8 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 					elements.Add ($$"""
 							%struct.JniRemappingIndexTypeEntry {
 								{{RenderString (w, strings, type.name)}}, {{w.Comment ($" name: {type.name.str}")}}
-								i32 {{LlvmIrWriter.Number (type.TypeMethods.Count)}}, {{w.Comment (" uint32_t method_count")}}
-								ptr @{{type.MethodsArraySymbolName}}{{w.Comment (" JniRemappingIndexMethodEntry* methods")}}
+								i32 {{type.TypeMethods.Count}}, ; uint32_t method_count
+								ptr @{{type.MethodsArraySymbolName}}; JniRemappingIndexMethodEntry* methods
 							}
 						""");
 				}
@@ -270,8 +270,8 @@ static string RenderString (LlvmIrWriter w, LlvmIrStringPool strings, JniRemappi
 		{
 			return $$"""
 				%struct.JniRemappingString {
-							i32 {{LlvmIrWriter.Number (s.length)}}, {{w.Comment (" uint32_t length")}}
-							ptr {{strings.GetPointer (s.str, "JniRemappingString", "str")}}{{w.Comment (" char* str")}}
+							i32 {{s.length}}, ; uint32_t length
+							ptr {{strings.GetPointer (s.str, "JniRemappingString", "str")}}; char* str
 						}
 				""";
 		}
@@ -281,8 +281,8 @@ static void WriteArray (LlvmIrWriter w, string name, string attributes, string s
 			w.WriteGlobal (
 				name,
 				attributes,
-				$"[{LlvmIrWriter.Number (elements.Count)} x %struct.{structName}]",
-				w.ArrayValue (elements, LlvmIrWriter.IndexComment),
+				$"[{elements.Count} x %struct.{structName}]",
+				w.ArrayValue (elements, i => $" {i}"),
 				w.GetAggregateAlignment (alignment, (ulong)elements.Count * dataSize)
 			);
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
index 62883cffa6d..539ab7eb625 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
@@ -15,7 +15,7 @@ namespace Xamarin.Android.Tasks;
 /// takes care of the parts shared by all of them: the module header and metadata footer, optional
 /// comments, string literals and alignment of global symbols.
 /// </summary>
-sealed class LlvmIrWriter
+sealed class LlvmIrWriter : IDisposable
 {
 	// Symbol attributes, see https://llvm.org/docs/LangRef.html#global-variables
 	public const string GlobalConstant = "dso_local local_unnamed_addr constant";
@@ -24,13 +24,13 @@ sealed class LlvmIrWriter
 	public const string LocalString    = "private unnamed_addr constant";
 
 	readonly TextWriter output;
+	readonly CultureInfo previousCulture;
 
 	public LlvmIrTarget Target { get; }
 
 	/// <summary>
-	/// Whether descriptive comments are written to the generated LLVM IR.  Comments make the
-	/// output easier to read, but they can account for the majority of the file's size and
-	/// have no effect on the code <c>llc</c> produces.
+	/// Whether additional descriptive comments are written to the generated LLVM IR.
+	/// Inline structure comments are always written.
 	/// </summary>
 	public bool EmitComments { get; }
 
@@ -39,8 +39,12 @@ public LlvmIrWriter (TextWriter output, LlvmIrTarget target, bool emitComments)
 		this.output = output ?? throw new ArgumentNullException (nameof (output));
 		Target = target ?? throw new ArgumentNullException (nameof (target));
 		EmitComments = emitComments;
+		previousCulture = CultureInfo.CurrentCulture;
+		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
 	}
 
+	public void Dispose () => CultureInfo.CurrentCulture = previousCulture;
+
 	/// <summary>
 	/// Writes <paramref name="text"/> verbatim, except that line breaks (which may come from the
 	/// C# source files the raw string literals live in) are written using the output's newline
@@ -76,8 +80,8 @@ public void WriteLine (string text = "")
 	}
 
 	/// <summary>
-	/// Returns <paramref name="text"/> as an LLVM IR comment (i.e. prefixed with <c>;</c>) if comments are
-	/// enabled, an empty string otherwise.  The text is expected to contain any leading whitespace.
+	/// Renders dynamic comment text (which may contain line breaks) safely.
+	/// Static comments can be written directly in IR literals.
 	/// </summary>
 	public string Comment (string? text) => EmitComments && !text.IsNullOrEmpty () ? $";{SanitizeComment (text)}" : "";
 
@@ -126,7 +130,7 @@ public void WriteGlobal (string name, string attributes, string type, string val
 	{
 		WriteLine ();
 		WriteCommentLine (comment);
-		WriteLine ($"@{name} = {attributes} {type} {value}, align {Number (alignment)}");
+		WriteLine ($"@{name} = {attributes} {type} {value}, align {alignment}");
 	}
 
 	/// <summary>
@@ -161,11 +165,6 @@ void AppendCommentOrNewline (int index)
 		}
 	}
 
-	/// <summary>
-	/// Returns the conventional array element comment, i.e. the element index.
-	/// </summary>
-	public static string IndexComment (int index) => $" {Number (index)}";
-
 	/// <summary>
 	/// Alignment of a structure or an array with elements of the given size and alignment.
 	/// </summary>
@@ -183,8 +182,8 @@ public void WriteMetadata ()
 		var targetFlags = new StringBuilder ();
 		for (int i = 0; i < Target.ModuleFlags.Length; i++) {
 			int n = i + 7;
-			flags.Append ($", !{Number (n)}");
-			targetFlags.Append ($"!{Number (n)} = !{{{Target.ModuleFlags [i]}}}\n");
+			flags.Append ($", !{n}");
+			targetFlags.Append ($"!{n} = !{{{Target.ModuleFlags [i]}}}\n");
 		}
 
 		WriteLine ();
@@ -225,14 +224,6 @@ public void WriteExternalFunctionDeclarations (ICollection<string> names)
 		}
 	}
 
-	public static string Number (int value) => value.ToString (CultureInfo.InvariantCulture);
-	public static string Number (uint value) => value.ToString (CultureInfo.InvariantCulture);
-	public static string Number (ulong value) => value.ToString (CultureInfo.InvariantCulture);
-
-	public static string Hex (uint value) => $"u0x{value.ToString ("x8", CultureInfo.InvariantCulture)}";
-
-	public static string Bool (bool value) => value ? "true" : "false";
-
 	/// <summary>
 	/// Renders <paramref name="bytes"/> as an LLVM IR string constant (<c>c"..."</c>), escaping all the
 	/// characters which aren't printable ASCII as well as <c>"</c> and <c>\</c>.
@@ -290,7 +281,7 @@ public int Add (string s)
 		return offset;
 	}
 
-	public string Type => $"[{LlvmIrWriter.Number (Size)} x i8]";
+	public string Type => $"[{Size} x i8]";
 
 	public string Value ()
 	{
@@ -361,7 +352,7 @@ public string GetSymbol (string value, string? groupName = null, string? symbolS
 			group = AddGroup (groupName, groupName);
 		}
 
-		string symbol = $"{group.SymbolPrefix}.{LlvmIrWriter.Number (group.Strings.Count)}";
+		string symbol = $"{group.SymbolPrefix}.{group.Strings.Count}";
 		if (!symbolSuffix.IsNullOrEmpty ()) {
 			symbol = $"{symbol}_{symbolSuffix}";
 		}
@@ -407,7 +398,7 @@ public void Write (LlvmIrWriter writer)
 			foreach ((string symbol, string value) in group.Strings) {
 				byte[] bytes = MonoAndroidHelper.Utf8StringToBytes (value);
 				ulong size = (ulong)bytes.Length + 1;
-				writer.WriteLine ($"@{symbol} = {LlvmIrWriter.LocalString} [{LlvmIrWriter.Number (size)} x i8] {LlvmIrWriter.QuoteBytes (bytes, nullTerminated: true)}, align {LlvmIrWriter.Number (writer.GetAggregateAlignment (1, size))}");
+				writer.WriteLine ($"@{symbol} = {LlvmIrWriter.LocalString} [{size} x i8] {LlvmIrWriter.QuoteBytes (bytes, nullTerminated: true)}, align {writer.GetAggregateAlignment (1, size)}");
 			}
 		}
 	}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
index 49f3aaf4f6a..ed48a6ae106 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
@@ -14,7 +14,7 @@ class NativeAotEnvironmentNativeAssemblyGenerator
 	readonly AppEnvironmentVariableTable systemProperties;
 
 	/// <summary>
-	/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+	/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
 	/// </summary>
 	public bool EmitComments { get; set; }
 
@@ -30,14 +30,14 @@ public NativeAotEnvironmentNativeAssemblyGenerator (TaskLoggingHelper log, Envir
 
 	public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 	{
-		var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
 		w.WriteHeader (fileName);
 		AppEnvironmentVariableTable.WriteDeclaration (w);
 
-		w.WriteGlobal ("__naot_android_app_environment_variable_count", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (environmentVariables.Count), 4);
+		w.WriteGlobal ("__naot_android_app_environment_variable_count", LlvmIrWriter.GlobalConstant, "i32", environmentVariables.Count.ToString (), 4);
 		environmentVariables.Write (w, "__naot_android_app_environment_variables", "__naot_android_app_environment_variable_contents", " Application environment variables array, name:value");
 
-		w.WriteGlobal ("__naot_android_app_system_property_count", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (systemProperties.Count), 4);
+		w.WriteGlobal ("__naot_android_app_system_property_count", LlvmIrWriter.GlobalConstant, "i32", systemProperties.Count.ToString (), 4);
 		// We reuse the same structure as for environment variables, there's no point in adding a new, identical, one
 		systemProperties.Write (w, "__naot_android_app_system_properties", "__naot_android_app_system_property_contents", " System properties defined by the application");
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
index d222081c578..1d09dcbc09a 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
@@ -14,7 +14,7 @@ class NativeAotJniInitNativeAssemblyGenerator
 	readonly List<string> jniOnLoadNames = new ();
 
 	/// <summary>
-	/// Whether to write descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
+	/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
 	/// </summary>
 	public bool EmitComments { get; set; }
 
@@ -46,11 +46,11 @@ void CollectHandlers (List<string>? handlers)
 
 	public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 	{
-		var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
 		var strings = new LlvmIrStringPool ();
 
 		w.WriteHeader (fileName);
-		w.WriteGlobal ("__jni_on_load_handler_count", LlvmIrWriter.GlobalConstant, "i32", LlvmIrWriter.Number (jniOnLoadNames.Count), 4);
+		w.WriteGlobal ("__jni_on_load_handler_count", LlvmIrWriter.GlobalConstant, "i32", jniOnLoadNames.Count.ToString (), 4);
 
 		var handlers = new List<string> (jniOnLoadNames.Count);
 		var names = new List<string> (jniOnLoadNames.Count);
@@ -59,10 +59,10 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 			names.Add ($"\tptr {strings.GetPointer (name)}");
 		}
 
-		string type = $"[{LlvmIrWriter.Number (handlers.Count)} x ptr]";
+		string type = $"[{handlers.Count} x ptr]";
 		ulong alignment = w.GetPointerArrayAlignment (handlers.Count);
-		w.WriteGlobal ("__jni_on_load_handlers", LlvmIrWriter.GlobalConstant, type, w.ArrayValue (handlers, LlvmIrWriter.IndexComment), alignment);
-		w.WriteGlobal ("__jni_on_load_handler_names", LlvmIrWriter.GlobalConstant, type, w.ArrayValue (names, i => $" {LlvmIrWriter.Number (i)} ('{jniOnLoadNames [i]}')"), alignment);
+		w.WriteGlobal ("__jni_on_load_handlers", LlvmIrWriter.GlobalConstant, type, w.ArrayValue (handlers, i => $" {i}"), alignment);
+		w.WriteGlobal ("__jni_on_load_handler_names", LlvmIrWriter.GlobalConstant, type, w.ArrayValue (names, i => $" {i} ('{jniOnLoadNames [i]}')"), alignment);
 
 		strings.Write (w);
 

From b7043e91c07a19cd0a972f5975a8b8b98b294685 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 13:22:29 +0200
Subject: [PATCH 39/58] Always emit LLVM IR comments

Remove the comment toggle from LLVM IR generators, tasks, tests, and MSBuild wiring so comments are written directly without configuration.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ...teCompressedAssembliesNativeSourceFiles.cs | 11 +--------
 .../GenerateNativeApplicationConfigSources.cs |  8 -------
 ...rateNativeApplicationConfigSourcesTests.cs | 10 ++++----
 .../Tasks/LlvmIrWriterTests.cs                | 11 ++++-----
 ...pplicationConfigNativeAssemblyGenerator.cs |  8 +------
 ...ressedAssembliesNativeAssemblyGenerator.cs |  7 +-----
 .../JniRemappingAssemblyGenerator.cs          |  7 +-----
 .../Utilities/LlvmIrWriter.cs                 | 23 +++++++------------
 ...veAotEnvironmentNativeAssemblyGenerator.cs |  7 +-----
 ...NativeAotJniInitNativeAssemblyGenerator.cs |  7 +-----
 .../Xamarin.Android.Common.targets            |  2 --
 11 files changed, 23 insertions(+), 78 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs
index a25becf0fad..4423711689b 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateCompressedAssembliesNativeSourceFiles.cs
@@ -31,13 +31,6 @@ public class GenerateCompressedAssembliesNativeSourceFiles : AndroidTask
 		[Required]
 		public string ProjectFullPath { get; set; } = "";
 
-		/// <summary>
-		/// When <c>true</c>, descriptive comments are written into the generated LLVM IR.  They make
-		/// the <c>.ll</c> far easier to read, but have no effect on the object code produced from it.
-		/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
-		/// </summary>
-		public bool EmitLlvmIrComments { get; set; }
-
 		public override bool RunTask ()
 		{
 			GenerateCompressedAssemblySources ();
@@ -100,9 +93,7 @@ void GenerateCompressedAssemblySources ()
 
 			void Generate (Dictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>? dict)
 			{
-				var generator = new CompressedAssembliesNativeAssemblyGenerator (Log, dict) {
-					EmitComments = EmitLlvmIrComments,
-				};
+				var generator = new CompressedAssembliesNativeAssemblyGenerator (Log, dict);
 
 				foreach (string abi in SupportedAbis) {
 					string baseAsmFilePath = Path.Combine (EnvironmentOutputDirectory, $"compressed_assemblies.{abi.ToLowerInvariant ()}");
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
index 159660a70a6..83a9bde0f63 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
@@ -52,13 +52,6 @@ public class GenerateNativeApplicationConfigSources : AndroidTask
 		[Required]
 		public string AndroidRuntime { get; set; } = "";
 
-		/// <summary>
-		/// When <c>true</c>, descriptive comments are written into the generated LLVM IR.  They make
-		/// the <c>.ll</c> far easier to read, but have no effect on the object code produced from it.
-		/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
-		/// </summary>
-		public bool EmitLlvmIrComments { get; set; }
-
 		public string ProjectRuntimeConfigFilePath { get; set; } = String.Empty;
 		public string? ProjectRuntimeConfigDevFilePath { get; set; }
 
@@ -243,7 +236,6 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 				MarshalMethodsEnabled = false,
 				IgnoreSplitConfigs = ShouldIgnoreSplitConfigs (),
 				HaveAssemblyStore = UseAssemblyStore,
-				EmitComments = EmitLlvmIrComments,
 			};
 
 			// Any errors in the input data must be reported before any of the output files is written
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
index 4f10f54f831..a2fa4fef16d 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeApplicationConfigSourcesTests.cs
@@ -11,11 +11,10 @@ namespace Xamarin.Android.Build.Tests.Tasks;
 [TestFixture]
 public class GenerateNativeApplicationConfigSourcesTests : BaseTest
 {
-	[TestCase (false)]
-	[TestCase (true)]
-	public void EmitsApplicationConfigForAllAbis (bool emitComments)
+	[Test]
+	public void EmitsApplicationConfigForAllAbis ()
 	{
-		string outputRoot = Path.Combine (Root, "temp", $"{nameof (EmitsApplicationConfigForAllAbis)}-{emitComments}");
+		string outputRoot = Path.Combine (Root, "temp", nameof (EmitsApplicationConfigForAllAbis));
 		string monoAndroidPath = Path.Combine (TestEnvironment.MonoAndroidFrameworkDirectory, "Mono.Android.dll");
 		FileAssert.Exists (monoAndroidPath);
 
@@ -28,7 +27,6 @@ public void EmitsApplicationConfigForAllAbis (bool emitComments)
 			EnablePreloadAssembliesDefault = false,
 			AndroidRuntime = "CoreCLR",
 			UseAssemblyStore = true,
-			EmitLlvmIrComments = emitComments,
 		};
 
 		Assert.IsTrue (task.Execute (), "GenerateNativeApplicationConfigSources should succeed.");
@@ -51,7 +49,7 @@ public void EmitsApplicationConfigForAllAbis (bool emitComments)
 			Assert.That (source, Does.Contain ("@dso_cache = "), abi);
 			Assert.That (source, Does.Contain ("!llvm.module.flags = "), abi);
 			Assert.That (source, Does.Contain ("i1, ; bool uses_assembly_preload"), abi);
-			Assert.That (source, emitComments ? Does.Contain ("; Application environment variables") : Does.Not.Contain ("; Application environment variables"), abi);
+			Assert.That (source, Does.Contain ("; Application environment variables"), abi);
 		}
 	}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
index ac1ba811428..3c4c391fa52 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrWriterTests.cs
@@ -40,7 +40,7 @@ public void StringBlobDeduplicatesStringsByOffset ()
 	public void CommentsCannotInjectLinesIntoIr ()
 	{
 		using var output = new StringWriter ();
-		using var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments: true);
+		using var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64);
 
 		Assert.That (writer.Comment (" first\nsecond"), Does.Not.Contain ("\n"));
 		Assert.That (writer.TrailingComment (" first\rsecond"), Does.Not.Contain ("\r"));
@@ -48,12 +48,11 @@ public void CommentsCannotInjectLinesIntoIr ()
 		Assert.That (output.ToString ().Split ('\n'), Has.Length.EqualTo (2));
 	}
 
-	[TestCase (false)]
-	[TestCase (true)]
-	public void InlineStructureCommentsAreUnconditional (bool emitComments)
+	[Test]
+	public void WritesInlineStructureComments ()
 	{
 		using var output = new StringWriter ();
-		using var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments);
+		using var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64);
 		writer.Write ("i32, ; field\nptr ; final field");
 
 		string text = output.ToString ();
@@ -68,7 +67,7 @@ public void WriterRestoresCulture ()
 		try {
 			CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo ("fr-FR");
 			using var output = new StringWriter ();
-			using (var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64, emitComments: false)) {
+			using (var writer = new LlvmIrWriter (output, LlvmIrTarget.Arm64)) {
 				Assert.That (CultureInfo.CurrentCulture, Is.EqualTo (CultureInfo.InvariantCulture));
 				writer.WriteGlobal ("number", LlvmIrWriter.GlobalConstant, "i32", 42.ToString (), 4);
 			}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
index 5d679bcdc94..f989687aea3 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
@@ -76,12 +76,6 @@ public State (AppEnvironmentVariableTable environmentVariables, AppEnvironmentVa
 	readonly SortedDictionary <string, string> runtimeProperties;
 	State? state;
 
-	/// <summary>
-	/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
-	/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
-	/// </summary>
-	public bool EmitComments { get; set; }
-
 	public bool UsesAssemblyPreload { get; set; }
 	public string AndroidPackageName { get; set; } = "";
 	public int NumberOfAssembliesInApk { get; set; }
@@ -194,7 +188,7 @@ public void Generate (AndroidTargetArch arch, TextWriter output, string fileName
 	{
 		State data = EnsureState ();
 
-		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch));
 		var strings = new LlvmIrStringPool ();
 		ulong structAlignment = Math.Max (w.Target.PointerSize, NonPointerMemberAlignment);
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
index 65fb870ad0c..cc713b9f6d1 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
@@ -35,11 +35,6 @@ sealed class CompressedAssemblyDescriptor
 		readonly Dictionary<AndroidTargetArch, List<CompressedAssemblyDescriptor>> archDescriptors = new ();
 		readonly Dictionary<AndroidTargetArch, uint> archBufferSizes = new ();
 
-		/// <summary>
-		/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
-		/// </summary>
-		public bool EmitComments { get; set; }
-
 		public CompressedAssembliesNativeAssemblyGenerator (TaskLoggingHelper log, IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>? archAssemblies)
 		{
 			if (log == null) {
@@ -80,7 +75,7 @@ public CompressedAssembliesNativeAssemblyGenerator (TaskLoggingHelper log, IDict
 
 		public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 		{
-			using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+			using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch));
 			w.WriteHeader (fileName);
 			w.Write ($$"""
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
index 12f231e779f..a7682cfae1c 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
@@ -121,11 +121,6 @@ public JniRemappingTypeReplacementEntry (JniRemappingTypeReplacement mtr)
 
 		public int ReplacementMethodIndexEntryCount { get; private set; } = 0;
 
-		/// <summary>
-		/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
-		/// </summary>
-		public bool EmitComments { get; set; }
-
 		public JniRemappingAssemblyGenerator (TaskLoggingHelper log)
 		{
 			if (log == null) {
@@ -173,7 +168,7 @@ public JniRemappingAssemblyGenerator (TaskLoggingHelper log, List<JniRemappingTy
 
 		public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 		{
-			using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+			using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch));
 			var strings = new LlvmIrStringPool ();
 			ulong alignment = GetAlignment (w);
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
index 539ab7eb625..58d89fb559a 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrWriter.cs
@@ -12,7 +12,7 @@ namespace Xamarin.Android.Tasks;
 /// <summary>
 /// Minimal helper used by the native assembly generators to write textual LLVM IR.  The generators
 /// write the IR text themselves (mostly as interpolated raw string literals), this class merely
-/// takes care of the parts shared by all of them: the module header and metadata footer, optional
+/// takes care of the parts shared by all of them: the module header and metadata footer,
 /// comments, string literals and alignment of global symbols.
 /// </summary>
 sealed class LlvmIrWriter : IDisposable
@@ -28,17 +28,10 @@ sealed class LlvmIrWriter : IDisposable
 
 	public LlvmIrTarget Target { get; }
 
-	/// <summary>
-	/// Whether additional descriptive comments are written to the generated LLVM IR.
-	/// Inline structure comments are always written.
-	/// </summary>
-	public bool EmitComments { get; }
-
-	public LlvmIrWriter (TextWriter output, LlvmIrTarget target, bool emitComments)
+	public LlvmIrWriter (TextWriter output, LlvmIrTarget target)
 	{
 		this.output = output ?? throw new ArgumentNullException (nameof (output));
 		Target = target ?? throw new ArgumentNullException (nameof (target));
-		EmitComments = emitComments;
 		previousCulture = CultureInfo.CurrentCulture;
 		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
 	}
@@ -83,16 +76,16 @@ public void WriteLine (string text = "")
 	/// Renders dynamic comment text (which may contain line breaks) safely.
 	/// Static comments can be written directly in IR literals.
 	/// </summary>
-	public string Comment (string? text) => EmitComments && !text.IsNullOrEmpty () ? $";{SanitizeComment (text)}" : "";
+	public string Comment (string? text) => !text.IsNullOrEmpty () ? $";{SanitizeComment (text)}" : "";
 
 	/// <summary>
-	/// Returns a comment which follows a value on the same line (separated with a space), if comments are enabled.
+	/// Returns a comment which follows a value on the same line (separated with a space).
 	/// </summary>
-	public string TrailingComment (string? text) => EmitComments && !text.IsNullOrEmpty () ? $" ;{SanitizeComment (text)}" : "";
+	public string TrailingComment (string? text) => !text.IsNullOrEmpty () ? $" ;{SanitizeComment (text)}" : "";
 
 	public void WriteCommentLine (string? text)
 	{
-		if (!EmitComments || text.IsNullOrEmpty ()) {
+		if (text.IsNullOrEmpty ()) {
 			return;
 		}
 
@@ -136,7 +129,7 @@ public void WriteGlobal (string name, string attributes, string type, string val
 	/// <summary>
 	/// Renders an array initializer in which every element is written on its own line.  Elements must
 	/// already be indented.  <paramref name="getElementComment"/> may return a comment which is
-	/// placed after the element when comments are enabled.
+	/// placed after the element.
 	/// </summary>
 	public string ArrayValue (IList<string> elements, Func<int, string?>? getElementComment = null)
 	{
@@ -217,7 +210,7 @@ public void WriteExternalFunctionDeclarations (ICollection<string> names)
 		sorted.Sort ((string a, string b) => a.CompareTo (b));
 
 		WriteLine ();
-		Write (Comment (" External functions"));
+		Write ("; External functions");
 		foreach (string name in sorted) {
 			WriteLine ();
 			Write ($"declare void @{name}() local_unnamed_addr");
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
index ed48a6ae106..409d002a1d9 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotEnvironmentNativeAssemblyGenerator.cs
@@ -13,11 +13,6 @@ class NativeAotEnvironmentNativeAssemblyGenerator
 	readonly AppEnvironmentVariableTable environmentVariables;
 	readonly AppEnvironmentVariableTable systemProperties;
 
-	/// <summary>
-	/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
-	/// </summary>
-	public bool EmitComments { get; set; }
-
 	public NativeAotEnvironmentNativeAssemblyGenerator (TaskLoggingHelper log, EnvironmentBuilder envBuilder)
 	{
 		if (log == null) {
@@ -30,7 +25,7 @@ public NativeAotEnvironmentNativeAssemblyGenerator (TaskLoggingHelper log, Envir
 
 	public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 	{
-		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch));
 		w.WriteHeader (fileName);
 		AppEnvironmentVariableTable.WriteDeclaration (w);
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
index 1d09dcbc09a..9eb4f77d49a 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/NativeAotJniInitNativeAssemblyGenerator.cs
@@ -13,11 +13,6 @@ class NativeAotJniInitNativeAssemblyGenerator
 {
 	readonly List<string> jniOnLoadNames = new ();
 
-	/// <summary>
-	/// Whether to write additional descriptive comments into the generated LLVM IR.  Defaults to <c>false</c>.
-	/// </summary>
-	public bool EmitComments { get; set; }
-
 	public NativeAotJniInitNativeAssemblyGenerator (TaskLoggingHelper log, List<string>? runtimeComponentsJniOnLoadHandlers, List<string>? customJniOnLoadHandlers)
 	{
 		if (log == null) {
@@ -46,7 +41,7 @@ void CollectHandlers (List<string>? handlers)
 
 	public void Generate (AndroidTargetArch arch, TextWriter output, string fileName)
 	{
-		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch), EmitComments);
+		using var w = new LlvmIrWriter (output, LlvmIrTarget.Get (arch));
 		var strings = new LlvmIrStringPool ();
 
 		w.WriteHeader (fileName);
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index aef387cbfcc..ead7adf16bd 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1649,7 +1649,6 @@ because xbuild doesn't support framework reference assemblies.
       EnvironmentOutputDirectory="$(IntermediateOutputPath)android"
       Environments="@(_EnvironmentFiles)"
       Debug="$(AndroidIncludeDebugSymbols)"
-      EmitLlvmIrComments="$(_AndroidEmitLlvmIrComments)"
       AndroidSequencePointsMode="$(_SequencePointsMode)"
       EnableSGenConcurrent="$(AndroidEnableSGenConcurrent)"
       SupportedAbis="@(_BuildTargetAbis)"
@@ -1898,7 +1897,6 @@ because xbuild doesn't support framework reference assemblies.
       EnvironmentOutputDirectory="$(IntermediateOutputPath)android"
       SupportedAbis="@(_BuildTargetAbis)"
       Debug="$(AndroidIncludeDebugSymbols)"
-      EmitLlvmIrComments="$(_AndroidEmitLlvmIrComments)"
       EnableCompression="$(AndroidEnableAssemblyCompression)"
       ProjectFullPath="$(MSBuildProjectFullPath)"
   />

From 40b810b8c4ceede458c27a3b3173e05784ac51b1 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 08:21:51 +0200
Subject: [PATCH 40/58] Remove legacy LLVM IR type map build pipeline

Keep native host compatibility stubs and P/Invoke preservation while removing unreachable typemap and marshal-method generation, rewriting, and linker steps.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../building-apps/build-properties.md         |   12 +-
 Documentation/docs-mobile/messages/index.md   |    2 +-
 Documentation/docs-mobile/messages/xa1049.md  |   20 +-
 .../MonoDroid.Tuner/FindJavaObjectsStep.cs    |   14 +-
 .../MonoDroid.Tuner/FindTypeMapObjectsStep.cs |   74 --
 .../Xamarin.Android.Resource.Designer.targets |    6 +-
 ...oft.Android.Sdk.AssemblyResolution.targets |    1 -
 .../Microsoft.Android.Sdk.BuildOrder.targets  |    1 -
 ...crosoft.Android.Sdk.TypeMap.LlvmIr.targets |  454 -------
 ...soft.Android.Sdk.TypeMap.Trimmable.targets |   12 +-
 .../Properties/Resources.Designer.cs          |    2 +-
 .../Properties/Resources.resx                 |    4 +-
 .../Tasks/AssemblyModifierPipeline.cs         |   12 -
 .../Tasks/CollectTypeMapFilesForArchive.cs    |   38 -
 .../Tasks/CreateTypeManagerJava.cs            |   80 --
 .../Tasks/GenerateACWMap.cs                   |   57 -
 .../GenerateAdditionalProviderSources.cs      |  100 +-
 .../Tasks/GenerateEmptyTypemapStub.cs         |   10 -
 .../Tasks/GenerateJavaCallableWrappers.cs     |  109 --
 .../Tasks/GenerateJavaStubs.cs                |  242 ----
 .../Tasks/GenerateMainAndroidManifest.cs      |  142 ---
 .../GenerateNativeAotBootstrapSources.cs      |    6 +-
 ...ateNativeAotLibraryLoadAssemblerSources.cs |    2 +-
 .../GenerateNativeApplicationConfigSources.cs |    9 +-
 .../GenerateNativeMarshalMethodSources.cs     |  191 +--
 .../Tasks/GenerateTypeMappings.cs             |  177 ---
 .../Tasks/GetMonoPlatformJar.cs               |   43 -
 .../Tasks/PreTrimmingFixLegacyDesigner.cs     |   94 --
 .../Tasks/PrepareAbiItems.cs                  |    5 +-
 .../Tasks/RemoveRegisterAttribute.cs          |   78 --
 .../Tasks/RewriteMarshalMethods.cs            |  122 --
 .../Xamarin.Android.Build.Tests/BuildTest2.cs |   73 +-
 .../IncrementalBuildTest.cs                   |    1 -
 .../ManifestTest.cs                           |    2 +-
 .../MarshalMethodTests.cs                     |   58 -
 .../Tasks/LinkerTests.cs                      |   18 -
 .../Tasks/LlvmIrGeneratorTests.cs             |   33 +-
 .../Utilities/AssemblyPipeline.cs             |    1 -
 .../Utilities/JCWGenerator.cs                 |  349 ------
 .../Utilities/ManifestDocument.cs             |    2 +-
 .../Utilities/MarshalMethodCecilAdapter.cs    |  261 ----
 .../MarshalMethodsAssemblyRewriter.cs         |  562 ---------
 .../Utilities/MarshalMethodsClassifier.cs     | 1107 -----------------
 .../Utilities/MarshalMethodsCollection.cs     |  418 -------
 .../Utilities/MarshalMethodsHelpers.cs        |   61 -
 .../MarshalMethodsNativeAssemblyGenerator.cs  |   80 +-
 ...rshalMethodsNativeAssemblyGeneratorBase.cs |  919 --------------
 .../Utilities/MarshalMethodsState.cs          |   43 -
 .../Utilities/MonoAndroidHelper.cs            |   20 +-
 .../Utilities/NativeCodeGenState.cs           |   56 -
 .../Utilities/NativeTypeMappingData.cs        |   67 -
 ...PreservePinvokesNativeAssemblyGenerator.cs |   20 +-
 .../Utilities/TypeMapCecilAdapter.cs          |  272 ----
 .../Utilities/TypeMapGenerator.cs             |  355 ------
 .../Utilities/TypeMapObjectsXmlFile.cs        |  366 ------
 .../Utilities/TypeMappingAssemblyGenerator.cs |   16 -
 ...TypeMappingDebugNativeAssemblyGenerator.cs |  281 -----
 ...peMappingReleaseNativeAssemblyGenerator.cs |  486 --------
 .../Xamarin.Android.Build.Tasks.csproj        |    4 -
 .../Xamarin.Android.Common.targets            |  118 +-
 .../Tests/InstallAndRunTests.cs               |   15 +-
 .../Tests/MarshalMethodsGCHangTests.cs        |  131 --
 62 files changed, 163 insertions(+), 8151 deletions(-)
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
 delete mode 100644 tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs

diff --git a/Documentation/docs-mobile/building-apps/build-properties.md b/Documentation/docs-mobile/building-apps/build-properties.md
index 9ce8698e830..98440a023b3 100644
--- a/Documentation/docs-mobile/building-apps/build-properties.md
+++ b/Documentation/docs-mobile/building-apps/build-properties.md
@@ -445,15 +445,9 @@ The default value is `False` when
 
 ## AndroidEnableMarshalMethods
 
-A bool property, that determines whether or not LLVM marshal methods are enabled.
-LLVM marshal methods are an app startup optimization which uses native entry points
-for Java `native` method registration.
-
-This property defaults to `False`.
-
-This property cannot be set to `true` when
-[`$(PublishReadyToRun)`](#publishreadytorun) is `true`. Setting both properties
-to `true` stops the build with [XA1049](../messages/xa1049.md).
+A legacy boolean property for LLVM marshal methods. Marshal methods are no
+longer supported. Remove this property or set it to `false`; setting it to
+`true` produces error XA1049.
 
 Added in .NET 8.
 
diff --git a/Documentation/docs-mobile/messages/index.md b/Documentation/docs-mobile/messages/index.md
index 27095488e87..36516f51b16 100644
--- a/Documentation/docs-mobile/messages/index.md
+++ b/Documentation/docs-mobile/messages/index.md
@@ -159,7 +159,7 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla
 + [XA1046](xa1046.md): Attribute '{0}' in element '{1}' has value '{2}' that cannot be parsed as boolean; {3} line {4}.
 + [XA1047](xa1047.md): Required attribute '{0}' missing from element '{1}'; {2} line {3}.
 + [XA1048](xa1048.md): '{0}' does not contain an &lt;instrumentation&gt; element.
-+ [XA1049](xa1049.md): The 'AndroidEnableMarshalMethods' and 'PublishReadyToRun' MSBuild properties cannot both be set to 'true'.
++ [XA1049](xa1049.md): The 'AndroidEnableMarshalMethods' MSBuild property is no longer supported.
 + [XA1050](xa1050.md): The 'AndroidR8ObfuscationMode' MSBuild property has an invalid value.
 
 ## XA2xxx: Linker
diff --git a/Documentation/docs-mobile/messages/xa1049.md b/Documentation/docs-mobile/messages/xa1049.md
index 4d617f1abda..4f690ea9c43 100644
--- a/Documentation/docs-mobile/messages/xa1049.md
+++ b/Documentation/docs-mobile/messages/xa1049.md
@@ -11,31 +11,21 @@ f1_keywords:
 ## Example messages
 
 ```dotnetcli
-error XA1049: The 'AndroidEnableMarshalMethods' and 'PublishReadyToRun' MSBuild properties cannot both be set to 'true'. Set one property to 'false'.
+error XA1049: The 'AndroidEnableMarshalMethods' MSBuild property is no longer supported. Remove it or set it to 'false'.
 ```
 
 ## Issue
 
-[`$(AndroidEnableMarshalMethods)`](../building-apps/build-properties.md#androidenablemarshalmethods)
-rewrites managed assemblies after trimming, while
-[`$(PublishReadyToRun)`](../building-apps/build-properties.md#publishreadytorun)
-adds native code to those assemblies. The marshal methods rewriter cannot modify
-ReadyToRun assemblies.
+The llvm-ir type map and its marshal-method assembly rewriter are no longer
+supported. Setting `$(AndroidEnableMarshalMethods)` to `true` cannot enable
+marshal methods with the trimmable type map.
 
 ## Solution
 
-Disable marshal methods or ReadyToRun in the project file:
+Remove the property or set it to `false` in the project file:
 
 ```xml
 <PropertyGroup>
   <AndroidEnableMarshalMethods>false</AndroidEnableMarshalMethods>
 </PropertyGroup>
 ```
-
-Alternatively:
-
-```xml
-<PropertyGroup>
-  <PublishReadyToRun>false</PublishReadyToRun>
-</PropertyGroup>
-```
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
index d3e79f011c4..269e8f152b4 100644
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
+++ b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
@@ -22,8 +22,6 @@ public class FindJavaObjectsStep : BaseStep, IAssemblyModifierPipelineStep
 
 	public bool ErrorOnCustomJavaObject { get; set; }
 
-	public bool UseMarshalMethods { get; set; }
-
 	public TaskLoggingHelper Log { get; set; }
 
 	public FindJavaObjectsStep (TaskLoggingHelper log) => Log = log;
@@ -74,11 +72,8 @@ bool ShouldScan (StepContext context)
 		if (!context.IsAndroidAssembly)
 			return false;
 
-		// When marshal methods or non-JavaPeerStyle.XAJavaInterop1 are in use we do not want to skip non-user assemblies (such as Mono.Android) - we need to generate JCWs for them during
-		// application build, unlike in Debug configuration or when marshal methods are disabled, in which case we use JCWs generated during Xamarin.Android
-		// build and stored in a jar file.
-		var useMarshalMethods = !context.IsDebug && context.EnableMarshalMethods;
-		var shouldSkipNonUserAssemblies = !useMarshalMethods && context.CodeGenerationTarget == JavaPeerStyle.XAJavaInterop1;
+		// XAJavaInterop1 uses the framework JCWs from the runtime jar.
+		var shouldSkipNonUserAssemblies = context.CodeGenerationTarget == JavaPeerStyle.XAJavaInterop1;
 
 		if (shouldSkipNonUserAssemblies && !context.IsUserAssembly) {
 			Log.LogDebugMessage ($"Skipping assembly '{context.Source.ItemSpec}' because it is not a user assembly and we don't need JLOs from non-user assemblies");
@@ -114,11 +109,6 @@ List<CallableWrapperType> ConvertToCallableWrappers (List<TypeDefinition> types)
 			DefaultMonoRuntimeInitialization = "mono.MonoPackageManager.LoadApplication (context);",
 		};
 
-		if (UseMarshalMethods) {
-			var classifier = new MarshalMethodsClassifier (Context, Context.Resolver, Log);
-			reader_options.MethodClassifier = new MarshalMethodsCollection (classifier);
-		}
-
 		foreach (var type in types) {
 			var wrapper = CecilImporter.CreateType (type, Context, reader_options);
 			wrappers.Add (wrapper);
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs
deleted file mode 100644
index 43a9b8de334..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindTypeMapObjectsStep.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Mono.Linker.Steps;
-using Xamarin.Android.Tasks;
-
-namespace MonoDroid.Tuner;
-
-/// <summary>
-/// Scans an assembly for JLOs that need to be in the typemap and writes them to an XML file.
-/// </summary>
-public class FindTypeMapObjectsStep : BaseStep, IAssemblyModifierPipelineStep
-{
-	public bool Debug { get; set; }
-
-	public bool ErrorOnCustomJavaObject { get; set; }
-
-	public TaskLoggingHelper Log { get; set; }
-
-	public FindTypeMapObjectsStep (TaskLoggingHelper log) => Log = log;
-
-	public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
-	{
-		var destinationTypeMapXml = TypeMapObjectsXmlFile.GetTypeMapObjectsXmlFilePath (context.Destination.ItemSpec);
-
-		// We only care about assemblies that can contains JLOs
-		if (!context.IsAndroidAssembly) {
-			Log.LogDebugMessage ($"Skipping assembly '{assembly.Name.Name}' because it is not an Android assembly");
-			TypeMapObjectsXmlFile.WriteEmptyFile (destinationTypeMapXml, Log);
-			return;
-		}
-
-		var types = ScanForJavaTypes (assembly);
-
-		var xml = new TypeMapObjectsXmlFile {
-			AssemblyName = assembly.Name.Name,
-			AssemblyFullName = Debug ? TypeMapCecilAdapter.GetRuntimeAssemblyFullName (assembly.Name) : null,
-			AssemblyMvid = assembly.MainModule.Mvid,
-		};
-
-		if (Debug) {
-			var (typeMapDebugSets, foundJniNativeRegistration) = TypeMapCecilAdapter.GetDebugNativeEntries (types, Context, needUniqueAssemblies: false);
-
-			xml.JavaToManagedDebugEntries.AddRange (typeMapDebugSets.JavaToManaged);
-			xml.ManagedToJavaDebugEntries.AddRange (typeMapDebugSets.ManagedToJava);
-			xml.FoundJniNativeRegistration = foundJniNativeRegistration;
-		} else {
-			var genState = TypeMapCecilAdapter.GetReleaseGenerationState (types, Context, out var foundJniNativeRegistration);
-			xml.ModuleReleaseData = genState.TempModules.SingleOrDefault ().Value;
-		}
-
-		xml.Export (destinationTypeMapXml, Log);
-	}
-
-	List<TypeDefinition> ScanForJavaTypes (AssemblyDefinition assembly)
-	{
-		var types = new List<TypeDefinition> ();
-
-		var scanner = new XAJavaTypeScanner (Xamarin.Android.Tools.AndroidTargetArch.None, Log, Context) {
-			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject
-		};
-
-		foreach (ModuleDefinition md in assembly.Modules) {
-			foreach (TypeDefinition td in md.Types) {
-				scanner.AddJavaType (td, types);
-			}
-		}
-
-		return types;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
index e19d986acda..ee4169c966b 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
@@ -227,10 +227,8 @@ Copyright (C) 2016 Xamarin. All rights reserved.
     is processed by the ILLink step. If we do not do this then the reference to
     `netstandard.dll` is not replaced with `System.Private.CoreLib` and the app crashes.
 
-    No TrimmerRootDescriptor is needed: PreTrimmingFixLegacyDesigner rewrites library
-    assemblies *before* ILLink, replacing designer field loads with calls to the designer
-    assembly's property getters. ILLink then naturally preserves only the referenced
-    properties through its mark step, allowing everything else to be trimmed.
+    The trimmable typemap targets root the designer assembly when trimming is enabled:
+    resource IDs may be resolved through reflection at runtime.
 -->
 <Target Name="_AddResourceDesignerToPublishFiles"
     Condition=" '$(AndroidUseDesignerAssembly)' == 'True' "
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
index 12d19a14888..ca06327c3eb 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
@@ -251,7 +251,6 @@ _ResolveAssemblies MSBuild target.
       _ResolveSatellitePaths;
       _CreatePackageWorkspace;
       _LinkAssemblies;
-      _AfterILLinkAdditionalSteps;
     </_PrepareAssembliesDependsOnTargets>
   </PropertyGroup>
 
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
index bb9999a24f1..39b01d08114 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
@@ -73,7 +73,6 @@ properties that determine build ordering.
       _ResolveSatellitePaths;
       _CreatePackageWorkspace;
       _LinkAssemblies;
-      _AfterILLinkAdditionalSteps;
       _GenerateJavaStubs;
       _ManifestMerger;
       _ConvertCustomView;
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
deleted file mode 100644
index 74fa387cd41..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
+++ /dev/null
@@ -1,454 +0,0 @@
-<!-- Typemap targets for native binary typemaps generated by GenerateTypeMappings. -->
-<Project>
-
-  <UsingTask TaskName="Xamarin.Android.Tasks.CollectTypeMapFilesForArchive" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.CreateTypeManagerJava" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.GenerateTypeMappings" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.GetMonoPlatformJar" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.RemoveRegisterAttribute" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.GenerateProguardConfiguration" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.PostTrimmingPipeline" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.PreTrimmingFixLegacyDesigner" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-  <UsingTask TaskName="Xamarin.Android.Tasks.ValidateJavaPeerCallbackFormats" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
-
-  <PropertyGroup>
-    <AndroidEnableLegacyCompatibilityAssemblyFixups Condition=" '$(AndroidEnableLegacyCompatibilityAssemblyFixups)' == '' ">true</AndroidEnableLegacyCompatibilityAssemblyFixups>
-    <_RemoveRegisterFlag>$(MonoAndroidIntermediateAssemblyDir)shrunk\shrunk.flag</_RemoveRegisterFlag>
-    <!-- Inject typemap-specific targets into build dependency chains -->
-    <_BeforeAddStaticResources>$(_BeforeAddStaticResources);_GetMonoPlatformJarPath</_BeforeAddStaticResources>
-    <_BeforeCompileJava>$(_BeforeCompileJava);_GetMonoPlatformJarPath</_BeforeCompileJava>
-    <_BeforeCompileToDalvik>$(_BeforeCompileToDalvik);_GetMonoPlatformJarPath</_BeforeCompileToDalvik>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <RuntimeHostConfigurationOption Include="Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap"
-        Value="false" Trim="true" />
-    <RuntimeHostConfigurationOption Include="Java.Interop.RuntimeFeature.ManagedPeerNativeRegistration"
-        Value="true" Trim="true" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <_GenerateJavaStubsDependsOnTargets>
-      _SetLatestTargetFrameworkVersion;
-      _PrepareAssemblies;
-      _PrepareNativeAssemblySources;
-      $(_AfterPrepareAssemblies);
-      _ValidateJavaPeerCallbackFormats;
-      _GetGenerateJavaStubsInputs;
-    </_GenerateJavaStubsDependsOnTargets>
-  </PropertyGroup>
-
-  <Target Name="_ValidateJavaPeerCallbackFormats">
-    <ValidateJavaPeerCallbackFormats ResolvedAssemblies="@(_ResolvedAssemblies)" />
-  </Target>
-
-  <Target Name="_GenerateJavaStubs"
-      DependsOnTargets="$(_GenerateJavaStubsDependsOnTargets);$(BeforeGenerateAndroidManifest)"
-      Inputs="@(_GenerateJavaStubsInputs)"
-      Outputs="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp">
-
-    <PropertyGroup>
-      <_ManifestOutput>$(IntermediateOutputPath)AndroidManifest.xml</_ManifestOutput>
-      <_LinkingEnabled Condition=" '$(AndroidLinkMode)' != 'None'">True</_LinkingEnabled>
-      <_LinkingEnabled Condition=" '$(AndroidLinkMode)' == 'None'">False</_LinkingEnabled>
-      <_HaveMultipleRIDs Condition=" '$(RuntimeIdentifiers)' != '' ">True</_HaveMultipleRIDs>
-      <_HaveMultipleRIDs Condition=" '$(RuntimeIdentifiers)' == '' ">False</_HaveMultipleRIDs>
-    </PropertyGroup>
-    <GenerateJavaCallableWrappers
-        CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-        OutputDirectory="$(IntermediateOutputPath)android\src"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
-        SupportedAbis="@(_BuildTargetAbis)">
-      <Output TaskParameter="GeneratedJavaFilesOutput" ItemName="_GeneratedJavaFiles" />
-    </GenerateJavaCallableWrappers>
-
-    <GenerateACWMap
-        AcwMapFile="$(_AcwMapFile)"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        SupportedAbis="@(_BuildTargetAbis)">
-    </GenerateACWMap>
-
-    <GenerateJavaStubs
-        CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        ResolvedUserAssemblies="@(_ResolvedUserMonoAndroidAssemblies)"
-        ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        OutputDirectory="$(IntermediateOutputPath)android"
-        PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
-        ApplicationJavaClass="$(AndroidApplicationJavaClass)"
-        FrameworkDirectories="$(_XATargetFrameworkDirectories)"
-        SupportedAbis="@(_BuildTargetAbis)"
-        EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)">
-    </GenerateJavaStubs>
-
-    <RewriteMarshalMethods
-        Condition=" '$(_AndroidUseMarshalMethods)' == 'true' And '$(AndroidIncludeDebugSymbols)' == 'false' "
-        IntermediateOutputDirectory="$(IntermediateOutputPath)">
-    </RewriteMarshalMethods>
-
-    <GenerateTypeMappings
-        AndroidRuntime="$(_AndroidRuntime)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        EmitLlvmIrComments="$(_AndroidEmitLlvmIrComments)"
-        EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        ResolvedAssemblies="@(_ResolvedAssemblies)"
-        SkipJniAddNativeMethodRegistrationAttributeScan="$(_SkipJniAddNativeMethodRegistrationAttributeScan)"
-        SupportedAbis="@(_BuildTargetAbis)"
-        TypemapImplementation="$(AndroidTypeMapImplementation)"
-        TypemapOutputDirectory="$(_NativeAssemblySourceDir)">
-    </GenerateTypeMappings>
-
-    <GenerateMainAndroidManifest
-        AndroidRuntime="$(_AndroidRuntime)"
-        AndroidSdkDir="$(_AndroidSdkDirectory)"
-        AndroidApiLevel="$(_AndroidApiLevel)"
-        ApplicationJavaClass="$(AndroidApplicationJavaClass)"
-        ApplicationLabel="$(_ApplicationLabel)"
-        BundledWearApplicationName="$(BundledWearApplicationPackageName)"
-        CheckedBuild="$(_AndroidCheckedBuild)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        EmbedAssemblies="$(EmbedAssembliesIntoApk)"
-        EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        ManifestPlaceholders="$(AndroidManifestPlaceholders)"
-        ManifestTemplate="$(_AndroidManifestAbs)"
-        MergedAndroidManifestOutput="$(_ManifestOutput)"
-        NeedsInternet="$(AndroidNeedsInternetPermission)"
-        PackageName="$(_AndroidPackage)"
-        ResolvedUserAssemblies="@(_ResolvedUserMonoAndroidAssemblies)"
-        SupportedAbis="@(_BuildTargetAbis)"
-        SupportedOSPlatformVersion="$(SupportedOSPlatformVersion)"
-        VersionCode="$(_AndroidVersionCode)"
-        VersionName="$(_AndroidVersionName)">
-      <Output TaskParameter="AdditionalProviderSources" ItemName="_AdditionalProviderSources" />
-    </GenerateMainAndroidManifest>
-
-    <GenerateAdditionalProviderSources
-        AdditionalProviderSources="@(_AdditionalProviderSources)"
-        AndroidRuntime="$(_AndroidRuntime)"
-        Environments="@(_EnvironmentFiles)"
-        CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)"
-        OutputDirectory="$(IntermediateOutputPath)android"
-        TargetName="$(TargetName)">
-    </GenerateAdditionalProviderSources>
-
-    <ItemGroup>
-      <FileWrites Include="@(_TypeMapAssemblySource)" />
-      <FileWrites Include="@(_TypeMapAssemblyInclude)" />
-      <FileWrites Include="@(_AndroidTypeMapping)" Condition=" '@(_AndroidTypeMapping->Count())' == '0' " />
-      <FileWrites Include="$(_ManifestOutput)" />
-    </ItemGroup>
-
-    <Touch Files="$(_AndroidStampDirectory)_GenerateJavaStubs.stamp" AlwaysCreate="True" />
-  </Target>
-
-  <!-- ILLink customization: custom trimmer steps, root descriptors, etc. -->
-  <Target Name="_PrepareLinking"
-      Condition=" '$(PublishTrimmed)' == 'true' "
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="GetReferenceAssemblyPaths;_CreatePropertiesCache;_AddResourceDesignerToPublishFiles">
-    <PropertyGroup>
-      <TrimmerRemoveSymbols Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' ">true</TrimmerRemoveSymbols>
-      <_ExtraTrimmerArgs Condition=" '$(_EnableSerializationDiscovery)' != 'false' ">--enable-serialization-discovery $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
-      <_ExtraTrimmerArgs Condition=" '$(_AndroidEnableUnusedTypeChecks)' != 'true' ">--disable-opt unusedtypechecks $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
-      <!--
-        Used for the <ILLink DumpDependencies="$(_TrimmerDumpDependencies)" /> value:
-        https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L150
-        -->
-      <_TrimmerDumpDependencies Condition=" '$(LinkerDumpDependencies)' == 'true' ">true</_TrimmerDumpDependencies>
-      <_AndroidLinkerCustomStepAssembly>$(MSBuildThisFileDirectory)..\tools\Microsoft.Android.Sdk.ILLink.dll</_AndroidLinkerCustomStepAssembly>
-      <_SystemIOHashingAssemblyPath>$(MSBuildThisFileDirectory)..\tools\System.IO.Hashing.dll</_SystemIOHashingAssemblyPath>
-      <_ProguardProjectConfiguration Condition=" '$(AndroidLinkTool)' != '' ">$(IntermediateOutputPath)proguard\proguard_project_references.cfg</_ProguardProjectConfiguration>
-    </PropertyGroup>
-    <ItemGroup>
-      <!--
-        Used for the <ILLink CustomData="@(_TrimmerCustomData)" /> value:
-        https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L147
-        -->
-      <_TrimmerCustomData Include="AndroidCustomViewMapFile" Value="$(_OuterCustomViewMapFile)" />
-      <_TrimmerCustomData Include="SystemIOHashingAssemblyPath" Value="$(_SystemIOHashingAssemblyPath)" />
-
-      <!--
-        Used for the <ILLink CustomSteps="@(_TrimmerCustomSteps)" /> value:
-        https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L131
-        -->
-      <!-- add our custom steps -->
-      <!-- Custom MarkHandlers that run during MarkStep -->
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="Microsoft.Android.Sdk.ILLink.PreserveSubStepDispatcher" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="MonoDroid.Tuner.MarkJavaObjects" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="MonoDroid.Tuner.PreserveJavaExceptions" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="MonoDroid.Tuner.PreserveApplications" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="Microsoft.Android.Sdk.ILLink.PreserveRegistrations" />
-      <_TrimmerCustomSteps Include="$(_AndroidLinkerCustomStepAssembly)" Type="Microsoft.Android.Sdk.ILLink.PreserveJavaInterfaces" />
-      <!-- Custom steps that run after MarkStep -->
-      <!-- Custom steps that run after CleanStep -->
-      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\PreserveLists\*.xml"
-          Exclude="$(MSBuildThisFileDirectory)..\PreserveLists\System.Private.CoreLib.xml" />
-      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\PreserveLists\System.Private.CoreLib.xml"
-          Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " />
-      <TrimmerRootDescriptor Include="@(LinkDescription)" />
-      <TrimmerRootAssembly Include="Microsoft.Android.Runtime.NativeAOT" Condition=" '$(_AndroidRuntime)' == 'NativeAOT' " RootMode="All" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Android apps set OutputType=Library (no managed Main()), so the upstream
-    _PrepareTrimConfiguration target does not root the entry assembly (see
-    dotnet/runtime#125673). Explicitly add the app assembly with RootMode=All
-    to ensure ILLink includes it in linked output.
-  -->
-  <Target Name="_FixRootAssembly"
-      AfterTargets="PrepareForILLink">
-    <ItemGroup>
-      <TrimmerRootAssembly Remove="@(IntermediateAssembly->'%(Filename)')" />
-      <TrimmerRootAssembly Include="@(IntermediateAssembly->'%(Filename)')" RootMode="All" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Fix legacy resource designer references *before* ILLink runs. This rewrites
-    library assemblies so their resource field accesses (ldsfld) become calls to the
-    designer assembly's property getters, and clears the per-library designer classes.
-    Because the rewritten IL no longer references the old designer fields, ILLink can
-    freely trim unused designer types without needing a root descriptor.
-
-    Modified assemblies are written to an intermediate directory (not in-place) to
-    avoid mutating files in the shared NuGet cache or shared intermediate output paths.
-  -->
-  <Target Name="_CollectPreTrimmingAssemblies"
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="_ComputeAssembliesToPostprocessOnPublish"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(AndroidUseDesignerAssembly)' == 'True' ">
-    <ItemGroup>
-      <_PreTrimmingAssembly Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' and '%(ResolvedFileToPublish.PostprocessAssembly)' == 'true' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_PreTrimmingFixLegacyDesigner"
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="_CollectPreTrimmingAssemblies"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(AndroidUseDesignerAssembly)' == 'True' "
-      Inputs="@(_PreTrimmingAssembly)"
-      Outputs="$(_AndroidStampDirectory)_PreTrimmingFixLegacyDesigner.stamp">
-    <MakeDir Directories="$(_AndroidStampDirectory)" />
-    <PreTrimmingFixLegacyDesigner
-        Assemblies="@(_PreTrimmingAssembly)"
-        TargetName="$(TargetName)"
-        OutputDirectory="$(IntermediateOutputPath)prelink"
-        Deterministic="$(Deterministic)">
-      <Output TaskParameter="ModifiedAssemblies" ItemName="_PreTrimmingModifiedAssembly" />
-    </PreTrimmingFixLegacyDesigner>
-    <Touch Files="$(_AndroidStampDirectory)_PreTrimmingFixLegacyDesigner.stamp" AlwaysCreate="true" />
-    <ItemGroup>
-      <FileWrites Include="@(_PreTrimmingModifiedAssembly)" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Replace ResolvedFileToPublish entries with the prelink copies so ILLink picks them up.
-    This must run even when _PreTrimmingFixLegacyDesigner is skipped (up-to-date) because
-    ResolvedFileToPublish is populated fresh each build.
-  -->
-  <Target Name="_PreTrimmingFixLegacyDesignerUpdateItems"
-      AfterTargets="ComputeResolvedFilesToPublishList"
-      DependsOnTargets="_PreTrimmingFixLegacyDesigner"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(AndroidUseDesignerAssembly)' == 'True' ">
-    <ItemGroup>
-      <_PreTrimmingSwappableItem Include="@(ResolvedFileToPublish)"
-          Condition=" '%(Extension)' == '.dll' and Exists('$(IntermediateOutputPath)prelink/%(Filename)%(Extension)') " />
-      <ResolvedFileToPublish Remove="@(_PreTrimmingSwappableItem)" />
-      <ResolvedFileToPublish Include="@(_PreTrimmingSwappableItem->'$(IntermediateOutputPath)prelink/%(Filename)%(Extension)')" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_TouchAndroidLinkFlag"
-      AfterTargets="ILLink"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(RunILLink)' != 'false' and Exists('$(_LinkSemaphore)') "
-      Inputs="$(_LinkSemaphore)"
-      Outputs="$(_AndroidLinkFlag)">
-    <!-- This file is an input for _RemoveRegisterAttribute -->
-    <Touch Files="$(_AndroidLinkFlag)" AlwaysCreate="true" />
-  </Target>
-
-  <!--
-    Post-trimming assembly modifications: strips embedded Android resources and
-    (optionally) injects GC.KeepAlive() calls, in a single pass over assemblies.
-    Runs in the inner build after ILLink but before ReadyToRun/crossgen2 compilation,
-    so R2R images are generated from the already-modified assemblies.
-  -->
-  <Target Name="_CollectPostTrimmingAssemblies"
-      Condition=" '$(PublishTrimmed)' == 'true' ">
-    <ItemGroup>
-      <_PostTrimmingAssembly Remove="@(_PostTrimmingAssembly)" />
-      <_PostTrimmingAssembly Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' and '%(ResolvedFileToPublish.PostprocessAssembly)' == 'true' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_PostTrimmingPipeline"
-      AfterTargets="ILLink"
-      DependsOnTargets="_CollectPostTrimmingAssemblies"
-      Condition=" '$(PublishTrimmed)' == 'true' "
-      Inputs="@(_PostTrimmingAssembly);$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects)"
-      Outputs="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp">
-    <PostTrimmingPipeline
-        Assemblies="@(_PostTrimmingAssembly)"
-        AddKeepAlives="$(AndroidAddKeepAlives)"
-        AndroidLinkResources="$(AndroidLinkResources)"
-        Deterministic="$(Deterministic)" />
-    <MakeDir Directories="$(_AndroidStampDirectory)" />
-    <Touch Files="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp" AlwaysCreate="true" />
-    <ItemGroup>
-      <FileWrites Include="$(_AndroidStampDirectory)_PostTrimmingPipeline.stamp" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Inject _TypeMapKind into the property cache -->
-  <Target Name="_SetTypemapProperties"
-      BeforeTargets="_CreatePropertiesCache">
-    <PropertyGroup>
-      <_TypeMapKind Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">mvid</_TypeMapKind>
-      <_TypeMapKind Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">strings-asm</_TypeMapKind>
-    </PropertyGroup>
-    <ItemGroup>
-      <_PropertyCacheItems Include="TypeMapKind=$(_TypeMapKind)" />
-      <_PropertyCacheItems Include="Deterministic=$(Deterministic)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Locate prebuilt mono.android.jar -->
-  <Target Name="_GetMonoPlatformJarPath">
-    <PropertyGroup>
-      <_AndroidJarAndDexDirectory>$(_XATargetFrameworkDirectories)</_AndroidJarAndDexDirectory>
-    </PropertyGroup>
-    <GetMonoPlatformJar
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-        TargetFrameworkDirectory="$(_AndroidJarAndDexDirectory)">
-      <Output TaskParameter="MonoPlatformJarPath" PropertyName="MonoPlatformJarPath" />
-      <Output TaskParameter="MonoPlatformDexPath" PropertyName="MonoPlatformDexPath" />
-    </GetMonoPlatformJar>
-  </Target>
-
-  <!-- Prepare native assembly sources for typemap -->
-  <Target Name="_PrepareNativeAssemblySources" Condition=" '$(_AndroidRuntime)' != 'NativeAOT' ">
-    <PrepareAbiItems
-        BuildTargetAbis="@(_BuildTargetAbis)"
-        NativeSourcesDir="$(_NativeAssemblySourceDir)"
-        Debug="$(AndroidIncludeDebugSymbols)"
-        Mode="typemap">
-      <Output TaskParameter="AssemblySources" ItemName="_TypeMapAssemblySource" />
-      <Output TaskParameter="AssemblyIncludes" ItemName="_TypeMapAssemblyInclude" />
-    </PrepareAbiItems>
-  </Target>
-
-  <!-- TypeManager.java generation and prebuilt mono.android.jar copy -->
-  <PropertyGroup>
-    <_AddTypeManagerResourcesOutput Condition=" '$(_AndroidUseMarshalMethods)' == 'True' ">$(_AndroidIntermediateJavaSourceDirectory)mono\TypeManager.java</_AddTypeManagerResourcesOutput>
-    <_AddTypeManagerResourcesOutput Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">$(IntermediateOutputPath)android\bin\mono.android.jar</_AddTypeManagerResourcesOutput>
-  </PropertyGroup>
-  <Target Name="_AddTypeManagerResources"
-      AfterTargets="_AddStaticResources"
-      Inputs="$(MonoPlatformJarPath);$(_AndroidBuildPropertiesCache)"
-      Outputs="$(_AddTypeManagerResourcesOutput)">
-    <CreateTypeManagerJava
-        Condition=" '$(_AndroidUseMarshalMethods)' == 'True' "
-        ResourceName="JavaInteropTypeManager.java"
-        OutputFilePath="$(_AndroidIntermediateJavaSourceDirectory)mono\TypeManager.java"
-    />
-    <Copy
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-        SourceFiles="$(MonoPlatformJarPath)"
-        DestinationFiles="$(IntermediateOutputPath)android\bin\mono.android.jar"
-        SkipUnchangedFiles="true" />
-    <Touch
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-        Files="$(IntermediateOutputPath)android\bin\mono.android.jar" />
-    <ItemGroup>
-      <FileWrites Include="$(_AndroidIntermediateJavaSourceDirectory)mono\JavaInteropTypeManager.java" />
-      <FileWrites
-          Condition=" '$(_AndroidUseMarshalMethods)' != 'True' and '$(_AndroidJcwCodegenTarget)' == 'XAJavaInterop1' "
-          Include="$(IntermediateOutputPath)android\bin\mono.android.jar" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Override _RemoveRegisterAttribute to strip [Register] attributes from shrunk assemblies.
-
-    The shrunk copies must be taken from the *final* linked assemblies. `_GenerateJavaStubs`
-    runs `RewriteMarshalMethods`, which rewrites @(_ResolvedAssemblies) in place (removing the
-    `cb_*` JNI callback fields), and `_PostTrimmingPipeline` rewrites them again after ILLink.
-    Depending on `_GenerateJavaStubs` keeps this copy ordered after those rewrites.
-
-    `$(_AndroidLinkFlag)` tracks ILLink, while @(_ResolvedAssemblies) tracks the later in-place
-    rewrites that the link flag cannot observe. The assembly hash also invalidates the target when
-    the resolved assembly set changes. Without the final assemblies as inputs, the shrunk copies
-    could go stale while @(_ResolvedAssemblies) moved on, so downstream build steps could consume
-    the rewritten assemblies while packaging shipped the pre-rewrite copies. This mirrors
-    `_RemoveRegisterAttributeCoreClr` in Microsoft.Android.Sdk.TypeMap.Trimmable.targets.
-  -->
-  <Target Name="_RemoveRegisterAttribute"
-      DependsOnTargets="_PrepareAssemblies;_GenerateJavaStubs"
-      Inputs="$(_AndroidLinkFlag);@(_ResolvedAssemblies);$(_ResolvedUserAssembliesHashFile);$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects)"
-      Outputs="$(_RemoveRegisterFlag)"
-      Condition="'$(AndroidLinkMode)' != 'None' AND '$(AndroidIncludeDebugSymbols)' != 'true'">
-    <CopyIfChanged
-        SourceFiles="@(_ResolvedAssemblies)"
-        DestinationFiles="@(_ShrunkAssemblies)" />
-    <CopyIfChanged
-        SourceFiles="@(_ResolvedAssemblies->'%(Identity).config')"
-        DestinationFiles="@(_ShrunkAssemblies->'%(Identity).config')" />
-    <RemoveRegisterAttribute
-        Condition=" '$(_AndroidRuntime)' != 'NativeAOT' and '$(PublishReadyToRun)' != 'true' "
-        ShrunkFrameworkAssemblies="@(_ShrunkAssemblies)" />
-    <MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)shrunk" />
-    <Touch Files="$(_RemoveRegisterFlag)" AlwaysCreate="true" />
-    <ItemGroup>
-      <FileWrites Include="$(_RemoveRegisterFlag)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Collect native typemap files for archive (FastDev) -->
-  <Target Name="_CollectTypeMapFiles"
-      BeforeTargets="_BuildApk">
-    <CollectTypeMapFilesForArchive
-        AndroidPackageFormat="$(AndroidPackageFormat)"
-        TypeMappings="@(_AndroidTypeMaps)">
-      <Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
-    </CollectTypeMapFilesForArchive>
-  </Target>
-
-  <!-- In the non-NativeAOT path, ResolvedFileToPublish is populated by the ILLink target
-       (via the SDK's ComputeResolvedFilesToPublishList), so we run proguard generation after ILLink.
-       In NativeAOT, ResolvedFileToPublish remains empty after ILLink because the ILC package's
-       _ComputeManagedAssemblyForILLink replaces ManagedAssemblyToLink after _LinkedResolvedFileToPublishCandidate
-       is computed, so the ILLink target's ResolvedFileToPublish rewrite adds nothing.
-       Instead, _AndroidComputeIlcCompileInputs populates ResolvedFileToPublish, so NativeAOT.targets
-       sets _GenerateProguardAfterTargets to run these targets after that. -->
-  <PropertyGroup>
-    <_GenerateProguardAfterTargets Condition=" '$(_GenerateProguardAfterTargets)' == '' ">ILLink</_GenerateProguardAfterTargets>
-  </PropertyGroup>
-
-  <Target Name="_PrepareLinkedAssembliesForProguard"
-      AfterTargets="$(_GenerateProguardAfterTargets)"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(_ProguardProjectConfiguration)' != '' ">
-    <ItemGroup>
-      <_LinkedAssemblyForProguard Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_GenerateProguardConfiguration"
-      AfterTargets="_PrepareLinkedAssembliesForProguard"
-      Condition=" '$(PublishTrimmed)' == 'true' and '$(_ProguardProjectConfiguration)' != '' "
-      Inputs="@(_LinkedAssemblyForProguard)"
-      Outputs="$(_ProguardProjectConfiguration)">
-    <GenerateProguardConfiguration
-        LinkedAssemblies="@(_LinkedAssemblyForProguard)"
-        OutputFile="$(_ProguardProjectConfiguration)" />
-  </Target>
-
-</Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
index a083e26e274..af917b7a586 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
@@ -576,14 +576,15 @@
       Outputs="@(_BuildTargetAbis->'$(_NativeAssemblySourceDir)typemap.%(Identity).ll')">
     <ItemGroup>
       <_TypeMapStubAbis Include="@(_BuildTargetAbis)" />
+      <_TypeMapAssemblySource Include="@(_TypeMapStubAbis->'$(_NativeAssemblySourceDir)typemap.%(Identity).ll')">
+        <abi>%(_TypeMapStubAbis.Identity)</abi>
+      </_TypeMapAssemblySource>
     </ItemGroup>
     <MakeDir Directories="$(_NativeAssemblySourceDir)" />
     <GenerateEmptyTypemapStub
         OutputDirectory="$(_NativeAssemblySourceDir)"
         Abis="@(_TypeMapStubAbis)"
-        Debug="$(AndroidIncludeDebugSymbols)">
-      <Output TaskParameter="Sources" ItemName="_TypeMapAssemblySource" />
-    </GenerateEmptyTypemapStub>
+        Debug="$(AndroidIncludeDebugSymbols)" />
     <ItemGroup>
       <FileWrites Include="@(_TypeMapAssemblySource)" />
     </ItemGroup>
@@ -592,10 +593,7 @@
   <!--
     Keep the resource designer assembly on the trimmable type map path.
 
-    The non-trimmable path (Microsoft.Android.Sdk.TypeMap.LlvmIr.targets) runs
-    PreTrimmingFixLegacyDesigner, which rewrites legacy resource field loads into designer
-    property-getter calls so the trimmer can drop unused designer members. The trimmable path
-    does not run that rewrite. More importantly, resource ids are resolved via reflection at
+    Resource ids are resolved via reflection at
     runtime (Android.Runtime.ResourceIdManager then ResourceDesignerAttribute then Type.GetType /
     UpdateIdValues), which neither ILLink nor ILC can follow. If the designer assembly is left
     trimmable it gets removed entirely, and accessing any resource id (e.g. from a reflection-only
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
index c16871171e7..f0f3094fc0b 100644
--- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
+++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs
@@ -991,7 +991,7 @@ public static string XA1048 {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to The &apos;AndroidEnableMarshalMethods&apos; and &apos;PublishReadyToRun&apos; MSBuild properties cannot both be set to &apos;true&apos;. Set one property to &apos;false&apos;..
+        ///   Looks up a localized string similar to The &apos;AndroidEnableMarshalMethods&apos; MSBuild property is no longer supported. Remove it or set it to &apos;false&apos;..
         /// </summary>
         public static string XA1049 {
             get {
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
index 105adfbed21..c90af9ca16e 100644
--- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
+++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
@@ -1124,8 +1124,8 @@ To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MS
 </comment>
   </data>
   <data name="XA1049" xml:space="preserve">
-    <value>The 'AndroidEnableMarshalMethods' and 'PublishReadyToRun' MSBuild properties cannot both be set to 'true'. Set one property to 'false'.</value>
-    <comment>The following are literal names and should not be translated: AndroidEnableMarshalMethods, PublishReadyToRun, MSBuild, true, false.</comment>
+    <value>The 'AndroidEnableMarshalMethods' MSBuild property is no longer supported. Remove it or set it to 'false'.</value>
+    <comment>The following are literal names and should not be translated: AndroidEnableMarshalMethods, MSBuild, false.</comment>
   </data>
   <data name="XA1050" xml:space="preserve">
     <value>The 'AndroidR8ObfuscationMode' MSBuild property has an invalid value of '{0}'. Valid values are 'disabled' and 'private-members'.</value>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs b/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
index 2248e256596..d16a3bbcf99 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
@@ -37,8 +37,6 @@ public class AssemblyModifierPipeline : AndroidTask
 
 	public bool Deterministic { get; set; }
 
-	public bool EnableMarshalMethods { get; set; }
-
 	public bool ErrorOnCustomJavaObject { get; set; }
 
 	public string? PackageNamingPolicy { get; set; }
@@ -134,7 +132,6 @@ protected virtual void BuildPipeline (AssemblyPipeline pipeline, MSBuildLinkCont
 		var findJavaObjectsStep = new FindJavaObjectsStep (Log) {
 			ApplicationJavaClass = ApplicationJavaClass,
 			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject,
-			UseMarshalMethods = EnableMarshalMethods,
 		};
 
 		findJavaObjectsStep.Initialize (context);
@@ -148,14 +145,6 @@ protected virtual void BuildPipeline (AssemblyPipeline pipeline, MSBuildLinkCont
 		var saveChangedAssemblyStep = new SaveChangedAssemblyStep (Log, writerParameters);
 		pipeline.Steps.Add (saveChangedAssemblyStep);
 
-		// FindTypeMapObjectsStep - this must be run after the assembly has been saved, as saving changes the MVID
-		var findTypeMapObjectsStep = new FindTypeMapObjectsStep (Log) {
-			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject,
-			Debug = Debug,
-		};
-
-		findTypeMapObjectsStep.Initialize (context);
-		pipeline.Steps.Add (findTypeMapObjectsStep);
 	}
 
 	void RunPipeline (AssemblyPipeline pipeline, ITaskItem source, ITaskItem destination)
@@ -168,7 +157,6 @@ void RunPipeline (AssemblyPipeline pipeline, ITaskItem source, ITaskItem destina
 
 		var context = new StepContext (source, destination) {
 			CodeGenerationTarget = codeGenerationTarget,
-			EnableMarshalMethods = EnableMarshalMethods,
 			IsAndroidAssembly = MonoAndroidHelper.IsAndroidAssembly (source),
 			IsDebug = Debug,
 			IsFrameworkAssembly = MonoAndroidHelper.IsFrameworkAssembly (source),
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs
deleted file mode 100644
index 9b2b3410641..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/CollectTypeMapFilesForArchive.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#nullable enable
-using System;
-using System.IO;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Collects TypeMap to be added to the final archive.
-/// </summary>
-public class CollectTypeMapFilesForArchive : AndroidTask
-{
-	public override string TaskPrefix => "CTM";
-
-	public string AndroidPackageFormat { get; set; } = "";
-
-	public ITaskItem [] TypeMappings { get; set; } = [];
-
-	[Output]
-	public ITaskItem [] FilesToAddToArchive { get; set; } = [];
-
-	public override bool RunTask ()
-	{
-		if (TypeMappings.Length == 0)
-			return true;
-
-		var rootPath = AndroidPackageFormat.Equals ("aab", StringComparison.InvariantCultureIgnoreCase) ? "root/" : "";
-		var files = new PackageFileListBuilder ();
-
-		foreach (var tm in TypeMappings)
-			files.AddItem (tm.ItemSpec, rootPath + Path.GetFileName (tm.ItemSpec));
-
-		FilesToAddToArchive = files.ToArray ();
-
-		return !Log.HasLoggedErrors;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs
deleted file mode 100644
index f13ab4bff79..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/CreateTypeManagerJava.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-#nullable enable
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-
-namespace Xamarin.Android.Tasks
-{
-	public class CreateTypeManagerJava : AndroidTask
-	{
-		public override string TaskPrefix => "CTMJ";
-
-		[Required]
-		public string ResourceName { get; set; } = "";
-
-		[Required]
-		public string OutputFilePath { get; set; } = "";
-
-		static readonly Assembly ExecutingAssembly = Assembly.GetExecutingAssembly ();
-
-		public override bool RunTask ()
-		{
-			string? content = ReadResource (ResourceName);
-
-			if (content.IsNullOrEmpty ()) {
-				return false;
-			}
-
-			var result = new StringBuilder ();
-			bool ignoring = false;
-			foreach (string line in content.Split ('\n')) {
-				if (!ignoring) {
-					if (ignoring = line.StartsWith ("//#MARSHAL_METHODS:START", StringComparison.Ordinal)) {
-						continue;
-					}
-					result.AppendLine (line);
-				} else if (line.StartsWith ("//#MARSHAL_METHODS:END", StringComparison.Ordinal)) {
-					ignoring = false;
-				}
-			}
-
-			if (result.Length == 0) {
-				Log.LogDebugMessage ("TypeManager.java not generated, empty resource data");
-				return false;
-			}
-
-			using (var ms = new MemoryStream ()) {
-				using (var sw = new StreamWriter (ms)) {
-					sw.Write (result.ToString ());
-					sw.Flush ();
-
-					if (Files.CopyIfStreamChanged (ms, OutputFilePath)) {
-						Log.LogDebugMessage ($"Wrote resource {OutputFilePath}.");
-					} else {
-						Log.LogDebugMessage ($"Resource {OutputFilePath} is unchanged. Skipping.");
-					}
-				}
-			}
-
-			return !Log.HasLoggedErrors;
-		}
-
-		string? ReadResource (string resourceName)
-		{
-			using (var from = ExecutingAssembly.GetManifestResourceStream (resourceName)) {
-				if (from == null) {
-					Log.LogCodedError ("XA0116", Properties.Resources.XA0116, resourceName);
-					return null;
-				}
-
-				using (var sr = new StreamReader (from)) {
-					return sr.ReadToEnd ();
-				}
-			}
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs
deleted file mode 100644
index 13080cd8a1a..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-public class GenerateACWMap : AndroidTask
-{
-	public override string TaskPrefix => "ACW";
-
-	[Required]
-	public string AcwMapFile { get; set; } = "";
-
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	public override bool RunTask ()
-	{
-		GenerateMap ();
-
-		return !Log.HasLoggedErrors;
-	}
-
-	void GenerateMap ()
-	{
-		// Get the set of assemblies for the "first" ABI. The ACW map is
-		// not ABI-specific, so we can use any ABI to generate the wrappers.
-		var allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-		var singleArchAssemblies = allAssembliesPerArch.First ().Value.Values.ToList ();
-
-		var entries = new List<ACWMapEntry> ();
-
-		foreach (var assembly in singleArchAssemblies) {
-			var wrappersPath = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (assembly);
-
-			if (!File.Exists (wrappersPath)) {
-				Log.LogCodedError ("XA4264", Properties.Resources.XA4264, wrappersPath);
-				return;
-			}
-
-			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.AndroidResourceFixups);
-
-			entries.AddRange (xml.ACWMapEntries);
-		}
-
-		var acwMapGen = new ACWMapGenerator (Log);
-
-		acwMapGen.Generate (entries, AcwMapFile);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs
index 05ac4925b24..5745f3002a6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateAdditionalProviderSources.cs
@@ -2,101 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using Java.Interop.Tools.JavaCallableWrappers;
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
 
 namespace Xamarin.Android.Tasks;
 
-public sealed class GenerateAdditionalProviderSources : AndroidTask
+internal static class GenerateAdditionalProviderSources
 {
-	public override string TaskPrefix => "GPS";
-
-	[Required]
-	public string [] AdditionalProviderSources { get; set; } = [];
-
-	[Required]
-	public string AndroidRuntime { get; set; } = "";
-
-	public string CodeGenerationTarget { get; set; } = "";
-
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	[Required]
-	public string OutputDirectory { get; set; } = "";
-
-	[Required]
-	public string TargetName { get; set; } = "";
-
-	public ITaskItem[]? Environments { get; set; }
-
-	AndroidRuntime androidRuntime;
-	JavaPeerStyle codeGenerationTarget;
-
-	public override bool RunTask ()
-	{
-		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
-		codeGenerationTarget = MonoAndroidHelper.ParseCodeGenerationTarget (CodeGenerationTarget);
-
-		// Retrieve the stored NativeCodeGenStateObject
-		var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<NativeCodeGenStateCollection> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenStateCollection)} not found");
-
-		// We only need the first architecture, since this task is architecture-agnostic
-		var templateCodeGenState = nativeCodeGenStates.States.First ().Value;
-
-		Generate (templateCodeGenState);
-
-		return !Log.HasLoggedErrors;
-	}
-
-	void Generate (NativeCodeGenStateObject codeGenState)
-	{
-		// Create additional runtime provider java sources.
-		bool isCoreCLR = androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.CoreCLR;
-
-		WriteAdditionalRuntimeProviderSources (OutputDirectory, isCoreCLR, AdditionalProviderSources);
-
-		// For NativeAOT, generate JavaInteropRuntime.java and NativeAotEnvironmentVars.java
-		if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.NativeAOT) {
-			GenerateNativeAotBootstrapFiles (Log, OutputDirectory, TargetName, Environments);
-		}
-
-		// Create additional application java sources.
-		StringWriter regCallsWriter = new StringWriter ();
-		regCallsWriter.WriteLine ("// Application and Instrumentation ACWs must be registered first.");
-
-		foreach ((string jniName, string assemblyQualifiedName) in codeGenState.ApplicationsAndInstrumentationsToRegister) {
-			regCallsWriter.WriteLine (
-				codeGenerationTarget == JavaPeerStyle.XAJavaInterop1 ?
-					"\t\tmono.android.Runtime.register (\"{0}\", {1}.class, {1}.__md_methods);" :
-					"\t\tnet.dot.jni.ManagedPeer.registerNativeMembers ({1}.class, {1}.__md_methods);",
-				assemblyQualifiedName,
-				jniName
-			);
-		}
-
-		regCallsWriter.Close ();
-
-		var real_app_dir = Path.Combine (OutputDirectory, "src", "net", "dot", "android");
-		string applicationTemplateFile = "ApplicationRegistration.java";
-		SaveResource (
-			applicationTemplateFile,
-			applicationTemplateFile,
-			real_app_dir,
-			template => template.Replace ("// REGISTER_APPLICATION_AND_INSTRUMENTATION_CLASSES_HERE", regCallsWriter.ToString ())
-		);
-
-	}
-
 	static string GetResource (string resource)
 	{
 		using (var stream = typeof (GenerateAdditionalProviderSources).Assembly.GetManifestResourceStream (resource))
@@ -106,8 +19,7 @@ static string GetResource (string resource)
 
 	/// <summary>
 	/// Writes the additional per-process runtime provider Java sources (e.g. NativeAotRuntimeProvider_1.java)
-	/// by cloning the runtime provider template for each name. Shared between the legacy (ILLink) and
-	/// trimmable build paths so both emit the extra providers a multi-process app declares in its manifest.
+	/// by cloning the runtime provider template for each name.
 	/// </summary>
 	internal static void WriteAdditionalRuntimeProviderSources (string outputDirectory, bool isCoreCLR, string [] additionalProviderSources)
 	{
@@ -127,16 +39,8 @@ internal static void WriteAdditionalRuntimeProviderSources (string outputDirecto
 		}
 	}
 
-	void SaveResource (string resource, string filename, string destDir, Func<string, string> applyTemplate)
-	{
-		string template = GetResource (resource);
-		template = applyTemplate (template);
-		Files.CopyIfStringChanged (template, Path.Combine (destDir, filename));
-	}
-
 	/// <summary>
 	/// Generates JavaInteropRuntime.java and NativeAotEnvironmentVars.java for NativeAOT apps.
-	/// Shared between the legacy (ILLink) and trimmable build paths.
 	/// </summary>
 	internal static void GenerateNativeAotBootstrapFiles (
 		Microsoft.Build.Utilities.TaskLoggingHelper log,
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
index d2373c22d00..87ed570b634 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateEmptyTypemapStub.cs
@@ -1,11 +1,9 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 namespace Xamarin.Android.Tasks;
 
@@ -25,24 +23,16 @@ public class GenerateEmptyTypemapStub : AndroidTask
 
 	public bool Debug { get; set; }
 
-	[Output]
-	public ITaskItem []? Sources { get; set; }
-
 	public override bool RunTask ()
 	{
 		Directory.CreateDirectory (OutputDirectory);
-		var sources = new List<ITaskItem> ();
 
 		foreach (var abi in Abis) {
 			string abiName = abi.ItemSpec;
 			string stubPath = Path.Combine (OutputDirectory, $"typemap.{abiName}.ll");
 			Files.CopyIfStringChanged (GenerateStubLlvmIr (abiName), stubPath);
-			var item = new TaskItem (stubPath);
-			item.SetMetadata ("abi", abiName);
-			sources.Add (item);
 		}
 
-		Sources = sources.ToArray ();
 		return !Log.HasLoggedErrors;
 	}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs
deleted file mode 100644
index 7090c72b94f..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
-using Java.Interop.Tools.TypeNameMappings;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using PackageNamingPolicyEnum = Java.Interop.Tools.TypeNameMappings.PackageNamingPolicy;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Transforms the XML files of JLOs found in the linker step into JavaCallableWrappers.
-/// </summary>
-public class GenerateJavaCallableWrappers : AndroidTask
-{
-	public override string TaskPrefix => "JCW";
-
-	[Required]
-	public string CodeGenerationTarget { get; set; } = "";
-
-	[Required]
-	public string OutputDirectory { get; set; } = "";
-
-	[Required]
-	public string PackageNamingPolicy { get; set; } = "";
-
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	[Output]
-	public ITaskItem [] GeneratedJavaFilesOutput { get; set; } = [];
-
-	public override bool RunTask ()
-	{
-		JavaNativeTypeManager.PackageNamingPolicy = Enum.TryParse (PackageNamingPolicy, out PackageNamingPolicyEnum pnp) ? pnp : PackageNamingPolicyEnum.LowercaseCrc64;
-
-		// Get the set of assemblies for the "first" ABI. JavaCallableWrappers are
-		// not ABI-specific, so we can use any ABI to generate the wrappers.
-		var allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-		var singleArchAssemblies = allAssembliesPerArch.First ().Value.Values.ToList ();
-
-		GenerateWrappers (singleArchAssemblies);
-
-		return !Log.HasLoggedErrors;
-	}
-
-	void GenerateWrappers (List<ITaskItem> assemblies)
-	{
-		Directory.CreateDirectory (OutputDirectory);
-
-		// Deserialize JavaCallableWrappers XML files
-		var wrappers = new List<CallableWrapperType> ();
-		var sw = Stopwatch.StartNew ();
-
-		foreach (var assembly in assemblies) {
-			var wrappersPath = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (assembly);
-
-			if (!File.Exists (wrappersPath)) {
-				Log.LogCodedError ("XA4264", Properties.Resources.XA4264, wrappersPath);
-				return;
-			}
-
-			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.JavaCallableWrappers);
-
-			if (xml.JavaCallableWrappers.Count == 0) {
-				Log.LogDebugMessage ($"'{wrappersPath}' is empty, skipping.");
-				continue;
-			}
-
-			wrappers.AddRange (xml.JavaCallableWrappers);
-		}
-
-		Log.LogDebugMessage ($"Deserialized {wrappers.Count} Java callable wrappers in {sw.ElapsedMilliseconds}ms");
-		sw.Restart ();
-
-		// Write JavaCallableWrappers to Java files
-		var writer_options = new CallableWrapperWriterOptions {
-			CodeGenerationTarget = MonoAndroidHelper.ParseCodeGenerationTarget (CodeGenerationTarget)
-		};
-
-		var generated_files = new List<ITaskItem> ();
-
-		foreach (var generator in wrappers) {
-			using var writer = MemoryStreamPool.Shared.CreateStreamWriter ();
-
-			generator.Generate (writer, writer_options);
-			writer.Flush ();
-
-			var path = generator.GetDestinationPath (OutputDirectory);
-
-			var changed = Files.CopyIfStreamChanged (writer.BaseStream, path);
-			Log.LogDebugMessage ($"*NEW* Generated Java callable wrapper code: '{path}' (changed: {changed})");
-
-			generated_files.Add (new TaskItem (path));
-		}
-
-		Log.LogDebugMessage ($"Generated {generated_files.Count} Java callable wrapper files in {sw.ElapsedMilliseconds}ms");
-		GeneratedJavaFilesOutput = generated_files.ToArray ();
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
deleted file mode 100644
index 22a4e7afcef..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (C) 2011 Xamarin, Inc. All rights reserved.
-
-#nullable enable
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.Diagnostics;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.JavaCallableWrappers.Adapters;
-using Java.Interop.Tools.TypeNameMappings;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	using PackageNamingPolicyEnum   = PackageNamingPolicy;
-
-	public class GenerateJavaStubs : AndroidTask
-	{
-		public const string NativeCodeGenStateRegisterTaskKey = ".:!MarshalMethods!:.";
-		public const string NativeCodeGenStateObjectRegisterTaskKey = ".:!MarshalMethodsObject!:.";
-
-		public override string TaskPrefix => "GJS";
-
-		[Required]
-		public ITaskItem[] ResolvedAssemblies { get; set; } = [];
-
-		[Required]
-		public ITaskItem[] ResolvedUserAssemblies { get; set; } = [];
-
-		[Required]
-		public ITaskItem [] FrameworkDirectories { get; set; } = [];
-
-		[Required]
-		public string [] SupportedAbis { get; set; } = [];
-
-		public string? IntermediateOutputDirectory { get; set; }
-		public bool EnableMarshalMethods { get; set; }
-
-		public bool Debug { get; set; }
-
-		[Required]
-		public string OutputDirectory { get; set; } = "";
-
-		public bool ErrorOnCustomJavaObject { get; set; }
-
-		public string? PackageNamingPolicy { get; set; }
-
-		[Required]
-		public string ApplicationJavaClass { get; set; } = "";
-
-		public string CodeGenerationTarget { get; set; } = "";
-
-		public bool EnableNativeRuntimeLinking { get; set; }
-
-		JavaPeerStyle codeGenerationTarget;
-
-		//[Output]
-		//public ITaskItem [] GeneratedJavaFilesOutput { get; set; }
-
-		internal const string AndroidSkipJavaStubGeneration = "AndroidSkipJavaStubGeneration";
-
-		public override bool RunTask ()
-		{
-			try {
-				codeGenerationTarget = MonoAndroidHelper.ParseCodeGenerationTarget (CodeGenerationTarget);
-				bool useMarshalMethods = !Debug && EnableMarshalMethods;
-				Run (useMarshalMethods);
-			} catch (XamarinAndroidException e) {
-				Log.LogCodedError (string.Format ("XA{0:0000}", e.Code), e.MessageWithoutCode);
-				if (MonoAndroidHelper.LogInternalExceptions)
-					Log.LogMessage (e.ToString ());
-			}
-
-			return !Log.HasLoggedErrors;
-		}
-
-		void Run (bool useMarshalMethods)
-		{
-			PackageNamingPolicy pnp;
-			JavaNativeTypeManager.PackageNamingPolicy = Enum.TryParse (PackageNamingPolicy, out pnp) ? pnp : PackageNamingPolicyEnum.LowercaseCrc64;
-
-			// We will process each architecture completely separately as both type maps and marshal methods are strictly per-architecture and
-			// the assemblies should be processed strictly per architecture.  Generation of JCWs, and the manifest are ABI-agnostic.
-			// We will generate them only for the first architecture, whichever it is.
-			Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-
-			// Should "never" happen...
-			if (allAssembliesPerArch.Count != SupportedAbis.Length) {
-				// ...but it happens at least in our `BuildAMassiveApp` test, where `SupportedAbis` mentions only the `x86` and `armeabi-v7a` ABIs, but `ResolvedAssemblies` contains
-				// entries for all the ABIs we support, so let's be flexible and ignore the extra architectures but still error out if there are less architectures than supported ABIs.
-				if (allAssembliesPerArch.Count < SupportedAbis.Length) {
-					throw new InvalidOperationException ($"Internal error: number of architectures ({allAssembliesPerArch.Count}) must equal the number of target ABIs ({SupportedAbis.Length})");
-				}
-			}
-
-			// ...or this...
-			foreach (string abi in SupportedAbis) {
-				AndroidTargetArch arch = MonoAndroidHelper.AbiToTargetArch (abi);
-				if (!allAssembliesPerArch.ContainsKey (arch)) {
-					throw new InvalidOperationException ($"Internal error: no assemblies for architecture '{arch}', which corresponds to target abi '{abi}'");
-				}
-			}
-
-			// ...as well as this
-			Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> userAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedUserAssemblies, SupportedAbis, validate: true);
-			foreach (var kvp in userAssembliesPerArch) {
-				if (!allAssembliesPerArch.TryGetValue (kvp.Key, out Dictionary<string, ITaskItem> allAssemblies)) {
-					throw new InvalidOperationException ($"Internal error: found user assemblies for architecture '{kvp.Key}' which isn't found in ResolvedAssemblies");
-				}
-
-				foreach (var asmKvp in kvp.Value) {
-					if (!allAssemblies.ContainsKey (asmKvp.Key)) {
-						throw new InvalidOperationException ($"Internal error: user assembly '{asmKvp.Value}' not found in ResolvedAssemblies");
-					}
-				}
-			}
-
-			// Now that "never" never happened, we can proceed knowing that at least the assembly sets are the same for each architecture
-			var nativeCodeGenStates = new ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState> ();
-			NativeCodeGenState? templateCodeGenState = null;
-			PinvokeScanner? pinvokeScanner = EnableNativeRuntimeLinking ? new PinvokeScanner (Log) : null;
-
-			var firstArch = allAssembliesPerArch.First ().Key;
-
-			// Process each architecture in parallel
-			Parallel.ForEach (allAssembliesPerArch, (kvp) => {
-				AndroidTargetArch arch = kvp.Key;
-				Dictionary<string, ITaskItem> archAssemblies = kvp.Value;
-
-				NativeCodeGenState? state = ScanTypesAndMaybeClassifyMarshalMethods (arch, archAssemblies, MaybeGetArchAssemblies (userAssembliesPerArch, arch), useMarshalMethods);
-
-				// If this is the first architecture, we need to store the state for later use
-				if (arch == firstArch) {
-					templateCodeGenState = state;
-				}
-
-				if (state != null) {
-					nativeCodeGenStates.TryAdd (arch, state);
-
-					if (pinvokeScanner != null && state != null) {
-						(bool success, List<PinvokeScanner.PinvokeEntryInfo>? pinfos) = ScanForUsedPinvokes (pinvokeScanner, arch, state.Resolver);
-						if (!success) {
-							return;
-						}
-						state.PinvokeInfos = pinfos;
-						Log.LogDebugMessage ($"Number of unique p/invokes for architecture '{arch}': {pinfos?.Count}");
-					}
-				}
-			});
-
-			if (templateCodeGenState == null) {
-				throw new InvalidOperationException ($"Internal error: no native code generator state defined");
-			}
-			JCWGenerator.EnsureAllArchitecturesAreIdentical (Log, nativeCodeGenStates);
-
-			// Save NativeCodeGenState for later tasks
-			Log.LogDebugMessage ($"Saving {nameof (NativeCodeGenState)} to {nameof (NativeCodeGenStateRegisterTaskKey)}");
-			BuildEngine4.RegisterTaskObjectAssemblyLocal (MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory), nativeCodeGenStates, RegisteredTaskObjectLifetime.Build);
-		}
-
-		(bool success, List<PinvokeScanner.PinvokeEntryInfo>? pinfos) ScanForUsedPinvokes (PinvokeScanner scanner, AndroidTargetArch arch, XAAssemblyResolver resolver)
-		{
-			if (!EnableNativeRuntimeLinking) {
-				return (true, null);
-			}
-
-			var frameworkAssemblies = new List<ITaskItem> ();
-
-			foreach (ITaskItem asm in ResolvedAssemblies) {
-				string? metadata = asm.GetMetadata ("FrameworkAssembly");
-				if (String.IsNullOrEmpty (metadata)) {
-					continue;
-				}
-
-				if (!Boolean.TryParse (metadata, out bool isFrameworkAssembly) || !isFrameworkAssembly) {
-					continue;
-				}
-
-				frameworkAssemblies.Add (asm);
-			}
-
-			var pinfos = scanner.Scan (arch, resolver, frameworkAssemblies);
-			return (true, pinfos);
-		}
-
-		internal static Dictionary<string, ITaskItem> MaybeGetArchAssemblies (Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> dict, AndroidTargetArch arch)
-		{
-			if (!dict.TryGetValue (arch, out Dictionary<string, ITaskItem> archDict)) {
-				return new Dictionary<string, ITaskItem> (StringComparer.OrdinalIgnoreCase);
-			}
-
-			return archDict;
-		}
-
-		NativeCodeGenState? ScanTypesAndMaybeClassifyMarshalMethods (AndroidTargetArch arch, Dictionary<string, ITaskItem> assemblies, Dictionary<string, ITaskItem> userAssemblies, bool useMarshalMethods)
-		{
-			XAAssemblyResolver resolver = MonoAndroidHelper.MakeResolver (Log, useMarshalMethods, arch, assemblies);
-			var tdCache = new TypeDefinitionCache ();
-			(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) = ScanForJavaTypes (resolver, tdCache, assemblies, userAssemblies, useMarshalMethods);
-
-			MarshalMethodsCollection? marshalMethodsCollection = null;
-
-			if (useMarshalMethods)
-				marshalMethodsCollection = MarshalMethodsCollection.FromAssemblies (arch, assemblies.Values.ToList (), resolver, Log);
-
-			return new NativeCodeGenState (arch, tdCache, resolver, allJavaTypes, javaTypesForJCW, marshalMethodsCollection);
-		}
-
-		(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) ScanForJavaTypes (XAAssemblyResolver res, TypeDefinitionCache cache, Dictionary<string, ITaskItem> assemblies, Dictionary<string, ITaskItem> userAssemblies, bool useMarshalMethods)
-		{
-			var scanner = new XAJavaTypeScanner (res.TargetArch, Log, cache) {
-				ErrorOnCustomJavaObject     = ErrorOnCustomJavaObject,
-			};
-			List<TypeDefinition> allJavaTypes = scanner.GetJavaTypes (assemblies.Values, res);
-
-			var javaTypesForJCW = new List<TypeDefinition> ();
-
-			// When marshal methods or non-JavaPeerStyle.XAJavaInterop1 are in use we do not want to skip non-user assemblies (such as Mono.Android) - we need to generate JCWs for them during
-			// application build, unlike in Debug configuration or when marshal methods are disabled, in which case we use JCWs generated during Xamarin.Android
-			// build and stored in a jar file.
-			bool shouldSkipNonUserAssemblies = !useMarshalMethods && codeGenerationTarget == JavaPeerStyle.XAJavaInterop1;
-			Log.LogDebugMessage ($"Should skip non-user assemblies: {shouldSkipNonUserAssemblies} (useMarshalMethods: {useMarshalMethods})");
-
-			foreach (TypeDefinition type in allJavaTypes) {
-				if ((shouldSkipNonUserAssemblies && !userAssemblies.ContainsKey (type.Module.Assembly.Name.Name)) || JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (type, cache)) {
-					continue;
-				}
-				javaTypesForJCW.Add (type);
-			}
-
-			return (allJavaTypes, javaTypesForJCW);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs
deleted file mode 100644
index 04cf9fcb6f1..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-public class GenerateMainAndroidManifest : AndroidTask
-{
-	public override string TaskPrefix => "GMM";
-
-	[Output]
-	public string []? AdditionalProviderSources { get; set; }
-	[Required]
-	public string AndroidRuntime { get; set; } = "";
-	public string? AndroidSdkDir { get; set; }
-	[Required]
-	public string AndroidApiLevel { get; set; } = "";
-	public string? ApplicationJavaClass { get; set; }
-	public string? ApplicationLabel { get; set; }
-	public string? BundledWearApplicationName { get; set; }
-	public string? CheckedBuild { get; set; }
-	public bool Debug { get; set; }
-	public bool EmbedAssemblies { get; set; }
-	public bool EnableNativeRuntimeLinking { get; set; }
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-	public string []? ManifestPlaceholders { get; set; }
-	public string? ManifestTemplate { get; set; }
-	public string? MergedAndroidManifestOutput { get; set; }
-	public bool NeedsInternet { get; set; }
-	public string? PackageName { get; set; }
-	[Required]
-	public ITaskItem [] ResolvedUserAssemblies { get; set; } = [];
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-	public string? SupportedOSPlatformVersion { get; set; }
-	public string? VersionCode { get; set; }
-	public string? VersionName { get; set; }
-
-	AndroidRuntime androidRuntime;
-
-	public override bool RunTask ()
-	{
-		// Retrieve the stored NativeCodeGenState (and remove it from the cache)
-		var nativeCodeGenStates = BuildEngine4.UnregisterTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenState)} not found");
-
-		// We only need the first architecture, since this task is architecture-agnostic
-		var templateCodeGenState = nativeCodeGenStates.First ().Value;
-
-		var userAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedUserAssemblies, SupportedAbis, validate: true);
-
-		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
-
-		// Generate the application manifest for the Java manifest merger
-		var additionalProviders = MergeManifest (templateCodeGenState, GenerateJavaStubs.MaybeGetArchAssemblies (userAssembliesPerArch, templateCodeGenState.TargetArch));
-
-		AdditionalProviderSources = additionalProviders.ToArray ();
-
-		// We still need the NativeCodeGenState for later tasks, but we're going to transfer
-		// it to a new object that doesn't require holding open Cecil AssemblyDefinitions.
-		var nativeCodeGenStateObject = MarshalMethodCecilAdapter.GetNativeCodeGenStateCollection (Log, nativeCodeGenStates);
-
-		if (nativeCodeGenStateObject is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenStateCollection)} not created");
-
-		Log.LogDebugMessage ($"Saving {nameof (NativeCodeGenStateObject)} to {nameof (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey)}");
-		BuildEngine4.RegisterTaskObjectAssemblyLocal (MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory), nativeCodeGenStateObject, RegisteredTaskObjectLifetime.Build);
-
-		// Dispose the Cecil resolvers so the assemblies are closed.
-		Log.LogDebugMessage ($"Disposing all {nameof (NativeCodeGenState)}.{nameof (NativeCodeGenState.Resolver)}");
-
-		foreach (var state in nativeCodeGenStates.Values) {
-			state.Resolver.Dispose ();
-		}
-
-		if (Log.HasLoggedErrors && MergedAndroidManifestOutput != null) {
-			// Ensure that on a rebuild, we don't *skip* the `_GenerateJavaStubs` target,
-			// by ensuring that the target outputs have been deleted.
-			Files.DeleteFile (MergedAndroidManifestOutput, Log);
-		}
-
-		return !Log.HasLoggedErrors;
-	}
-
-	IList<string> MergeManifest (NativeCodeGenState codeGenState, Dictionary<string, ITaskItem> userAssemblies)
-	{
-		string targetSdkVersion = AndroidApiLevel;
-		if (MonoAndroidHelper.TryParseApiLevel (targetSdkVersion, out Version version)) {
-			targetSdkVersion = version.Major.ToString (CultureInfo.InvariantCulture);
-		}
-
-		var manifest = new ManifestDocument (ManifestTemplate) {
-			PackageName = PackageName,
-			VersionName = VersionName,
-			ApplicationLabel = ApplicationLabel ?? PackageName,
-			Placeholders = ManifestPlaceholders,
-			Resolver = codeGenState.Resolver,
-			SdkDir = AndroidSdkDir,
-			TargetSdkVersion = targetSdkVersion,
-			MinSdkVersion = MonoAndroidHelper.ConvertSupportedOSPlatformVersionToApiLevel (SupportedOSPlatformVersion).ToString (),
-			Debug = Debug,
-			NeedsInternet = NeedsInternet,
-			AndroidRuntime = androidRuntime,
-		};
-		// Only set manifest.VersionCode if there is no existing value in AndroidManifest.xml.
-		if (manifest.HasVersionCode) {
-			Log.LogDebugMessage ($"Using existing versionCode in: {ManifestTemplate}");
-		} else if (!VersionCode.IsNullOrEmpty ()) {
-			manifest.VersionCode = VersionCode;
-		}
-		manifest.Assemblies.AddRange (userAssemblies.Values.Select (item => item.ItemSpec));
-
-		if (!String.IsNullOrWhiteSpace (CheckedBuild)) {
-			// We don't validate CheckedBuild value here, this will be done in BuildApk. We just know that if it's
-			// on then we need android:debuggable=true and android:extractNativeLibs=true
-			manifest.ForceDebuggable = true;
-			manifest.ForceExtractNativeLibs = true;
-		}
-
-		IList<string> additionalProviders = manifest.Merge (Log, codeGenState.TypeCache, codeGenState.AllJavaTypes, ApplicationJavaClass, EmbedAssemblies, BundledWearApplicationName);
-
-		// Only write the new manifest if it actually changed
-		if (manifest.SaveIfChanged (Log, MergedAndroidManifestOutput)) {
-			Log.LogDebugMessage ($"Saving: {MergedAndroidManifestOutput}");
-		}
-
-		return additionalProviders;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs
index 7ad65b737c1..dbc86ff12f8 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotBootstrapSources.cs
@@ -9,8 +9,7 @@ namespace Xamarin.Android.Tasks;
 /// library and exposes the runtime init entry point) and NativeAotEnvironmentVars.java
 /// (bakes in environment variable names/values for the native runtime).
 ///
-/// These files are needed by NativeAotRuntimeProvider.java and must be generated regardless
-/// of the typemap implementation (managed or trimmable).
+/// These files are needed by NativeAotRuntimeProvider.java.
 ///
 /// Delegates to <see cref="GenerateAdditionalProviderSources.GenerateNativeAotBootstrapFiles"/>
 /// for the actual generation logic.
@@ -29,8 +28,7 @@ public sealed class GenerateNativeAotBootstrapSources : AndroidTask
 
 	// Names of the extra per-process runtime providers (e.g. NativeAotRuntimeProvider_1) that the
 	// manifest declares for components with a non-default android:process; their Java sources must be
-	// generated too. On the legacy path GenerateAdditionalProviderSources writes these; the trimmable
-	// path has no such task, so the bootstrap step handles them here.
+	// generated too.
 	public string [] AdditionalProviderSources { get; set; } = [];
 
 	public override bool RunTask ()
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
index 4fde58c0b78..606c6d5681c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotLibraryLoadAssemblerSources.cs
@@ -73,7 +73,7 @@ public override bool RunTask ()
 			assemblies.Add (name, item);
 		}
 
-		XAAssemblyResolver resolver = MonoAndroidHelper.MakeResolver (Log, useMarshalMethods: false, targetArch, assemblies, loadDebugSymbols: false);
+		XAAssemblyResolver resolver = MonoAndroidHelper.MakeResolver (Log, targetArch, assemblies, loadDebugSymbols: false);
 		var pinvokeScanner = new PinvokeScanner (Log, debugLogging: false);
 		List<PinvokeScanner.PinvokeEntryInfo> pinfos = pinvokeScanner.Scan (targetArch, resolver, ResolvedAssemblies);
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
index 631f960b166..73c647151c6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs
@@ -49,8 +49,6 @@ public class GenerateNativeApplicationConfigSources : AndroidTask
 		[Required]
 		public string AndroidRuntime { get; set; } = "";
 
-		public bool EnableMarshalMethods { get; set; }
-
 		/// <summary>
 		/// When <c>true</c>, descriptive comments are written into the generated LLVM IR.  They make
 		/// the <c>.ll</c> far easier to read, but have no effect on the object code produced from it.
@@ -77,8 +75,7 @@ public override bool RunTask ()
 				pnp = PackageNamingPolicyEnum.LowercaseCrc64;
 			}
 
-			// Even though environment files were potentially parsed in GenerateJavaStubs, we need to do it here again because we might have additional environment
-			// files (generated by us) which weren't present by the time GeneratJavaStubs ran.
+			// Include generated environment files from the later stages of the build.
 			var envBuilder = new EnvironmentBuilder ();
 			envBuilder.Read (Environments);
 
@@ -206,7 +203,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 			LLVMIR.LlvmIrComposer appConfigAsmGen = new ApplicationConfigNativeAssemblyGenerator (envBuilder.EnvironmentVariables, envBuilder.SystemProperties, runtimeProperties, Log) {
 				AndroidPackageName = AndroidPackageName,
 				PackageNamingPolicy = pnp,
-				JniAddNativeMethodRegistrationAttributePresent = NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent,
+				JniAddNativeMethodRegistrationAttributePresent = false,
 				NumberOfAssembliesInApk = assemblyCount,
 				BundledAssemblyNameWidth = assemblyNameWidth,
 				NativeLibraries = uniqueNativeLibraries,
@@ -217,7 +214,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
 				JNIEnvRegisterJniNativesToken = jnienv_registerjninatives_method_token,
 				JniRemappingReplacementTypeCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementTypeCount,
 				JniRemappingReplacementMethodIndexEntryCount = jniRemappingNativeCodeInfo == null ? 0 : jniRemappingNativeCodeInfo.ReplacementMethodIndexEntryCount,
-				MarshalMethodsEnabled = EnableMarshalMethods,
+				MarshalMethodsEnabled = false,
 				IgnoreSplitConfigs = ShouldIgnoreSplitConfigs (),
 				HaveAssemblyStore = UseAssemblyStore,
 			};
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
index 981dc618abb..55b62a3a20f 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeMarshalMethodSources.cs
@@ -10,28 +10,11 @@
 namespace Xamarin.Android.Tasks;
 
 /// <summary>
-/// MSBuild task that generates native LLVM assembly source files containing marshal methods and
-/// optional P/Invoke preservation code. This task creates the final native code that bridges
-/// between .NET and Java/JNI, using the marshal method classifications and rewritten assemblies
-/// from previous pipeline stages.
+/// Generates an empty native marshal-method compatibility source and optional P/Invoke
+/// preservation code. The compatibility source supplies symbols expected by the native host.
 /// </summary>
 /// <remarks>
-/// This task is responsible for the final code generation phase of the marshal methods pipeline:
-/// 
-/// 1. **Marshal Methods Generation**: Creates LLVM IR code for native marshal methods that can
-///    be called directly from Java/JNI without dynamic registration overhead.
-/// 
-/// 2. **P/Invoke Preservation** (when EnableNativeRuntimeLinking=true): Generates additional 
-///    code to preserve P/Invoke methods that would otherwise be removed by native linking.
-/// 
-/// 3. **Runtime-Specific Code**: Adapts the generated code for CoreCLR runtime linking and method resolution.
-/// 
-/// 4. **Architecture Support**: Generates separate code files for each supported Android ABI
-///    (arm64-v8a, armeabi-v7a, x86_64, x86).
-/// 
-/// The task generates LLVM IR (.ll) files that are later compiled to native assembly by the
-/// Android NDK toolchain. Even when marshal methods are disabled, empty files are generated
-/// to maintain build consistency.
+/// The generated LLVM IR (.ll) is compiled with the other application native sources.
 /// </remarks>
 public class GenerateNativeMarshalMethodSources : AndroidTask
 {
@@ -40,12 +23,6 @@ public class GenerateNativeMarshalMethodSources : AndroidTask
 	/// </summary>
 	public override string TaskPrefix => "GNM";
 
-	/// <summary>
-	/// Gets or sets whether marshal methods generation is enabled.
-	/// When false, generates empty placeholder files to maintain build consistency.
-	/// </summary>
-	public bool EnableMarshalMethods { get; set; }
-
 	/// <summary>
 	/// Gets or sets whether native runtime linking is enabled.
 	/// When true, generates additional P/Invoke preservation code to prevent
@@ -61,31 +38,17 @@ public class GenerateNativeMarshalMethodSources : AndroidTask
 	public string EnvironmentOutputDirectory { get; set; } = "";
 
 	/// <summary>
-	/// Gets or sets the intermediate output directory path.
-	/// Used to retrieve native code generation state from previous pipeline stages.
-	/// </summary>
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	/// <summary>
-	/// Gets or sets the resolved assemblies to process for marshal method generation.
-	/// These assemblies have been processed by previous pipeline stages.
+	/// Gets or sets the resolved assemblies to process.
+	/// These assemblies are scanned for P/Invokes when native linking is enabled.
 	/// </summary>
 	[Required]
 	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
 
 	/// <summary>
 	/// Gets or sets the target Android runtime.
-	/// Determines which runtime-specific code generator to use.
 	/// </summary>
 	[Required]
-        public string AndroidRuntime { get; set; } = "";
-
-	/// <summary>
-	/// Gets or sets the satellite assemblies containing localized resources.
-	/// These are included in assembly counting and naming for native code generation.
-	/// </summary>
-	public ITaskItem [] SatelliteAssemblies { get; set; } = [];
+	public string AndroidRuntime { get; set; } = "";
 
 	/// <summary>
 	/// Gets or sets the list of supported Android ABIs to generate code for.
@@ -108,60 +71,43 @@ public class GenerateNativeMarshalMethodSources : AndroidTask
 	/// The execution flow is:
 	/// 
 	/// 1. Parse the Android runtime type
-	/// 2. Retrieve native code generation state from previous pipeline stages (if marshal methods enabled)
+	/// 2. Scan framework assemblies for P/Invokes when native linking is enabled
 	/// 3. Generate LLVM IR files for each supported ABI
-	/// 4. Handle both marshal methods and P/Invoke preservation code as needed
-	/// 
-	/// The native code generation state is removed from the cache after retrieval to ensure
-	/// it's not accidentally reused by subsequent build tasks.
+	/// 4. Write the empty marshal-method source
 	/// </remarks>
 	public override bool RunTask ()
 	{
-		NativeCodeGenStateCollection? nativeCodeGenStates = null;
 		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
 
-		// Retrieve native code generation state only if we need it
-		if (EnableMarshalMethods || EnableNativeRuntimeLinking) {
-			// Retrieve the stored NativeCodeGenStateCollection (and remove it from the cache)
-			nativeCodeGenStates = BuildEngine4.UnregisterTaskObjectAssemblyLocal<NativeCodeGenStateCollection> (
-				MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-				RegisteredTaskObjectLifetime.Build
-			);
-		}
-
 		// Generate native code for each supported ABI
 		foreach (var abi in SupportedAbis)
-			Generate (nativeCodeGenStates, abi);
+			Generate (abi);
 
 		return !Log.HasLoggedErrors;
 	}
 
 	/// <summary>
 	/// Generates native LLVM IR source files for a specific Android ABI.
-	/// Creates both marshal methods and optional P/Invoke preservation code.
+	/// Creates the empty marshal-method source and optional P/Invoke preservation code.
 	/// </summary>
-	/// <param name="nativeCodeGenStates">
-	/// Collection of native code generation states from previous pipeline stages.
-	/// May be null if marshal methods are disabled.
-	/// </param>
 	/// <param name="abi">The target Android ABI to generate code for (e.g., "arm64-v8a").</param>
 	/// <remarks>
 	/// This method handles the complete code generation workflow:
 	/// 
 	/// 1. **Setup**: Determines target architecture, file paths, and assembly information
-	/// 2. **Generator Creation**: Creates runtime-specific code generators (MonoVM or CoreCLR)
+	/// 2. **Generator Creation**: Creates the empty compatibility source
 	/// 3. **P/Invoke Preservation** (optional): Generates code to preserve P/Invoke methods
-	/// 4. **Marshal Methods**: Generates the main marshal methods LLVM IR code
+	/// 4. **Compatibility Stub**: Generates the empty marshal-method LLVM IR
 	/// 5. **File Output**: Writes generated code to disk with proper error handling
 	/// 
 	/// The generated files are:
-	/// - `marshal_methods.{abi}.ll`: Main marshal methods LLVM IR
+	/// - `marshal_methods.{abi}.ll`: Empty marshal-method compatibility LLVM IR
 	/// - `pinvoke_preserve.{abi}.ll`: P/Invoke preservation code (when native linking enabled)
 	/// 
 	/// Both generators construct an LLVM IR module and then generate the actual code,
 	/// with proper stream management and error recovery in case of partial writes.
 	/// </remarks>
-	void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
+	void Generate (string abi)
 	{
 		// Setup target information and file paths
 		var targetAbi = abi.ToLowerInvariant ();
@@ -170,18 +116,16 @@ void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
 		var pinvokePreserveBaseAsmFilePath = EnableNativeRuntimeLinking ? Path.Combine (EnvironmentOutputDirectory, $"pinvoke_preserve.{targetAbi}") : null;
 		var marshalMethodsLlFilePath = $"{marshalMethodsBaseAsmFilePath}.ll";
 		var pinvokePreserveLlFilePath = pinvokePreserveBaseAsmFilePath != null ? $"{pinvokePreserveBaseAsmFilePath}.ll" : null;
-		var (_, uniqueAssemblyNames) = GetAssemblyCountAndUniqueNames ();
-
-		// Create the appropriate runtime-specific generator
+		// Generate the native host's empty marshal-method compatibility symbols.
 		MarshalMethodsNativeAssemblyGenerator marshalMethodsAsmGen = androidRuntime switch {
-			Tasks.AndroidRuntime.CoreCLR => MakeGenerator (),
+			Tasks.AndroidRuntime.CoreCLR => new MarshalMethodsNativeAssemblyGenerator (Log),
 			_ => throw new NotSupportedException ($"Internal error: unsupported runtime type '{androidRuntime}'")
 		};
 
 		// Generate P/Invoke preservation code if native linking is enabled
 		bool fileFullyWritten;
 		if (EnableNativeRuntimeLinking) {
-			var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, EnsureCodeGenState (nativeCodeGenStates, targetArch));
+			var pinvokePreserveGen = new PreservePinvokesNativeAssemblyGenerator (Log, targetArch, ScanPInvokes (targetArch));
 			LLVMIR.LlvmIrModule pinvokePreserveModule = pinvokePreserveGen.Construct ();
 			using var pinvokePreserveWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
 			fileFullyWritten = false;
@@ -214,101 +158,20 @@ void Generate (NativeCodeGenStateCollection? nativeCodeGenStates, string abi)
 				MonoAndroidHelper.LogTextStreamContents (Log, $"Partial contents of file '{marshalMethodsLlFilePath}'", marshalMethodsWriter.BaseStream);
 			}
 		}
-
-		/// <summary>
-		/// Creates a CoreCLR-specific marshal methods generator.
-		/// Handles both enabled and disabled marshal methods scenarios.
-		/// </summary>
-		/// <returns>A configured CoreCLR marshal methods generator.</returns>
-		MarshalMethodsNativeAssemblyGenerator MakeGenerator ()
-		{
-			if (EnableMarshalMethods) {
-				return new MarshalMethodsNativeAssemblyGenerator (
-					Log,
-					uniqueAssemblyNames,
-					EnsureCodeGenState (nativeCodeGenStates, targetArch)
-				);
-			}
-
-			// Generate empty/minimal code when marshal methods are disabled
-			return new MarshalMethodsNativeAssemblyGenerator (
-				Log,
-				targetArch,
-				uniqueAssemblyNames
-			);
-		}
 	}
 
-	/// <summary>
-	/// Counts the total number of assemblies and collects unique assembly names
-	/// from both resolved assemblies and satellite assemblies.
-	/// </summary>
-	/// <returns>
-	/// A tuple containing:
-	/// - assemblyCount: The total number of unique assemblies across all architectures
-	/// - uniqueAssemblyNames: A set of unique assembly names including culture information
-	/// </returns>
-	/// <remarks>
-	/// This method processes both main assemblies and satellite assemblies (for localization).
-	/// For satellite assemblies, the culture name is prepended to create unique identifiers
-	/// (e.g., "en-US/MyApp.resources.dll"). This information is used by the native code
-	/// generators to create appropriate lookup structures and assembly metadata.
-	/// </remarks>
-	(int assemblyCount, HashSet<string> uniqueAssemblyNames) GetAssemblyCountAndUniqueNames ()
+	List<PinvokeScanner.PinvokeEntryInfo> ScanPInvokes (AndroidTargetArch arch)
 	{
-		var assemblyCount = 0;
-		var archAssemblyNames = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
-		var uniqueAssemblyNames = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
-
-		// Process both main assemblies and satellite assemblies
-		foreach (var assembly in SatelliteAssemblies.Concat (ResolvedAssemblies)) {
-			var culture = MonoAndroidHelper.GetAssemblyCulture (assembly);
-			var fileName = Path.GetFileName (assembly.ItemSpec);
-			string assemblyName;
-
-			// Include culture information for satellite assemblies
-			if (culture.IsNullOrEmpty ()) {
-				assemblyName = fileName;
-			} else {
-				assemblyName = $"{culture}/{fileName}";
-			}
-
-			// Track all unique assembly names across architectures
-			uniqueAssemblyNames.Add (assemblyName);
-
-			// Count unique assemblies per architecture to avoid duplicates
-			if (!archAssemblyNames.Contains (assemblyName)) {
-				assemblyCount++;
-				archAssemblyNames.Add (assemblyName);
-			}
+		// Generated trimmable type map assemblies are attached only to the first ABI.
+		var assemblies = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: false);
+		if (!assemblies.TryGetValue (arch, out var archAssemblies)) {
+			throw new InvalidOperationException ($"No resolved assemblies for architecture '{arch}'.");
 		}
-
-		return (assemblyCount, uniqueAssemblyNames);
+		var frameworkAssemblies = archAssemblies.Values
+			.Where (assembly => bool.TryParse (assembly.GetMetadata ("FrameworkAssembly"), out bool isFramework) && isFramework)
+			.ToList ();
+		using var resolver = MonoAndroidHelper.MakeResolver (Log, arch, archAssemblies, loadDebugSymbols: false);
+		return new PinvokeScanner (Log).Scan (arch, resolver, frameworkAssemblies);
 	}
 
-	/// <summary>
-	/// Retrieves the native code generation state for a specific target architecture.
-	/// Validates that the required state exists and throws an exception if missing.
-	/// </summary>
-	/// <param name="nativeCodeGenStates">
-	/// The collection of native code generation states from previous pipeline stages.
-	/// </param>
-	/// <param name="targetArch">The target architecture to retrieve state for.</param>
-	/// <returns>The native code generation state for the specified architecture.</returns>
-	/// <exception cref="InvalidOperationException">
-	/// Thrown when the state collection is null or doesn't contain state for the target architecture.
-	/// </exception>
-	/// <remarks>
-	/// This method ensures that the required native code generation state is available
-	/// before attempting to generate marshal methods code. The state contains marshal method
-	/// classifications, assembly information, and other data needed for code generation.
-	/// </remarks>
-	NativeCodeGenStateObject EnsureCodeGenState (NativeCodeGenStateCollection? nativeCodeGenStates, AndroidTargetArch targetArch)
-	{
-		if (nativeCodeGenStates is null || !nativeCodeGenStates.States.TryGetValue (targetArch, out NativeCodeGenStateObject? state)) {
-			throw new InvalidOperationException ($"Internal error: missing native code generation state for architecture '{targetArch}'");
-		}
-
-		return state;
-	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs
deleted file mode 100644
index 873c927c969..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Java.Interop.Tools.Cecil;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-// Note: If/When this is converted to an incremental task, every build still needs to set:
-// NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent
-public class GenerateTypeMappings : AndroidTask
-{
-	public override string TaskPrefix => "GTM";
-
-	[Required]
-	public string AndroidRuntime { get; set; } = "";
-
-	public bool Debug { get; set; }
-
-	/// <summary>
-	/// When <c>true</c>, descriptive comments are written into the generated LLVM IR.  They make
-	/// the <c>.ll</c> far easier to read, but have no effect on the object code produced from it.
-	/// Set from the <c>$(_AndroidEmitLlvmIrComments)</c> MSBuild property.
-	/// </summary>
-	public bool EmitLlvmIrComments { get; set; }
-
-	public bool EnableMarshalMethods { get;set; }
-
-	[Output]
-	public ITaskItem [] GeneratedBinaryTypeMaps { get; set; } = [];
-
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	public bool SkipJniAddNativeMethodRegistrationAttributeScan { get; set; }
-
-	[Required]
-	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
-
-	[Required]
-	public string [] SupportedAbis { get; set; } = [];
-
-	public string TypemapImplementation { get; set; } = "llvm-ir";
-
-	[Required]
-	public string TypemapOutputDirectory { get; set; } = "";
-
-	AndroidRuntime androidRuntime;
-	readonly List<ITaskItem> generatedBinaryTypeMaps = new List<ITaskItem> ();
-
-	public override bool RunTask ()
-	{
-		var useMarshalMethods = !Debug && EnableMarshalMethods;
-
-		androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
-		if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.NativeAOT) {
-			// NativeAOT uses the trimmable type map, generated by the `GenerateTrimmableTypeMap` task
-			Log.LogDebugMessage ("Skipping type maps for NativeAOT.");
-			return !Log.HasLoggedErrors;
-		}
-
-		// If using marshal methods, we cannot use the .typemap.xml files currently because
-		// the type token ids were changed by the marshal method rewriter after we wrote the .xml files.
-		if (!useMarshalMethods)
-			GenerateAllTypeMappings ();
-
-		// Generate typemaps from the native code generator state (produced by the marshal method rewriter)
-		if (useMarshalMethods)
-			GenerateAllTypeMappingsFromNativeState (useMarshalMethods);
-
-		GeneratedBinaryTypeMaps = generatedBinaryTypeMaps.ToArray ();
-		return !Log.HasLoggedErrors;
-	}
-
-	void GenerateAllTypeMappings ()
-	{
-		var allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
-
-		foreach (var set in allAssembliesPerArch)
-			GenerateTypeMap (set.Key, set.Value.Values.ToList ());
-	}
-
-	void GenerateTypeMap (AndroidTargetArch arch, List<ITaskItem> assemblies)
-	{
-		Log.LogDebugMessage ($"Generating type maps for architecture '{arch}'");
-
-		var state = TypeMapObjectsFileAdapter.Create (arch, assemblies, Log);
-
-		// An error was already logged to Log.LogError
-		if (state is null)
-			return;
-
-		if (TypemapImplementation != "llvm-ir") {
-			Log.LogDebugMessage ($"TypemapImplementation='{TypemapImplementation}' will write an empty native typemap.");
-			state.XmlFiles.Clear ();
-		}
-
-		var tmg = new TypeMapGenerator (Log, state, androidRuntime) {
-			EmitComments = EmitLlvmIrComments,
-		};
-		tmg.Generate (Debug, SkipJniAddNativeMethodRegistrationAttributeScan, TypemapOutputDirectory);
-
-		// Set for use by <GeneratePackageManagerJava/> task later
-		NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent = state.JniAddNativeMethodRegistrationAttributePresent;
-
-		AddOutputTypeMaps (tmg, state.TargetArch);
-	}
-
-	void GenerateAllTypeMappingsFromNativeState (bool useMarshalMethods)
-	{
-		// Retrieve the stored NativeCodeGenState
-		var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenState)} not found");
-
-		NativeCodeGenState? templateCodeGenState = null;
-
-		foreach (var kvp in nativeCodeGenStates) {
-			NativeCodeGenState state = kvp.Value;
-			templateCodeGenState = state;
-			GenerateTypeMapFromNativeState (state, useMarshalMethods);
-		}
-
-		if (templateCodeGenState is null)
-			throw new InvalidOperationException ($"Internal error: no native code generator state defined");
-
-		// Set for use by <GenerateNativeApplicationConfigSources/> task later
-		if (useMarshalMethods)
-			NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent = templateCodeGenState.JniAddNativeMethodRegistrationAttributePresent;
-	}
-
-	void GenerateTypeMapFromNativeState (NativeCodeGenState state, bool useMarshalMethods)
-	{
-		if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.NativeAOT) {
-			// NativeAOT uses the trimmable type map, generated by the `GenerateTrimmableTypeMap` task
-			Log.LogDebugMessage ("Skipping type maps for NativeAOT.");
-			return;
-		}
-		Log.LogDebugMessage ($"Generating type maps from native state for architecture '{state.TargetArch}'");
-
-		if (TypemapImplementation != "llvm-ir") {
-			Log.LogDebugMessage ($"TypemapImplementation='{TypemapImplementation}' will write an empty native typemap.");
-			state = new NativeCodeGenState (state.TargetArch, new TypeDefinitionCache (), state.Resolver, [], [], state.Classifier);
-		}
-
-		var tmg = new TypeMapGenerator (Log, new NativeCodeGenStateAdapter (state), androidRuntime) {
-			EmitComments = EmitLlvmIrComments,
-		};
-		tmg.Generate (Debug, SkipJniAddNativeMethodRegistrationAttributeScan, TypemapOutputDirectory);
-
-		AddOutputTypeMaps (tmg, state.TargetArch);
-	}
-
-	void AddOutputTypeMaps (TypeMapGenerator tmg, AndroidTargetArch arch)
-	{
-		string abi = MonoAndroidHelper.ArchToAbi (arch);
-
-		foreach (string file in tmg.GeneratedBinaryTypeMaps) {
-			var item = new TaskItem (file);
-			string fileName = Path.GetFileName (file);
-			item.SetMetadata ("DestinationSubPath", $"{abi}/{fileName}");
-			item.SetMetadata ("DestinationSubDirectory", $"{abi}/");
-			item.SetMetadata ("Abi", abi);
-			generatedBinaryTypeMaps.Add (item);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs
deleted file mode 100644
index 0ccfeba1568..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GetMonoPlatformJar.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2011 Xamarin, Inc. All rights reserved.
-#nullable enable
-using System;
-using System.IO;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Android.Build.Tasks;
-
-namespace Xamarin.Android.Tasks
-{
-	public class GetMonoPlatformJar : AndroidTask
-	{
-		public override string TaskPrefix => "GMJ";
-
-		[Required]
-		public string TargetFrameworkDirectory { get; set; } = "";
-
-		[Output]
-		public string? MonoPlatformJarPath { get; set; }
-
-		[Output]
-		public string? MonoPlatformDexPath { get; set; }
-
-		public override bool RunTask ()
-		{
-			var directories = TargetFrameworkDirectory.Split (new char[] { ';', ','} ,StringSplitOptions.RemoveEmptyEntries);
-
-			foreach (var dir in directories)
-				if (File.Exists (Path.Combine (dir, "mono.android.jar"))) {
-					MonoPlatformJarPath = Path.Combine (dir, "mono.android.jar");
-					MonoPlatformDexPath = Path.ChangeExtension (MonoPlatformJarPath, ".dex");
-					Log.LogMessage (MessageImportance.Low, "  MonoPlatformJarPath: {0}", MonoPlatformJarPath);
-					Log.LogMessage (MessageImportance.Low, "  MonoPlatformDexPath: {0}", MonoPlatformDexPath);
-
-					return true;
-				}
-
-			Log.LogCodedError ("XA0002", Properties.Resources.XA0002);
-
-			return false;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs
deleted file mode 100644
index f34be506849..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/PreTrimmingFixLegacyDesigner.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#nullable enable
-
-using System.Collections.Generic;
-using System.IO;
-using Java.Interop.Tools.Cecil;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using MonoDroid.Tuner;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Runs <see cref="FixLegacyResourceDesignerStep"/> on assemblies that are about to be
-/// trimmed by ILLink. This rewrites library assemblies so their resource field accesses
-/// (ldsfld) become calls to the designer assembly's property getters.
-///
-/// Running this *before* ILLink means the trimmer sees the rewritten IL and can freely
-/// trim unused designer types/fields. This avoids the need to root the entire designer
-/// assembly during trimming (which causes an APK size regression).
-///
-/// Modified assemblies are written to <see cref="OutputDirectory"/> rather than in-place,
-/// to avoid mutating files in the shared NuGet cache or shared intermediate output paths.
-/// </summary>
-public class PreTrimmingFixLegacyDesigner : AndroidTask
-{
-	public override string TaskPrefix => "PTD";
-
-	[Required]
-	public ITaskItem [] Assemblies { get; set; } = [];
-
-	[Required]
-	public string TargetName { get; set; } = "";
-
-	[Required]
-	public string OutputDirectory { get; set; } = "";
-
-	public bool Deterministic { get; set; }
-
-	[Output]
-	public ITaskItem []? ModifiedAssemblies { get; set; }
-
-	public override bool RunTask ()
-	{
-		Directory.CreateDirectory (OutputDirectory);
-
-		using var resolver = new DirectoryAssemblyResolver (
-			this.CreateTaskLogger (), loadDebugSymbols: true);
-
-		foreach (var assembly in Assemblies) {
-			var dir = Path.GetFullPath (Path.GetDirectoryName (assembly.ItemSpec) ?? "");
-			if (!resolver.SearchDirectories.Contains (dir)) {
-				resolver.SearchDirectories.Add (dir);
-			}
-		}
-
-		var linkContext = new MSBuildLinkContext (resolver, Log);
-		var fixLegacyStep = new FixLegacyResourceDesignerStep ();
-		fixLegacyStep.Initialize (linkContext);
-
-		var modified = new List<ITaskItem> ();
-
-		foreach (var item in Assemblies) {
-			// Match the filtering in FixLegacyResourceDesignerStep.ProcessAssembly:
-			// skip the main assembly and framework/BCL assemblies.
-			if (Path.GetFileNameWithoutExtension (item.ItemSpec) == TargetName) {
-				continue;
-			}
-			if (MonoAndroidHelper.IsFrameworkAssembly (item)) {
-				continue;
-			}
-
-			var assembly = resolver.GetAssembly (item.ItemSpec);
-			if (fixLegacyStep.ProcessAssemblyDesigner (assembly)) {
-				var outputPath = Path.Combine (OutputDirectory, Path.GetFileName (item.ItemSpec));
-				Log.LogDebugMessage ($"  Writing modified assembly: {outputPath}");
-				assembly.Write (outputPath, new WriterParameters {
-					WriteSymbols = assembly.MainModule.HasSymbols,
-					DeterministicMvid = Deterministic,
-				});
-
-				var outputItem = new TaskItem (outputPath);
-				item.CopyMetadataTo (outputItem);
-				outputItem.SetMetadata ("OriginalPath", item.ItemSpec);
-				modified.Add (outputItem);
-			}
-		}
-
-		ModifiedAssemblies = modified.ToArray ();
-
-		return !Log.HasLoggedErrors;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
index 5dee3987f54..1f77da7a250 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/PrepareAbiItems.cs
@@ -12,7 +12,6 @@ namespace Xamarin.Android.Tasks
 	public class PrepareAbiItems : AndroidTask
 	{
 		const string ArmV7a = "armeabi-v7a";
-		const string TypeMapBase = "typemaps";
 		const string EnvBase = "environment";
 		const string CompressedAssembliesBase = "compressed_assemblies";
 		const string JniRemappingBase = "jni_remap";
@@ -46,9 +45,7 @@ public override bool RunTask ()
 			var includes = new List<ITaskItem> ();
 			string baseName;
 
-			if (MonoAndroidHelper.StringEquals ("typemap", Mode, StringComparison.OrdinalIgnoreCase)) {
-				baseName = TypeMapBase;
-			} else if (MonoAndroidHelper.StringEquals ("environment", Mode, StringComparison.OrdinalIgnoreCase)) {
+			if (MonoAndroidHelper.StringEquals ("environment", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = EnvBase;
 			} else if (MonoAndroidHelper.StringEquals ("compressed", Mode, StringComparison.OrdinalIgnoreCase)) {
 				baseName = CompressedAssembliesBase;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs b/src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs
deleted file mode 100644
index 3f37284588f..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (C) 2011, Xamarin Inc.
-// Copyright (C) 2010, Novell Inc.
-#nullable enable
-using System;
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Microsoft.Android.Build.Tasks;
-using Java.Interop.Tools.Cecil;
-
-namespace Xamarin.Android.Tasks
-{
-	public class RemoveRegisterAttribute : AndroidTask
-	{
-		public override string TaskPrefix => "RRA";
-
-		const string RegisterAttribute = "Android.Runtime.RegisterAttribute";
-
-		[Required]
-		public ITaskItem[] ShrunkFrameworkAssemblies { get; set; } = [];
-
-		public override bool RunTask ()
-		{
-			// Find Mono.Android.dll
-			var mono_android = ShrunkFrameworkAssemblies.First (f => Path.GetFileNameWithoutExtension (f.ItemSpec) == "Mono.Android").ItemSpec;
-			var path = Path.GetFullPath (Path.GetDirectoryName (mono_android));
-			using var resolver = new DirectoryAssemblyResolver (this.CreateTaskLogger (), loadDebugSymbols: false, loadReaderParameters: new ReaderParameters { ReadWrite = true });
-			resolver.SearchDirectories.Add (path);
-			
-			using (var assembly = resolver.Load (mono_android)) {
-				if (assembly is null) {
-					Log.LogCodedError ("XA2024", Properties.Resources.XA2024, mono_android);
-					return false;
-				}
-
-				// Strip out [Register] attributes
-				foreach (TypeDefinition type in assembly.MainModule.Types)
-					ProcessType (type);
-
-				assembly.Write ();
-			}
-			
-			return true;
-		}
-
-		private static void ProcessType (TypeDefinition type)
-		{
-			if (type.HasFields)
-				foreach (FieldDefinition field in type.Fields)
-					ProcessAttributeProvider (field);
-
-			if (type.HasMethods)
-				foreach (MethodDefinition method in type.Methods)
-					ProcessAttributeProvider (method);
-		}
-
-		private static void ProcessAttributeProvider (Mono.Cecil.ICustomAttributeProvider provider)
-		{
-			if (!provider.HasCustomAttributes)
-				return;
-
-			for (int i = 0; i < provider.CustomAttributes.Count; i++) {
-				if (!IsRegisterAttribute (provider.CustomAttributes [i]))
-					continue;
-
-				provider.CustomAttributes.RemoveAt (i--);
-			}
-		}
-
-		private static bool IsRegisterAttribute (CustomAttribute attribute)
-		{
-			return attribute.Constructor.DeclaringType.FullName == RegisterAttribute;
-		}
-	}
-}
-
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs b/src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs
deleted file mode 100644
index bfa22dce788..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// MSBuild task that rewrites .NET assemblies to use marshal methods instead of dynamic JNI registration.
-/// This task modifies method implementations to use efficient native callbacks with [UnmanagedCallersOnly]
-/// attributes, significantly improving startup performance and reducing runtime overhead for Android applications.
-/// </summary>
-/// <remarks>
-/// This task operates on the marshal method classifications produced by earlier pipeline stages and:
-/// 
-/// 1. Retrieves marshal method classifications from the build pipeline state
-/// 2. Rewrites assemblies to replace dynamic registration with static marshal methods
-/// 3. Reports statistics on marshal method generation and any fallback to dynamic registration
-/// 
-/// The rewriting process creates native callback wrappers for methods that have non-blittable
-/// parameters or return types, ensuring compatibility with the [UnmanagedCallersOnly] attribute
-/// while maintaining proper marshaling semantics.
-/// </remarks>
-public class RewriteMarshalMethods : AndroidTask
-{
-	/// <summary>
-	/// Gets the task prefix used for logging and error messages.
-	/// </summary>
-	public override string TaskPrefix => "RMM";
-
-	/// <summary>
-	/// Gets or sets the intermediate output directory path. Required for retrieving
-	/// build state objects that contain marshal method classifications.
-	/// </summary>
-	[Required]
-	public string IntermediateOutputDirectory { get; set; } = "";
-
-	/// <summary>
-	/// Executes the marshal method rewriting task. This is the main entry point that
-	/// coordinates the entire assembly rewriting process across all target architectures.
-	/// </summary>
-	/// <returns>
-	/// true if the task completed successfully; false if errors occurred during processing.
-	/// </returns>
-	/// <remarks>
-	/// The execution flow is:
-	/// 
-	/// 1. Retrieve native code generation state from previous pipeline stages
-	/// 2. For each target architecture:
-	///    - Rewrite assemblies to use marshal methods
-	///    - Add special case methods (e.g., TypeManager methods)
-	/// 3. Report statistics on marshal method generation
-	/// 4. Log warnings for methods that must fall back to dynamic registration
-	/// </remarks>
-	public override bool RunTask ()
-	{
-		// Retrieve the stored NativeCodeGenState from the build pipeline
-		// This contains marshal method classifications from earlier stages
-		var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
-
-		if (nativeCodeGenStates is null)
-			throw new InvalidOperationException ($"Internal error: {nameof (NativeCodeGenState)} not found");
-
-		// Process each target architecture
-		foreach (var kvp in nativeCodeGenStates) {
-			NativeCodeGenState state = kvp.Value;
-
-			if (state.Classifier is null) {
-				Log.LogError ("state.Classifier cannot be null if marshal methods are enabled");
-				return false;
-			}
-
-			RewriteMethods (state);
-			state.Classifier.AddSpecialCaseMethods ();
-
-			// Report statistics on marshal method generation
-			Log.LogDebugMessage ($"[{state.TargetArch}] Number of generated marshal methods: {state.Classifier.MarshalMethods.Count}");
-			if (state.Classifier.DynamicallyRegisteredMarshalMethods.Count > 0) {
-				Log.LogWarning ($"[{state.TargetArch}] Number of methods in the project that will be registered dynamically: {state.Classifier.DynamicallyRegisteredMarshalMethods.Count}");
-			}
-
-			// Count and report methods that need blittable workaround wrappers
-			var wrappedCount = state.Classifier.MarshalMethods.Sum (m => m.Value.Count (m2 => m2.NeedsBlittableWorkaround));
-
-			if (wrappedCount > 0) {
-				// TODO: change to LogWarning once the generator can output code which requires no non-blittable wrappers
-				Log.LogDebugMessage ($"[{state.TargetArch}] Number of methods in the project that need marshal method wrappers: {wrappedCount}");
-			}
-		}
-
-		return !Log.HasLoggedErrors;
-	}
-
-	/// <summary>
-	/// Performs the actual assembly rewriting for a specific target architecture.
-	/// Creates and executes the <see cref="MarshalMethodsAssemblyRewriter"/> that handles
-	/// the low-level assembly modification operations.
-	/// </summary>
-	/// <param name="state">The native code generation state containing marshal method classifications and resolver.</param>
-	/// <remarks>
-	/// This method delegates the complex assembly rewriting logic to the specialized
-	/// <see cref="MarshalMethodsAssemblyRewriter"/> class, which handles:
-	/// - Adding [UnmanagedCallersOnly] attributes to native callbacks
-	/// - Generating wrapper methods for non-blittable types
-	/// - Modifying assembly references and imports
-	/// </remarks>
-	void RewriteMethods (NativeCodeGenState state)
-	{
-		if (state.Classifier == null) {
-			return;
-		}
-
-		var rewriter = new MarshalMethodsAssemblyRewriter (Log, state.TargetArch, state.Classifier, state.Resolver);
-		rewriter.Rewrite ();
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
index 408264e6e77..22ace1122ea 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -100,22 +100,21 @@ public void BasicApplicationPublishReadyToRun ([Values] bool isComposite, [Value
 		}
 
 		[Test]
-		public void AndroidEnableMarshalMethodsWithReadyToRunFailsBuild ()
+		public void AndroidEnableMarshalMethodsFailsBuild ([Values (false, true)] bool publishReadyToRun)
 		{
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = true,
 				EnableMarshalMethods = true,
 			};
 			proj.SetRuntime (AndroidRuntime.CoreCLR);
-			proj.SetProperty ("PublishReadyToRun", "true");
+			proj.SetProperty ("PublishReadyToRun", publishReadyToRun.ToString ());
 
 			using var b = CreateApkBuilder ();
 			b.ThrowOnBuildFailure = false;
 			Assert.IsFalse (b.Build (proj), "Build should have failed.");
 			StringAssertEx.Contains ("error XA1049", b.LastBuildOutput);
 			StringAssertEx.Contains ("AndroidEnableMarshalMethods", b.LastBuildOutput);
-			StringAssertEx.Contains ("PublishReadyToRun", b.LastBuildOutput);
-			StringAssertEx.DoesNotContain ("XARMM7015", b.LastBuildOutput, "Build should fail before rewriting ReadyToRun assemblies.");
+			StringAssertEx.Contains ("no longer supported", b.LastBuildOutput);
 		}
 
 		[Test]
@@ -2163,72 +2162,6 @@ public void Plugin_Maui_Audio ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.N
 				$"The application DEX files should include `{className}`!");
 		}
 
-		[Test]
-		public void MarshalMethodsUnhandledExceptionRuntimeFixUpWorks ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
-		{
-			const bool isRelease = true;
-			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
-				return;
-			}
-
-			switch (runtime) {
-				case AndroidRuntime.NativeAOT:
-					Assert.Ignore ("NativeAOT does not support marshal methods");
-					break;
-
-				case AndroidRuntime.CoreCLR:
-					Assert.Ignore ("CoreCLR currently doesn't work due to a bug in Mono.Cecil");
-					break;
-			}
-
-			var proj = new XamarinAndroidApplicationProject {
-				IsRelease = isRelease,
-				EnableMarshalMethods = true,
-			};
-			proj.SetRuntime (runtime);
-			using var builder = CreateApkBuilder ();
-			Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
-
-			string monoAndroidRuntimePath = Path.Combine (
-				Root,
-				builder.ProjectDirectory,
-				proj.IntermediateOutputPath,
-				"android-arm64",
-				"linked",
-				"Mono.Android.Runtime.dll"
-			);
-			FileAssert.Exists (monoAndroidRuntimePath);
-
-			using var asm = AssemblyDefinition.ReadAssembly (monoAndroidRuntimePath);
-			const string TypeName = "Android.Runtime.AndroidEnvironmentInternal";
-			TypeDefinition? type = null;
-
-			foreach (ModuleDefinition module in asm.Modules) {
-				foreach (TypeDefinition t in module.Types) {
-					if (t.FullName.Equals (TypeName, StringComparison.Ordinal)) {
-						type = t;
-						break;
-					}
-				}
-			}
-
-			Assert.NotNull (type, $"Failed to find the '{TypeName}' type in '{monoAndroidRuntimePath}'");
-			Assert.IsTrue (type.IsPublic, $"Type '{TypeName}' should be public");
-
-			// Additionally verify that the UnhandledException method is also public
-			const string MethodName = "UnhandledException";
-			MethodDefinition? method = null;
-			foreach (MethodDefinition m in type.Methods) {
-				if (m.Name.Equals (MethodName, StringComparison.Ordinal)) {
-					method = m;
-					break;
-				}
-			}
-
-			Assert.NotNull (method, $"Failed to find the '{MethodName}' method in type '{TypeName}'");
-			Assert.IsTrue (method.IsPublic, $"Method '{MethodName}' should be public");
-		}
-
 		[Test]
 		public void InvalidCustomJniInitFunctionName ()
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
index 0c74132f661..b31b46caa93 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
@@ -430,7 +430,6 @@ public void BuildSolutionWithMultipleProjectsInParallel ([Values (AndroidRuntime
 					ProjectName = $"App{i}",
 					PackageName = $"com.companyname.App{i}",
 					IsRelease = isRelease,
-					EnableMarshalMethods = true,
 				};
 
 				app1.SetRuntime (runtime);
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
index bddf27ebaba..e944b065e2a 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
@@ -1684,7 +1684,7 @@ public void TargetSdkVersion_361In_36Out ()
 				GetApiLevelFromIdFunc = id => id == "36" || id == "36.1" ? 36 : 99,
 			};
 
-			// GenerateMainAndroidManifest strips "36.1" → "36" before setting TargetSdkVersion
+			// Manifest generation strips "36.1" to "36" before setting TargetSdkVersion.
 			string targetSdkVersion = "36.1";
 			if (MonoAndroidHelper.TryParseApiLevel (targetSdkVersion, out var version)) {
 				targetSdkVersion = version.Major.ToString ();
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs
deleted file mode 100644
index 57e0e3fbdf6..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-#nullable enable
-using System;
-using System.IO;
-using System.Text;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using NUnit.Framework;
-using Xamarin.Android.Tasks;
-using Xamarin.ProjectTools;
-
-namespace Xamarin.Android.Build.Tests;
-
-public class MarshalMethodTests : BaseTest
-{
-
-	void AssertMarshalMethodData (MarshalMethodEntry entry, string? callbackField, string? connector, string? declaringType,
-		string? implementedMethod, string? jniMethodName, string? jniMethodSignature, string? jniTypeName,
-		string? nativeCallback, string? registeredMethod)
-	{
-		Assert.AreEqual (callbackField, entry.CallbackField?.ToString (), "Callback field should be the same.");
-		Assert.AreEqual (connector, entry.Connector?.ToString (), "Connector should be the same.");
-		Assert.AreEqual (declaringType, entry.DeclaringType.ToString (), "Declaring type should be the same.");
-		Assert.AreEqual (implementedMethod, entry.ImplementedMethod?.ToString (), "Implemented method should be the same.");
-		Assert.AreEqual (jniMethodName, entry.JniMethodName, "JNI method name should be the same.");
-		Assert.AreEqual (jniMethodSignature, entry.JniMethodSignature, "JNI method signature should be the same.");
-		Assert.AreEqual (jniTypeName, entry.JniTypeName, "JNI type name should be the same.");
-		Assert.AreEqual (nativeCallback, entry.NativeCallback.ToString (), "Native callback should be the same.");
-		Assert.AreEqual (registeredMethod, entry.RegisteredMethod?.ToString (), "Registered method should be the same.");
-	}
-
-	void AssertRewrittenMethodData (ConvertedMarshalMethodEntry converted, MarshalMethodEntry entry)
-	{
-		// Things that are different between the two:
-		Assert.IsNull (converted.CallbackField, "Callback field will be null.");
-		Assert.IsNull (converted.Connector, "Connector will be null.");
-
-		var nativeCallback = converted.NativeCallback?.ToString () ?? "";
-		var paren = nativeCallback.IndexOf ('(');
-		var convertedNativeCallback = nativeCallback.Substring (0, paren) + "_mm_wrapper" + nativeCallback.Substring (paren);
-		Assert.AreEqual (convertedNativeCallback, converted.ConvertedNativeCallback?.ToString (), "ConvertedNativeCallback should be the same.");
-
-		// Things that should be the same between the two:
-		Assert.AreEqual (entry.DeclaringType.ToString (), converted.DeclaringType.ToString (), "Declaring type should be the same.");
-		Assert.AreEqual (entry.ImplementedMethod?.ToString (), converted.ImplementedMethod?.ToString (), "Implemented method should be the same.");
-		Assert.AreEqual (entry.JniMethodName, converted.JniMethodName, "JNI method name should be the same.");
-		Assert.AreEqual (entry.JniMethodSignature, converted.JniMethodSignature, "JNI method signature should be the same.");
-		Assert.AreEqual (entry.JniTypeName, converted.JniTypeName, "JNI type name should be the same.");
-		Assert.AreEqual (entry.NativeCallback.ToString (), converted.NativeCallback?.ToString (), "Native callback should be the same.");
-		Assert.AreEqual (entry.RegisteredMethod?.ToString (), converted.RegisteredMethod?.ToString (), "Registered method should be the same.");
-	}
-
-	static ITaskItem CreateItem (string itemSpec, string abi)
-	{
-		var item = new TaskItem (itemSpec);
-		item.SetMetadata ("Abi", abi);
-		return item;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
index e9cc4e1d98a..22c0fc57419 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -48,7 +48,6 @@ public void LinkAssembliesNoShrinkLegacyCompatibilityFixups (bool enabled)
 				$"{nameof (AddKeepAlivesStep)} presence should match the compatibility fixup setting.");
 			Assert.IsTrue (pipeline.Steps.Any (step => step is FindJavaObjectsStep), $"{nameof (FindJavaObjectsStep)} should always run.");
 			Assert.IsTrue (pipeline.Steps.Any (step => step is SaveChangedAssemblyStep), $"{nameof (SaveChangedAssemblyStep)} should always run.");
-			Assert.IsTrue (pipeline.Steps.Any (step => step is FindTypeMapObjectsStep), $"{nameof (FindTypeMapObjectsStep)} should always run.");
 		}
 
 		sealed class TestableLinkAssembliesNoShrink : LinkAssembliesNoShrink
@@ -1005,26 +1004,10 @@ protected override void OnNewIntent (Android.Content.Intent? intent)
 			}
 		}
 
-		// TODO: fix for (true, AndroidRuntime.CoreCLR)
 		[Test]
 		public void DoNotErrorOnPerArchJavaTypeDuplicates (
-			[Values(true, false)] bool enableMarshalMethods,
 			[Values (AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
 		{
-			if (enableMarshalMethods == true && runtime == AndroidRuntime.CoreCLR) {
-				// This currently fails with the following exception:
-				//
-				// Xamarin.Android.Common.targets(1603,3): error XARMM7015: System.NotSupportedException: Writing mixed-mode assemblies is not supported
-				//  at Mono.Cecil.ModuleWriter.Write(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleWriter.WriteModule(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Mono.Cecil.AssemblyDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Xamarin.Android.Tasks.MarshalMethodsAssemblyRewriter.Rewrite(Boolean brokenExceptionTransitions) in src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs:line 165
-				//  at Xamarin.Android.Tasks.RewriteMarshalMethods.RewriteMethods(NativeCodeGenState state, Boolean brokenExceptionTransitionsEnabled) in src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs:line 160
-				Assert.Ignore ("Fails with Mono.Cecil exception on CoreCLR");
-				return;
-			}
-
 			var path = Path.Combine (Root, "temp", TestName);
 			var lib = new XamarinAndroidLibraryProject { IsRelease = true, ProjectName = "Lib1" };
 			lib.SetRuntime (runtime);
@@ -1058,7 +1041,6 @@ public abstract class MyRunner {
 				"base.OnCreate (bundle);",
 				"base.OnCreate (bundle);\n" +
 				"if (Lib1.Library1.Is64 ()) Console.WriteLine (\"Hello World!\");");
-			proj.EnableMarshalMethods = enableMarshalMethods;
 
 
 			using var lb = CreateDllBuilder (Path.Combine (path, "Lib1"));
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
index effa0229108..d9631f035c9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LlvmIrGeneratorTests.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using Microsoft.Build.Utilities;
-using Mono.Cecil;
 using NUnit.Framework;
 using Xamarin.Android.Tasks;
 using Xamarin.Android.Tasks.LLVMIR;
@@ -83,25 +83,24 @@ public void GeneratedIR_FunctionWithWhitespaceParameterName_ProducesValidOutput
 		}
 
 		[Test]
-		public void TypeMapAssemblyFullNameUsesRuntimeEscaping ()
+		public void EmptyMarshalMethodsSourceRetainsNativeHostEntryPoint ()
 		{
-			var assemblyName = new AssemblyNameDefinition ("Comma,Name", new Version (1, 2, 3, 4));
-
-			Assert.That (
-				TypeMapCecilAdapter.GetRuntimeAssemblyFullName (assemblyName),
-				Is.EqualTo (@"Comma\,Name, Version=1.2.3.4, Culture=neutral, PublicKeyToken=null")
-			);
-		}
+			var log = new TaskLoggingHelper (new MockBuildEngine (TestContext.Out, [], [], []), "test");
+			var generator = new MarshalMethodsNativeAssemblyGenerator (log);
+			var module = generator.Construct ();
 
-		[Test]
-		public void TypeMapAssemblyFullNameMatchesStrongNamedRuntimeAssembly ()
-		{
-			string assemblyPath = typeof (TypeMapCecilAdapter).Assembly.Location;
-			using var assembly = AssemblyDefinition.ReadAssembly (assemblyPath);
-			string? runtimeFullName = System.Reflection.AssemblyName.GetAssemblyName (assemblyPath).FullName;
+			using var stream = new MemoryStream ();
+			using (var writer = new StreamWriter (stream, new UTF8Encoding (false), 1024, leaveOpen: true)) {
+				generator.Generate (module, AndroidTargetArch.Arm64, writer, "marshal_methods.arm64-v8a.ll");
+			}
 
-			Assert.That (runtimeFullName, Does.Not.EndWith ("PublicKeyToken=null"));
-			Assert.That (TypeMapCecilAdapter.GetRuntimeAssemblyFullName (assembly.Name), Is.EqualTo (runtimeFullName));
+			stream.Position = 0;
+			using var reader = new StreamReader (stream);
+			string output = reader.ReadToEnd ();
+			Assert.That (output, Does.Contain ("@xamarin_app_init"));
+			Assert.That (output, Does.Contain ("@get_function_pointer"));
+			Assert.That (output, Does.Not.Contain ("@Java_"));
 		}
+
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs
index eba39ee60ed..2db6d2fd6eb 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyPipeline.cs
@@ -54,7 +54,6 @@ public class StepContext
 {
 	public JavaPeerStyle CodeGenerationTarget { get; set; }
 	public ITaskItem Destination { get; }
-	public bool EnableMarshalMethods { get; set; }
 	public bool IsAndroidAssembly { get; set; }
 	public bool IsAssemblyModified { get; set; }
 	public bool IsDebug { get; set; }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs
deleted file mode 100644
index 9e37c0feade..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.Diagnostics;
-using Java.Interop.Tools.JavaCallableWrappers.Adapters;
-using Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-using System.Collections.Concurrent;
-
-namespace Xamarin.Android.Tasks;
-
-class JCWGeneratorContext
-{
-	public AndroidTargetArch Arch                    { get; }
-	public TypeDefinitionCache TypeDefinitionCache   { get; }
-	public XAAssemblyResolver Resolver               { get; }
-	public IList<TypeDefinition> JavaTypes           { get; }
-	public ICollection<ITaskItem> ResolvedAssemblies { get; }
-
-	public JCWGeneratorContext (AndroidTargetArch arch, XAAssemblyResolver res, ICollection<ITaskItem> resolvedAssemblies, List<TypeDefinition> javaTypesForJCW, TypeDefinitionCache tdCache)
-	{
-		Arch = arch;
-		Resolver = res;
-		ResolvedAssemblies = resolvedAssemblies;
-		JavaTypes = javaTypesForJCW.AsReadOnly ();
-		TypeDefinitionCache = tdCache;
-	}
-}
-
-class JCWGenerator
-{
-	readonly TaskLoggingHelper log;
-	readonly JCWGeneratorContext context;
-
-	public JavaPeerStyle CodeGenerationTarget { get; set; } = JavaPeerStyle.XAJavaInterop1;
-
-	public JCWGenerator (TaskLoggingHelper log, JCWGeneratorContext context)
-	{
-		this.log = log;
-		this.context = context;
-	}
-
-	public List<string> GeneratedJavaFiles { get; } = [];
-
-	public bool Generate (string outputPath, string applicationJavaClass)
-	{
-		return ProcessTypes (
-			generateCode: true,
-			outputPath,
-			applicationJavaClass
-		);
-	}
-
-	bool ProcessTypes (bool generateCode, string? outputPath, string? applicationJavaClass)
-	{
-		if (generateCode && outputPath.IsNullOrEmpty ()) {
-			throw new ArgumentException ("must not be null or empty", nameof (outputPath));
-		}
-
-		string monoInit = "mono.MonoPackageManager.LoadApplication (context);";
-		bool hasExportReference = context.ResolvedAssemblies.Any (assembly => Path.GetFileName (assembly.ItemSpec) == "Mono.Android.Export.dll");
-		bool ok = true;
-
-		foreach (TypeDefinition type in context.JavaTypes) {
-			if (type.IsInterface) {
-				// Interfaces are in typemap but they shouldn't have JCW generated for them
-				continue;
-			}
-
-			CallableWrapperType generator = CreateGenerator (type, monoInit, hasExportReference, applicationJavaClass);
-			if (!generateCode) {
-				continue;
-			}
-
-			if (!GenerateCode (generator, type, outputPath!, hasExportReference)) {  // NRT - Guarded above by IsNullOrEmpty and generateCode checks
-				ok = false;
-			}
-		}
-
-		return ok;
-	}
-
-	public bool GenerateCode (CallableWrapperType generator, TypeDefinition type, string outputPath, bool hasExportReference)
-	{
-		bool ok = true;
-		using var writer = MemoryStreamPool.Shared.CreateStreamWriter ();
-		var writer_options = new CallableWrapperWriterOptions {
-			CodeGenerationTarget    = CodeGenerationTarget
-		};
-
-		try {
-			generator.Generate (writer, writer_options);
-			writer.Flush ();
-
-			string path = generator.GetDestinationPath (outputPath);
-			var changed = Files.CopyIfStreamChanged (writer.BaseStream, path);
-
-			if (changed) {
-				log.LogCodedError ("XA4253", Properties.Resources.XA4253, path);
-			} else {
-				log.LogMessage ($"Java callable wrapper code already up to date: '{path}'");
-			}
-			GeneratedJavaFiles.Add (path);
-			if (generator.HasExport && !hasExportReference) {
-				Diagnostic.Error (4210, Properties.Resources.XA4210);
-			}
-		} catch (XamarinAndroidException xae) {
-			ok = false;
-			log.LogError (
-				subcategory: "",
-				errorCode: "XA" + xae.Code,
-				helpKeyword: string.Empty,
-				file: xae.SourceFile,
-				lineNumber: xae.SourceLine,
-				columnNumber: 0,
-				endLineNumber: 0,
-				endColumnNumber: 0,
-				message: xae.MessageWithoutCode,
-				messageArgs: []
-			);
-		} catch (DirectoryNotFoundException ex) {
-			ok = false;
-			if (OS.IsWindows) {
-				Diagnostic.Error (5301, Properties.Resources.XA5301, type.FullName, ex);
-			} else {
-				Diagnostic.Error (4209, Properties.Resources.XA4209, type.FullName, ex);
-			}
-		} catch (Exception ex) {
-			ok = false;
-			Diagnostic.Error (4209, Properties.Resources.XA4209, type.FullName, ex);
-		}
-
-		return ok;
-	}
-
-	CallableWrapperType CreateGenerator (TypeDefinition type, string monoInit, bool hasExportReference, string? applicationJavaClass)
-	{
-		var reader_options = new CallableWrapperReaderOptions {
-			DefaultApplicationJavaClass         = applicationJavaClass,
-			DefaultGenerateOnCreateOverrides    = false, // this was used only when targetting Android API <= 10, which is no longer supported
-			DefaultMonoRuntimeInitialization    = monoInit,
-		};
-
-		return CecilImporter.CreateType (type, context.TypeDefinitionCache, reader_options);
-	}
-
-	public static void EnsureAllArchitecturesAreIdentical (TaskLoggingHelper logger, ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState> javaStubStates)
-	{
-		if (javaStubStates.Count <= 1) {
-			return;
-		}
-
-		// An expensive process, but we must be sure that all the architectures have the same data
-		NativeCodeGenState? templateState = null;
-		foreach (var kvp in javaStubStates) {
-			NativeCodeGenState state = kvp.Value;
-
-			if (templateState == null) {
-				templateState = state;
-				continue;
-			}
-
-			EnsureIdenticalCollections (logger, templateState, state);
-			EnsureClassifiersMatch (logger, templateState, state);
-		}
-	}
-
-	static void EnsureIdenticalCollections (TaskLoggingHelper logger, NativeCodeGenState templateState, NativeCodeGenState state)
-	{
-		logger.LogDebugMessage ($"Ensuring Java type collection in architecture '{state.TargetArch}' matches the one in architecture '{templateState.TargetArch}'");
-
-		var templateSet = new HashSet<string> (templateState.AllJavaTypes.Select (t => t.FullName), StringComparer.Ordinal);
-		var typesSet = new HashSet<string> (state.AllJavaTypes.Select (t => t.FullName), StringComparer.Ordinal);
-
-		if (typesSet.Count != templateSet.Count) {
-			throw new InvalidOperationException ($"Internal error: architecture '{state.TargetArch}' has a different number of types ({typesSet.Count}) than the template architecture '{templateState.TargetArch}' ({templateSet.Count})");
-		}
-
-		if (!typesSet.SetEquals (templateSet)) {
-			typesSet.ExceptWith (templateSet);
-			var typesList = string.Join (", ", typesSet.OrderBy (t => t, StringComparer.Ordinal));
-			logger.LogCodedError ("XA4217", Properties.Resources.XA4217, state.TargetArch, templateState.TargetArch, typesList);
-		}
-	}
-
-	static bool CheckWhetherTypesMatch (TypeDefinition templateType, TypeDefinition type)
-	{
-		// TODO: should we compare individual methods, fields, properties?
-		return MonoAndroidHelper.StringEquals (templateType.FullName, type.FullName);
-	}
-
-	static void EnsureClassifiersMatch (TaskLoggingHelper logger, NativeCodeGenState templateState, NativeCodeGenState state)
-	{
-		logger.LogDebugMessage ($"Ensuring marshal method classifier in architecture '{state.TargetArch}' matches the one in architecture '{templateState.TargetArch}'");
-
-		MarshalMethodsCollection? templateClassifier = templateState.Classifier;
-		MarshalMethodsCollection? classifier = state.Classifier;
-
-		if (templateClassifier == null) {
-			if (classifier != null) {
-				throw new InvalidOperationException ($"Internal error: architecture '{templateState.TargetArch}' DOES NOT have a marshal methods classifier, unlike architecture '{state.TargetArch}'");
-			}
-			return;
-		}
-
-		if (classifier == null) {
-			throw new InvalidOperationException ($"Internal error: architecture '{templateState.TargetArch}' DOES have a marshal methods classifier, unlike architecture '{state.TargetArch}'");
-		}
-
-		if (templateClassifier.MarshalMethods.Count != classifier.MarshalMethods.Count) {
-			throw new InvalidOperationException (
-				$"Internal error: classifier for template architecture '{templateState.TargetArch}' contains {templateClassifier.MarshalMethods.Count} marshal methods, but the one for architecture '{state.TargetArch}' has {classifier.MarshalMethods.Count}"
-			);
-		}
-
-		var matchedTemplateMethods = new HashSet<MethodDefinition> ();
-		var mismatchedMethods = new List<MethodDefinition> ();
-		bool foundMismatches = false;
-
-		foreach (var kvp in classifier.MarshalMethods) {
-			string key = kvp.Key;
-			IList<MarshalMethodEntry> methods = kvp.Value;
-
-			logger.LogDebugMessage ($"Comparing marshal method '{key}' in architecture '{templateState.TargetArch}', with {methods.Count} overloads, against architecture '{state.TargetArch}'");
-
-			if (!templateClassifier.MarshalMethods.TryGetValue (key, out IList<MarshalMethodEntry> templateMethods)) {
-				logger.LogDebugMessage ($"Architecture '{state.TargetArch}' has marshal method '{key}' which does not exist in architecture '{templateState.TargetArch}'");
-				foundMismatches = true;
-				continue;
-			}
-
-			if (methods.Count != templateMethods.Count) {
-				logger.LogDebugMessage ($"Architecture '{state.TargetArch}' has an incorrect number of marshal method '{key}' overloads. Expected {templateMethods.Count}, but found {methods.Count}");
-				continue;
-			}
-
-			foreach (MarshalMethodEntry templateMethod in templateMethods) {
-				MarshalMethodEntry? match = null;
-
-				foreach (MarshalMethodEntry method in methods) {
-					if (CheckWhetherMethodsMatch (logger, templateMethod, templateState.TargetArch, method, state.TargetArch)) {
-						match = method;
-						break;
-					}
-				}
-
-				if (match == null) {
-					foundMismatches = true;
-				}
-			}
-		}
-
-		if (!foundMismatches) {
-			return;
-		}
-
-		logger.LogCodedError ("XA4227", Properties.Resources.XA4227, state.TargetArch, templateState.TargetArch);
-	}
-
-	static bool CheckWhetherMethodsMatch (TaskLoggingHelper logger, MarshalMethodEntry templateMethod, AndroidTargetArch templateArch, MarshalMethodEntry method, AndroidTargetArch arch)
-	{
-		bool success = true;
-		string methodName = templateMethod.NativeCallback.FullName;
-
-		if (!CheckWhetherTypesMatch (templateMethod.DeclaringType, method.DeclaringType)) {
-			logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' should be declared in type '{templateMethod.DeclaringType.FullName}', but instead was declared in '{method.DeclaringType.FullName}'");
-			success = false;
-		}
-
-		bool skipJniCheck = false;
-		if (!CheckWhetherMembersMatch (logger, methodName, "native callback", templateMethod.NativeCallback, templateArch, method.NativeCallback, arch)) {
-			success = false;
-
-			// This takes care of overloads for the same methods, and avoids false negatives below
-			skipJniCheck = true;
-		}
-
-		if (!skipJniCheck) {
-			if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodName, method.JniMethodName)) {
-				logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI method name than architecture '{templateArch}':");
-				logger.LogDebugMessage ($"  Expected: '{templateMethod.JniMethodName}', found: '{method.JniMethodName}'");
-				success = false;
-			}
-
-			if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodSignature, method.JniMethodSignature)) {
-				logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI method signature than architecture '{templateArch}':");
-				logger.LogDebugMessage ($"  Expected: '{templateMethod.JniMethodSignature}', found: '{method.JniMethodSignature}'");
-				success = false;
-			}
-
-			if (!MonoAndroidHelper.StringEquals (templateMethod.JniTypeName, method.JniTypeName)) {
-				logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI type name than architecture '{templateArch}':");
-				logger.LogDebugMessage ($"  Expected: '{templateMethod.JniTypeName}', found: '{method.JniTypeName}'");
-				success = false;
-			}
-		}
-
-		if (templateMethod.IsSpecial) {
-			// Other method definitions will be `null`, so we can skip them
-			if (method.IsSpecial) {
-				return success;
-			}
-
-			logger.LogDebugMessage ($"Marshal method '{templateMethod.NativeCallback.FullName}' is marked as special in architecture '{templateArch}', but not in architecture '{arch}'");
-			return false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "connector", templateMethod.Connector, templateArch, method.Connector, arch)) {
-			success = false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "implemented", templateMethod.ImplementedMethod, templateArch, method.ImplementedMethod, arch)) {
-			success = false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "registered", templateMethod.RegisteredMethod, templateArch, method.RegisteredMethod, arch)) {
-			success = false;
-		}
-
-		if (!CheckWhetherMembersMatch (logger, methodName, "callback backing field", templateMethod.CallbackField, templateArch, method.CallbackField, arch)) {
-			success = false;
-		}
-
-		return success;
-	}
-
-	static bool CheckWhetherMembersMatch (TaskLoggingHelper logger, string marshalMethodName, string description, MemberReference? templateMethod, AndroidTargetArch templateArch, MemberReference? method, AndroidTargetArch arch)
-	{
-		if (templateMethod == null) {
-			if (method == null) {
-				return true;
-			}
-
-			logger.LogDebugMessage ($"Marshal method '{marshalMethodName}' component '{description}' is null in architecture '{templateArch}', but not null in architecture '{arch}'");
-			return false;
-		}
-
-		return MonoAndroidHelper.StringEquals (templateMethod.FullName, method?.FullName);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
index 9c01946c5aa..f68d40bc37d 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
@@ -133,7 +133,7 @@ public ManifestDocument (string templateFilename) : base ()
 		}
 
 		// TargetSdkVersion and MinSdkVersion are already resolved to integer API level
-		// strings (e.g. "36") by GenerateMainAndroidManifest. Don't round-trip through
+		// strings (e.g. "36") by the manifest generator. Don't round-trip through
 		// GetIdFromApiLevel() because when multiple API versions share the same ApiLevel
 		// (e.g. 36.0 and 36.1 both have ApiLevel=36), it can return the wrong Id
 		// (e.g. "36.1" instead of "36").
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs
deleted file mode 100644
index 3f92fec0c0e..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodCecilAdapter.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.TypeNameMappings;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-class MarshalMethodCecilAdapter
-{
-	public static NativeCodeGenStateCollection? GetNativeCodeGenStateCollection (TaskLoggingHelper log, ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>? nativeCodeGenStates)
-	{
-		if (nativeCodeGenStates is null) {
-			log.LogDebugMessage ($"No {nameof (NativeCodeGenState)} found");
-			return null;
-		}
-
-		var collection = new NativeCodeGenStateCollection ();
-
-		// Convert each architecture
-		foreach (var kvp in nativeCodeGenStates) {
-			var arch = kvp.Key;
-			var state = kvp.Value;
-			var obj = CreateNativeCodeGenState (arch, state);
-			obj.PinvokeInfos = state.PinvokeInfos;
-			obj.TargetArch = state.TargetArch;
-			collection.States.Add (arch, obj);
-		}
-
-		return collection;
-	}
-
-	static NativeCodeGenStateObject CreateNativeCodeGenState (AndroidTargetArch arch, NativeCodeGenState state)
-	{
-		var obj = new NativeCodeGenStateObject ();
-
-		foreach (var type in state.JavaTypesForJCW) {
-			if (JavaNativeTypeManager.IsApplication (type, state.TypeCache) || JavaNativeTypeManager.IsInstrumentation (type, state.TypeCache)) {
-				if (state.Classifier != null && !state.Classifier.TypeHasDynamicallyRegisteredMethods (type)) {
-					continue;
-				}
-
-				var jniName = JavaNativeTypeManager.ToJniName (type, state.TypeCache).Replace ('/', '.');
-				var assemblyQualifiedName = type.GetAssemblyQualifiedName (state.TypeCache);
-
-				obj.ApplicationsAndInstrumentationsToRegister.Add ((jniName, assemblyQualifiedName));
-			}
-		}
-
-		if (state.Classifier is null)
-			return obj;
-
-		foreach (var group in state.Classifier.MarshalMethods) {
-			var methods = new List<MarshalMethodEntryObject> (group.Value.Count);
-
-			foreach (var method in group.Value) {
-				var entry = CreateEntry (method);
-				methods.Add (entry);
-			}
-
-			obj.MarshalMethods.Add (group.Key, methods);
-		}
-		return obj;
-	}
-
-	static MarshalMethodEntryObject CreateEntry (MarshalMethodEntry entry)
-	{
-		var obj = new MarshalMethodEntryObject (
-			declaringType: CreateDeclaringType (entry.DeclaringType),
-			implementedMethod: CreateMethod (entry.ImplementedMethod),
-			isSpecial: entry.IsSpecial,
-			jniTypeName: entry.JniTypeName,
-			jniMethodName: entry.JniMethodName,
-			jniMethodSignature: entry.JniMethodSignature,
-			nativeCallback: CreateMethod (entry.NativeCallback),
-			registeredMethod: CreateMethodBase (entry.RegisteredMethod)
-		);
-
-		return obj;
-	}
-
-	static MarshalMethodEntryTypeObject CreateDeclaringType (TypeDefinition type)
-	{
-		var cecilModule = type.Module;
-		var cecilAssembly = cecilModule.Assembly;
-
-		var assembly = new MarshalMethodEntryAssemblyObject (
-			fullName: cecilAssembly.FullName,
-			nameFullName: cecilAssembly.Name.FullName,
-			mainModuleFileName: cecilAssembly.MainModule.FileName,
-			nameName: cecilAssembly.Name.Name
-		);
-
-		var module = new MarshalMethodEntryModuleObject (
-			assembly: assembly
-		);
-
-		return new MarshalMethodEntryTypeObject (
-			fullName: type.FullName,
-			metadataToken: type.MetadataToken.ToUInt32 (),
-			module: module);
-	}
-
-	[return:NotNullIfNotNull (nameof (method))]
-	static MarshalMethodEntryMethodObject? CreateMethod (MethodDefinition? method)
-	{
-		if (method is null)
-			return null;
-
-		var parameters = new List<MarshalMethodEntryMethodParameterObject> (method.Parameters.Count);
-
-		foreach (var parameter in method.Parameters) {
-			parameters.Add (new MarshalMethodEntryMethodParameterObject (
-				name: parameter.Name,
-				parameterTypeName: parameter.ParameterType.Name
-			));
-		}
-
-		return new MarshalMethodEntryMethodObject (
-			name: method.Name,
-			fullName: method.FullName,
-			declaringType: CreateDeclaringType (method.DeclaringType),
-			metadataToken: method.MetadataToken.ToUInt32 (),
-			parameters: parameters
-		);
-	}
-
-	static MarshalMethodEntryMethodBaseObject? CreateMethodBase (MethodDefinition? method)
-	{
-		if (method is null)
-			return null;
-		return new MarshalMethodEntryMethodBaseObject (
-			fullName: method.FullName
-		);
-	}
-}
-
-class NativeCodeGenStateCollection
-{
-	public Dictionary<AndroidTargetArch, NativeCodeGenStateObject> States { get; } = [];
-}
-
-class NativeCodeGenStateObject
-{
-	public Dictionary<string, IList<MarshalMethodEntryObject>> MarshalMethods { get; } = [];
-	public List<PinvokeScanner.PinvokeEntryInfo>? PinvokeInfos                { get; set; }
-	public AndroidTargetArch TargetArch                                       { get; set; } = AndroidTargetArch.None;
-	public List<(string JniName, string AssemblyQualifiedName)> ApplicationsAndInstrumentationsToRegister { get; } = [];
-}
-
-class MarshalMethodEntryObject
-{
-	public MarshalMethodEntryTypeObject DeclaringType { get; }
-	public MarshalMethodEntryMethodObject? ImplementedMethod { get; }
-	public bool IsSpecial { get; }
-	public string JniTypeName { get; }
-	public string JniMethodName { get; }
-	public string JniMethodSignature { get; }
-	public MarshalMethodEntryMethodObject NativeCallback { get; }
-	public MarshalMethodEntryMethodBaseObject? RegisteredMethod { get; }
-
-	public MarshalMethodEntryObject (MarshalMethodEntryTypeObject declaringType, MarshalMethodEntryMethodObject? implementedMethod, bool isSpecial, string jniTypeName, string jniMethodName, string jniMethodSignature, MarshalMethodEntryMethodObject nativeCallback, MarshalMethodEntryMethodBaseObject? registeredMethod)
-	{
-		DeclaringType = declaringType;
-		ImplementedMethod = implementedMethod;
-		IsSpecial = isSpecial;
-		JniTypeName = jniTypeName;
-		JniMethodName = jniMethodName;
-		JniMethodSignature = jniMethodSignature;
-		NativeCallback = nativeCallback;
-		RegisteredMethod = registeredMethod;
-	}
-}
-
-class MarshalMethodEntryAssemblyObject
-{
-	public string FullName { get; }
-	public string NameFullName { get; }  // Cecil's Assembly.Name.FullName
-	public string MainModuleFileName { get; }  // Cecil's Assembly.MainModule.FileName
-	public string NameName { get; } // Cecil's Module.Name.Name
-
-	public MarshalMethodEntryAssemblyObject (string fullName, string nameFullName, string mainModuleFileName, string nameName)
-	{
-		FullName = fullName;
-		NameFullName = nameFullName;
-		MainModuleFileName = mainModuleFileName;
-		NameName = nameName;
-	}
-}
-
-class MarshalMethodEntryModuleObject
-{
-	public MarshalMethodEntryAssemblyObject Assembly { get; }
-
-	public MarshalMethodEntryModuleObject (MarshalMethodEntryAssemblyObject assembly)
-	{
-		Assembly = assembly;
-	}
-}
-
-class MarshalMethodEntryTypeObject
-{
-	public string FullName { get; }
-	public uint MetadataToken { get; }
-	public MarshalMethodEntryModuleObject Module { get; }
-
-	public MarshalMethodEntryTypeObject (string fullName, uint metadataToken, MarshalMethodEntryModuleObject module)
-	{
-		FullName = fullName;
-		MetadataToken = metadataToken;
-		Module = module;
-	}
-}
-
-class MarshalMethodEntryMethodBaseObject
-{
-	public string FullName { get; }
-
-	public MarshalMethodEntryMethodBaseObject (string fullName)
-	{
-		FullName = fullName;
-	}
-}
-
-class MarshalMethodEntryMethodObject : MarshalMethodEntryMethodBaseObject
-{
-	public string Name { get; }
-	public MarshalMethodEntryTypeObject DeclaringType { get; }
-	public uint MetadataToken { get; }
-	public List<MarshalMethodEntryMethodParameterObject> Parameters { get; }
-
-	public bool HasParameters => Parameters.Count > 0;
-
-	public MarshalMethodEntryMethodObject (string name, string fullName, MarshalMethodEntryTypeObject declaringType, uint metadataToken, List<MarshalMethodEntryMethodParameterObject> parameters)
-		: base (fullName)
-	{
-		Name = name;
-		DeclaringType = declaringType;
-		MetadataToken = metadataToken;
-		Parameters = parameters;
-	}
-}
-
-class MarshalMethodEntryMethodParameterObject
-{
-	public string Name { get; }
-	public string ParameterTypeName { get; }  // Cecil's ParameterDefinition.ParameterType.Name
-
-	public MarshalMethodEntryMethodParameterObject (string name, string parameterTypeName)
-	{
-		Name = name;
-		ParameterTypeName = parameterTypeName;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs
deleted file mode 100644
index 2d7b2528188..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs
+++ /dev/null
@@ -1,562 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using Java.Interop.Tools.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	class MarshalMethodsAssemblyRewriter
-	{
-		sealed class AssemblyImports
-		{
-			public TypeReference? SystemException;
-			public MethodReference? UnhandledExceptionMethod;
-			public CustomAttribute? UnmanagedCallersOnlyAttribute;
-			public MethodReference? WaitForBridgeProcessingMethod;
-		}
-
-		readonly TaskLoggingHelper log;
-		readonly MarshalMethodsCollection classifier;
-		readonly XAAssemblyResolver resolver;
-		readonly AndroidTargetArch targetArch;
-
-		public MarshalMethodsAssemblyRewriter (TaskLoggingHelper log, AndroidTargetArch targetArch, MarshalMethodsCollection classifier, XAAssemblyResolver resolver)
-		{
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.targetArch = targetArch;
-			this.classifier = classifier ?? throw new ArgumentNullException (nameof (classifier));;
-			this.resolver = resolver ?? throw new ArgumentNullException (nameof (resolver));;
-		}
-
-		public void Rewrite ()
-		{
-			AssemblyDefinition? monoAndroidRuntime = resolver.Resolve ("Mono.Android.Runtime");
-			if (monoAndroidRuntime == null) {
-				throw new InvalidOperationException ($"[{targetArch}] Internal error: unable to load the Mono.Android.Runtime assembly");
-			}
-
-			TypeDefinition? runtime = FindType (monoAndroidRuntime, "Android.Runtime.AndroidRuntimeInternal", required: true);
-			if (runtime == null)
-				throw new ArgumentNullException (nameof (runtime));
-			MethodDefinition? waitForBridgeProcessingMethod = FindMethod (runtime, "WaitForBridgeProcessing", required: true);
-			if (waitForBridgeProcessingMethod == null)
-				throw new ArgumentNullException (nameof (waitForBridgeProcessingMethod));
-
-			TypeDefinition? androidEnvironment = FindType (monoAndroidRuntime, "Android.Runtime.AndroidEnvironmentInternal", required: true);
-			if (androidEnvironment == null)
-				throw new ArgumentNullException (nameof (androidEnvironment));
-			MethodDefinition? unhandledExceptionMethod = FindMethod (androidEnvironment, "UnhandledException", required: true);
-			if (unhandledExceptionMethod == null)
-				throw new ArgumentNullException (nameof (unhandledExceptionMethod));
-
-			AssemblyDefinition? corlib = resolver.Resolve ("System.Private.CoreLib");
-			if (corlib == null)
-				throw new ArgumentNullException (nameof (corlib));
-			TypeDefinition? systemException = FindType (corlib, "System.Exception", required: true);
-			if (systemException == null)
-				throw new ArgumentNullException (nameof (systemException));
-
-			MethodDefinition unmanagedCallersOnlyAttributeCtor = GetUnmanagedCallersOnlyAttributeConstructor (resolver);
-
-			var assemblyImports = new Dictionary<AssemblyDefinition, AssemblyImports> ();
-			foreach (AssemblyDefinition asm in classifier.AssembliesWithMarshalMethods) {
-				var imports = new AssemblyImports {
-					SystemException               = asm.MainModule.ImportReference (systemException),
-					UnhandledExceptionMethod      = asm.MainModule.ImportReference (unhandledExceptionMethod),
-					UnmanagedCallersOnlyAttribute = CreateImportedUnmanagedCallersOnlyAttribute (asm, unmanagedCallersOnlyAttributeCtor),
-					WaitForBridgeProcessingMethod = asm.MainModule.ImportReference (waitForBridgeProcessingMethod),
-				};
-
-				assemblyImports.Add (asm, imports);
-			}
-
-			log.LogDebugMessage ($"[{targetArch}] Rewriting assemblies for marshal methods support");
-
-			var processedMethods = new Dictionary<string, MethodDefinition> (StringComparer.Ordinal);
-			foreach (IList<MarshalMethodEntry> methodList in classifier.MarshalMethods.Values) {
-				foreach (MarshalMethodEntry method in methodList) {
-					string fullNativeCallbackName = method.NativeCallback.FullName;
-					if (processedMethods.TryGetValue (fullNativeCallbackName, out MethodDefinition nativeCallbackWrapper)) {
-						method.NativeCallbackWrapper = nativeCallbackWrapper;
-						continue;
-					}
-
-					if (HasUnmanagedCallersOnlyAttribute (method.NativeCallback)) {
-						log.LogDebugMessage ($"[{targetArch}] Method '{method.NativeCallback.FullName}' does not need a wrapper, it already has UnmanagedCallersOnlyAttribute");
-						method.NativeCallbackWrapper = method.NativeCallback;
-						continue;
-					}
-
-					method.NativeCallbackWrapper = GenerateWrapper (method, assemblyImports);
-					if (method.Connector != null) {
-						if (method.Connector.IsStatic && method.Connector.IsPrivate) {
-							log.LogDebugMessage ($"[{targetArch}] Removing connector method {method.Connector.FullName}");
-							method.Connector.DeclaringType?.Methods?.Remove (method.Connector);
-						} else {
-							log.LogWarning ($"[{targetArch}] NOT removing connector method {method.Connector.FullName} because it's either not static or not private");
-						}
-					}
-
-					if (method.CallbackField != null) {
-						if (method.CallbackField.IsStatic && method.CallbackField.IsPrivate) {
-							log.LogDebugMessage ($"[{targetArch}] Removing callback delegate backing field {method.CallbackField.FullName}");
-							method.CallbackField.DeclaringType?.Fields?.Remove (method.CallbackField);
-						} else {
-							log.LogWarning ($"[{targetArch}] NOT removing callback field {method.CallbackField.FullName} because it's either not static or not private");
-						}
-					}
-
-					processedMethods.Add (fullNativeCallbackName, method.NativeCallback);
-				}
-			}
-
-			foreach (AssemblyDefinition asm in classifier.AssembliesWithMarshalMethods) {
-				string? path = asm.MainModule.FileName;
-				if (String.IsNullOrEmpty (path)) {
-					throw new InvalidOperationException ($"[{targetArch}] Internal error: assembly '{asm}' does not specify path to its file");
-				}
-
-				string pathPdb = Path.ChangeExtension (path, ".pdb");
-				bool havePdb = File.Exists (pathPdb);
-
-				var writerParams = new WriterParameters {
-					WriteSymbols = havePdb,
-				};
-
-				string directory = Path.Combine (Path.GetDirectoryName (path), "new");
-				Directory.CreateDirectory (directory);
-				string output = Path.Combine (directory, Path.GetFileName (path));
-				log.LogDebugMessage ($"[{targetArch}] Writing new version of '{path}' assembly: {output}");
-
-				// TODO: this should be used eventually, but it requires that all the types are reloaded from the assemblies before typemaps are generated
-				// since Cecil doesn't update the MVID in the already loaded types
-				//asm.MainModule.Mvid = Guid.NewGuid ();
-				asm.Write (output, writerParams);
-
-				CopyFile (output, path);
-				RemoveFile (output);
-
-				if (havePdb) {
-					string outputPdb = Path.ChangeExtension (output, ".pdb");
-					if (File.Exists (outputPdb)) {
-						CopyFile (outputPdb, pathPdb);
-					}
-					RemoveFile (outputPdb);
-				}
-			}
-
-			void CopyFile (string source, string target)
-			{
-				log.LogDebugMessage ($"[{targetArch}] Copying rewritten assembly: {source} -> {target}");
-
-				string targetBackup = $"{target}.bak";
-				if (File.Exists (target)) {
-					// Try to avoid sharing violations by first renaming the target
-					File.Move (target, targetBackup);
-				}
-
-				File.Copy (source, target, true);
-
-				if (File.Exists (targetBackup)) {
-					try {
-						File.Delete (targetBackup);
-					} catch (Exception ex) {
-						// On Windows the deletion may fail, depending on lock state of the original `target` file before the move.
-						log.LogDebugMessage ($"[{targetArch}] While trying to delete '{targetBackup}', exception was thrown: {ex}");
-						log.LogDebugMessage ($"[{targetArch}] Failed to delete backup file '{targetBackup}', ignoring.");
-					}
-				}
-			}
-
-			void RemoveFile (string? path)
-			{
-				if (path.IsNullOrEmpty () || !File.Exists (path)) {
-					return;
-				}
-
-				try {
-					log.LogDebugMessage ($"[{targetArch}] Deleting: {path}");
-					File.Delete (path);
-				} catch (Exception ex) {
-					log.LogCodedWarning ("XA4324", Properties.Resources.XA4324, targetArch, path);
-					log.LogDebugMessage ($"[{targetArch}] {ex.ToString ()}");
-				}
-			}
-
-			static bool HasUnmanagedCallersOnlyAttribute (MethodDefinition method)
-			{
-				foreach (CustomAttribute ca in method.CustomAttributes) {
-					if (ca.Constructor.DeclaringType.FullName == "System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute") {
-						return true;
-					}
-				}
-
-				return false;
-			}
-		}
-
-		MethodDefinition GenerateWrapper (MarshalMethodEntry method, Dictionary<AssemblyDefinition, AssemblyImports> assemblyImports)
-		{
-			MethodDefinition callback = method.NativeCallback;
-			AssemblyImports imports = assemblyImports [callback.Module.Assembly];
-			string wrapperName = $"{callback.Name}_mm_wrapper";
-			TypeReference retType = MapToBlittableTypeIfNecessary (callback.ReturnType, out bool returnTypeMapped);
-			bool hasReturnValue = !MonoAndroidHelper.StringEquals ("System.Void", callback.ReturnType.FullName);
-			var wrapperMethod = new MethodDefinition (wrapperName, callback.Attributes, retType);
-
-			callback.DeclaringType.Methods.Add (wrapperMethod);
-			wrapperMethod.CustomAttributes.Add (imports.UnmanagedCallersOnlyAttribute);
-
-			MethodBody body = wrapperMethod.Body;
-			body.InitLocals = true;
-
-			VariableDefinition? retval = null;
-			if (hasReturnValue) {
-				retval = new VariableDefinition (retType);
-				body.Variables.Add (retval);
-			}
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Call, imports.WaitForBridgeProcessingMethod));
-			var exceptionHandler = new ExceptionHandler (ExceptionHandlerType.Catch) {
-				CatchType = imports.SystemException,
-			};
-
-			body.ExceptionHandlers.Add (exceptionHandler);
-
-			Instruction? firstTryInstruction = null;
-			Instruction? inst = null;
-			uint nparam = 0;
-			foreach (ParameterDefinition pdef in callback.Parameters) {
-				TypeReference newType = MapToBlittableTypeIfNecessary (pdef.ParameterType, out _);
-				wrapperMethod.Parameters.Add (new ParameterDefinition (pdef.Name, pdef.Attributes, newType));
-
-				inst = GetLoadArgInstruction (nparam++, pdef);
-				if (firstTryInstruction == null) {
-					firstTryInstruction = inst;
-				}
-
-				body.Instructions.Add (inst);
-
-				if (!pdef.ParameterType.IsBlittable ()) {
-					GenerateNonBlittableConversion (pdef.ParameterType, newType);
-				}
-			}
-
-			inst = Instruction.Create (OpCodes.Call, callback);
-			if (firstTryInstruction == null) {
-				firstTryInstruction = inst;
-			}
-			body.Instructions.Add (inst);
-
-			exceptionHandler.TryStart = firstTryInstruction;
-
-			if (hasReturnValue && !returnTypeMapped) {
-				body.Instructions.Add (Instruction.Create (OpCodes.Stloc, retval));
-			}
-
-			Instruction ret = Instruction.Create (OpCodes.Ret);
-			Instruction? retValLoadInst = null;
-			Instruction leaveTarget;
-
-			if (hasReturnValue) {
-				if (returnTypeMapped) {
-					GenerateRetValCast (callback.ReturnType, retType);
-					body.Instructions.Add (Instruction.Create (OpCodes.Stloc, retval));
-				}
-
-				retValLoadInst = Instruction.Create (OpCodes.Ldloc, retval);
-				leaveTarget = retValLoadInst;
-			} else {
-				leaveTarget = ret;
-			}
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Leave_S, leaveTarget));
-
-			var exceptionVar = new VariableDefinition (imports.SystemException);
-			body.Variables.Add (exceptionVar);
-
-			var catchStartInst = Instruction.Create (OpCodes.Stloc, exceptionVar);
-			exceptionHandler.HandlerStart = catchStartInst;
-
-			// TryEnd must point to the next instruction after the try block
-			exceptionHandler.TryEnd = catchStartInst;
-
-			body.Instructions.Add (catchStartInst);
-			body.Instructions.Add (Instruction.Create (OpCodes.Ldarg_0));
-			body.Instructions.Add (Instruction.Create (OpCodes.Ldloc, exceptionVar));
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Call, imports.UnhandledExceptionMethod));
-
-			if (hasReturnValue) {
-				AddSetDefaultValueInstructions (body, retType, retval!);
-			}
-
-			body.Instructions.Add (Instruction.Create (OpCodes.Leave_S, leaveTarget));
-
-			// HandlerEnd must point to the next instruction after the catch block
-			if (hasReturnValue) {
-				body.Instructions.Add (retValLoadInst);
-				exceptionHandler.HandlerEnd = retValLoadInst;
-			} else {
-				exceptionHandler.HandlerEnd = ret;
-			}
-			body.Instructions.Add (ret);
-
-			return wrapperMethod;
-
-			void GenerateNonBlittableConversion (TypeReference sourceType, TypeReference targetType)
-			{
-				if (IsBooleanConversion (sourceType, targetType)) {
-					// We output equivalent of the `param != 0` C# code
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Cgt_Un));
-					return;
-				}
-
-				ThrowUnsupportedType (sourceType);
-			}
-
-			void GenerateRetValCast (TypeReference sourceType, TypeReference targetType)
-			{
-				if (IsBooleanConversion (sourceType, targetType)) {
-					var insLoadOne = Instruction.Create (OpCodes.Ldc_I4_1);
-					var insConvert = Instruction.Create (OpCodes.Conv_U1);
-
-					body.Instructions.Add (Instruction.Create (OpCodes.Brtrue_S, insLoadOne));
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Br_S, insConvert));
-					body.Instructions.Add (insLoadOne);
-					body.Instructions.Add (insConvert);
-					return;
-				}
-
-				ThrowUnsupportedType (sourceType);
-			}
-
-			bool IsBooleanConversion (TypeReference sourceType, TypeReference targetType)
-			{
-				if (MonoAndroidHelper.StringEquals ("System.Boolean", sourceType.FullName)) {
-					if (!MonoAndroidHelper.StringEquals ("System.Byte", targetType.FullName)) {
-						throw new InvalidOperationException ($"[{targetArch}] Unexpected conversion from '{sourceType.FullName}' to '{targetType.FullName}'");
-					}
-
-					return true;
-				}
-
-				return false;
-			}
-
-			void ThrowUnsupportedType (TypeReference type)
-			{
-				throw new InvalidOperationException ($"[{targetArch}] Unsupported non-blittable type '{type.FullName}'");
-			}
-		}
-
-		void AddSetDefaultValueInstructions (MethodBody body, TypeReference type, VariableDefinition retval)
-		{
-			bool supported = false;
-
-			switch (type.FullName) {
-				case "System.Boolean":
-				case "System.Byte":
-				case "System.Int16":
-				case "System.Int32":
-				case "System.SByte":
-				case "System.UInt16":
-				case "System.UInt32":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					break;
-
-				case "System.Int64":
-				case "System.UInt64":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Conv_I8));
-					break;
-
-				case "System.IntPtr":
-				case "System.UIntPtr":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_I4_0));
-					body.Instructions.Add (Instruction.Create (OpCodes.Conv_I));
-					break;
-
-				case "System.Single":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_R4, 0.0F));
-					break;
-
-				case "System.Double":
-					supported = true;
-					body.Instructions.Add (Instruction.Create (OpCodes.Ldc_R8, 0.0));
-					break;
-			}
-
-			if (supported) {
-				body.Instructions.Add (Instruction.Create (OpCodes.Stloc, retval));
-				return;
-			}
-
-			throw new InvalidOperationException ($"[{targetArch}] Unsupported type: '{type.FullName}'");
-		}
-
-
-		Instruction GetLoadArgInstruction (uint nparam, ParameterDefinition pdef)
-		{
-			OpCode ldargOp;
-			bool paramRef = false;
-
-			switch (nparam++) {
-				case 0:
-					ldargOp = OpCodes.Ldarg_0;
-					break;
-
-				case 1:
-					ldargOp = OpCodes.Ldarg_1;
-					break;
-
-				case 2:
-					ldargOp = OpCodes.Ldarg_2;
-					break;
-
-				case 3:
-					ldargOp = OpCodes.Ldarg_3;
-					break;
-
-				default:
-					ldargOp = OpCodes.Ldarg_S;
-					paramRef = true;
-					break;
-			}
-
-			if (!paramRef) {
-				return Instruction.Create (ldargOp);
-			}
-
-			return Instruction.Create (ldargOp, pdef);
-		}
-
-		TypeReference MapToBlittableTypeIfNecessary (TypeReference type, out bool typeMapped)
-		{
-			if (type.IsBlittable () || MonoAndroidHelper.StringEquals ("System.Void", type.FullName)) {
-				typeMapped = false;
-				return type;
-			}
-
-			if (MonoAndroidHelper.StringEquals ("System.Boolean", type.FullName)) {
-				// Maps to Java JNI's jboolean which is an unsigned 8-bit type
-				typeMapped = true;
-				return ReturnValid (typeof(byte));
-			}
-
-			throw new NotSupportedException ($"[{targetArch}] Cannot map unsupported blittable type '{type.FullName}'");
-
-			TypeReference ReturnValid (Type typeToLookUp)
-			{
-				TypeReference? mappedType = type.Module.Assembly.MainModule.ImportReference (typeToLookUp);
-				if (mappedType == null) {
-					throw new InvalidOperationException ($"[{targetArch}] Unable to obtain reference to type '{typeToLookUp.FullName}'");
-				}
-
-				return mappedType;
-			}
-		}
-
-		MethodDefinition GetUnmanagedCallersOnlyAttributeConstructor (IAssemblyResolver resolver)
-		{
-			AssemblyDefinition? asm = resolver.Resolve ("System.Runtime.InteropServices");
-			if (asm == null)
-				throw new ArgumentNullException (nameof (asm));
-			
-			TypeDefinition? unmanagedCallersOnlyAttribute = null;
-			foreach (ModuleDefinition md in asm.Modules) {
-				foreach (ExportedType et in md.ExportedTypes) {
-					if (!et.IsForwarder) {
-						continue;
-					}
-
-					if (!MonoAndroidHelper.StringEquals ("System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute", et.FullName)) {
-						continue;
-					}
-
-					unmanagedCallersOnlyAttribute = et.Resolve ();
-					break;
-				}
-			}
-
-			if (unmanagedCallersOnlyAttribute == null) {
-				throw new InvalidOperationException ("[{targetArch}] Unable to find the System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute type");
-			}
-
-			foreach (MethodDefinition md in unmanagedCallersOnlyAttribute.Methods) {
-				if (!md.IsConstructor) {
-					continue;
-				}
-
-				return md;
-			}
-
-			throw new InvalidOperationException ("[{targetArch}] Unable to find the System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute type constructor");
-		}
-
-		CustomAttribute CreateImportedUnmanagedCallersOnlyAttribute (AssemblyDefinition targetAssembly, MethodDefinition unmanagedCallersOnlyAtributeCtor)
-		{
-			return new CustomAttribute (targetAssembly.MainModule.ImportReference (unmanagedCallersOnlyAtributeCtor));
-		}
-
-		MethodDefinition? FindMethod (TypeDefinition type, string methodName, bool required)
-		{
-			log.LogDebugMessage ($"[{targetArch}] Looking for method '{methodName}' in type {type}");
-			foreach (MethodDefinition method in type.Methods) {
-				log.LogDebugMessage ($"[{targetArch}]   method: {method.Name}");
-				if (MonoAndroidHelper.StringEquals (methodName, method.Name)) {
-					log.LogDebugMessage ($"[{targetArch}]     match!");
-					return method;
-				}
-			}
-
-			if (required) {
-				throw new InvalidOperationException ($"[{targetArch}] Internal error: required method '{methodName}' in type {type} not found");
-			}
-
-			return null;
-		}
-
-		TypeDefinition? FindType (AssemblyDefinition asm, string typeName, bool required)
-		{
-			log.LogDebugMessage ($"[{targetArch}] Looking for type '{typeName}' in assembly '{asm}' ({GetAssemblyPathInfo (asm)})");
-			foreach (TypeDefinition t in asm.MainModule.Types) {
-				log.LogDebugMessage ($"[{targetArch}]    checking {t.FullName}");
-				if (MonoAndroidHelper.StringEquals (typeName, t.FullName)) {
-					log.LogDebugMessage ($"[{targetArch}]     match!");
-					return t;
-				}
-			}
-
-			if (required) {
-				throw new InvalidOperationException ($"[{targetArch}] Internal error: required type '{typeName}' in assembly {asm} not found");
-			}
-
-			return null;
-		}
-
-		static string GetAssemblyPathInfo (AssemblyDefinition asm)
-		{
-			string? path = asm.MainModule.FileName;
-			if (String.IsNullOrEmpty (path)) {
-				return "no assembly path";
-			}
-
-			return path;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs
deleted file mode 100644
index a1929fbea35..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs
+++ /dev/null
@@ -1,1107 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.TypeNameMappings;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Base class representing a method entry that contains information about 
-	/// a method and its declaring type. Used as a foundation for marshal method entries.
-	/// </summary>
-	class MethodEntry
-	{
-		/// <summary>
-		/// Gets the type that declares this method.
-		/// </summary>
-		public TypeDefinition DeclaringType { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MethodEntry"/> class.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method. Cannot be null.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="declaringType"/> is null.</exception>
-		public MethodEntry (TypeDefinition declaringType)
-		{
-			DeclaringType = declaringType ?? throw new ArgumentNullException (nameof (declaringType));
-		}
-	}
-
-	/// <summary>
-	/// Represents a marshal method entry containing all information needed to generate 
-	/// a native callback method and its associated metadata. This is the core data structure
-	/// used throughout the marshal method generation pipeline.
-	/// </summary>
-	class MarshalMethodEntry : MethodEntry
-	{
-		/// <summary>
-		/// The "real" native callback, used if it doesn't contain any non-blittable types in its parameters
-		/// or return type.
-		/// </summary>
-		MethodDefinition nativeCallbackReal;
-
-		/// <summary>
-		/// Used only when <see cref="NeedsBlittableWorkaround"/> is <c>true</c>. This wrapper is generated by
-		/// <see cref="MarshalMethodsAssemblyRewriter" /> when rewriting assemblies, for methods which have either
-		/// a non-blittable return type or a parameter of a non-blittable type.
-		/// </summary>
-		public MethodDefinition? NativeCallbackWrapper { get; set; }
-		
-		/// <summary>
-		/// The connector method that returns the delegate for this marshal method. 
-		/// May be null for converted marshal methods where the connector has been removed.
-		/// </summary>
-		public MethodDefinition? Connector             { get; }
-		
-		/// <summary>
-		/// The original registered method that was marked with [Register] attribute.
-		/// This is the .NET method that should be called from native code.
-		/// </summary>
-		public MethodDefinition? RegisteredMethod      { get; }
-		
-		/// <summary>
-		/// The actual implementation method that contains the business logic.
-		/// This may be the same as RegisteredMethod or a different method.
-		/// </summary>
-		public MethodDefinition? ImplementedMethod     { get; }
-		
-		/// <summary>
-		/// The delegate field that holds the callback delegate. May be null if the field doesn't exist.
-		/// </summary>
-		public FieldDefinition? CallbackField          { get; }
-		
-		/// <summary>
-		/// The JNI type name (e.g., "com/example/MyClass") for the Java class that owns this method.
-		/// </summary>
-		public string JniTypeName                      { get; }
-		
-		/// <summary>
-		/// The JNI method name for this method as it appears in Java/JNI.
-		/// </summary>
-		public string JniMethodName                    { get; }
-		
-		/// <summary>
-		/// The JNI method signature (e.g., "(ILjava/lang/String;)V") describing parameter and return types.
-		/// </summary>
-		public string JniMethodSignature               { get; }
-		
-		/// <summary>
-		/// Indicates whether this method requires a blittable workaround wrapper due to 
-		/// non-blittable parameter or return types.
-		/// </summary>
-		public bool NeedsBlittableWorkaround           { get; }
-
-		/// <summary>
-		/// Gets the native callback method to use. Returns the wrapper if it exists, otherwise the real callback.
-		/// </summary>
-		public MethodDefinition NativeCallback         => NativeCallbackWrapper ?? nativeCallbackReal;
-		
-		/// <summary>
-		/// Indicates whether this is a special case marshal method (e.g., TypeManager methods).
-		/// </summary>
-		public bool IsSpecial                          { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodEntry"/> class for a standard marshal method.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="nativeCallback">The native callback method.</param>
-		/// <param name="connector">The connector method that returns the delegate.</param>
-		/// <param name="registeredMethod">The registered method marked with [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual implementation method.</param>
-		/// <param name="callbackField">The delegate field that holds the callback delegate.</param>
-		/// <param name="jniTypeName">The JNI type name for the Java class.</param>
-		/// <param name="jniName">The JNI method name.</param>
-		/// <param name="jniSignature">The JNI method signature.</param>
-		/// <param name="needsBlittableWorkaround">Whether this method needs a blittable workaround wrapper.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		/// <exception cref="ArgumentException">Thrown when JNI names or signatures are null or empty.</exception>
-		public MarshalMethodEntry (TypeDefinition declaringType, MethodDefinition nativeCallback, MethodDefinition connector, MethodDefinition
-		                           registeredMethod, MethodDefinition implementedMethod, FieldDefinition callbackField, string jniTypeName,
-		                           string jniName, string jniSignature, bool needsBlittableWorkaround)
-			: base (declaringType)
-		{
-			nativeCallbackReal = nativeCallback ?? throw new ArgumentNullException (nameof (nativeCallback));
-			Connector = connector;  // The connector will not exist for converted marshal methods
-			RegisteredMethod = registeredMethod ?? throw new ArgumentNullException (nameof (registeredMethod));
-			ImplementedMethod = implementedMethod ?? throw new ArgumentNullException (nameof (implementedMethod));
-			CallbackField = callbackField; // we don't require the callback field to exist
-			JniTypeName = EnsureNonEmpty (jniTypeName, nameof (jniTypeName));
-			JniMethodName = EnsureNonEmpty (jniName, nameof (jniName));
-			JniMethodSignature = EnsureNonEmpty (jniSignature, nameof (jniSignature));
-			NeedsBlittableWorkaround = needsBlittableWorkaround;
-			IsSpecial = false;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodEntry"/> class for a special case method.
-		/// Special case methods are typically hand-written methods like TypeManager methods.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="nativeCallback">The native callback method.</param>
-		/// <param name="jniTypeName">The JNI type name for the Java class.</param>
-		/// <param name="jniName">The JNI method name.</param>
-		/// <param name="jniSignature">The JNI method signature.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		/// <exception cref="ArgumentException">Thrown when JNI names or signatures are null or empty.</exception>
-		public MarshalMethodEntry (TypeDefinition declaringType, MethodDefinition nativeCallback, string jniTypeName, string jniName, string jniSignature)
-			: base (declaringType)
-		{
-			nativeCallbackReal = nativeCallback ?? throw new ArgumentNullException (nameof (nativeCallback));
-			JniTypeName = EnsureNonEmpty (jniTypeName, nameof (jniTypeName));
-			JniMethodName = EnsureNonEmpty (jniName, nameof (jniName));
-			JniMethodSignature = EnsureNonEmpty (jniSignature, nameof (jniSignature));
-			IsSpecial = true;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodEntry"/> class by copying from another entry
-		/// but with a different native callback method. Used when creating wrapper methods.
-		/// </summary>
-		/// <param name="other">The source marshal method entry to copy from.</param>
-		/// <param name="nativeCallback">The new native callback method to use.</param>
-		/// <exception cref="ArgumentNullException">Thrown when parameters are null.</exception>
-		public MarshalMethodEntry (MarshalMethodEntry other, MethodDefinition nativeCallback)
-			: this (other.DeclaringType, nativeCallback, other.Connector, other.RegisteredMethod,
-			        other.ImplementedMethod, other.CallbackField, other.JniTypeName, other.JniMethodName,
-			        other.JniMethodSignature, other.NeedsBlittableWorkaround)
-		{}
-
-		/// <summary>
-		/// Ensures that the specified string is not null or empty.
-		/// </summary>
-		/// <param name="s">The string to validate.</param>
-		/// <param name="argName">The name of the argument for error reporting.</param>
-		/// <returns>The validated string.</returns>
-		/// <exception cref="ArgumentException">Thrown when the string is null or empty.</exception>
-		string EnsureNonEmpty (string s, string argName)
-		{
-			if (String.IsNullOrEmpty (s)) {
-				throw new ArgumentException ("must not be null or empty", argName);
-			}
-
-			return s;
-		}
-
-		/// <summary>
-		/// Gets a unique key for storing this marshal method entry. The key includes
-		/// the type name, assembly information, and method name.
-		/// </summary>
-		/// <param name="tdCache">The type definition cache for resolving assembly information.</param>
-		/// <returns>A unique string key for this marshal method entry.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when RegisteredMethod is null.</exception>
-		public string GetStoreMethodKey (TypeDefinitionCache tdCache)
-		{
-			MethodDefinition registeredMethod = RegisteredMethod;
-			string typeName = registeredMethod.DeclaringType.FullName.Replace ('/', '+');
-			return $"{typeName}, {registeredMethod.DeclaringType.GetPartialAssemblyName (tdCache)}\t{registeredMethod.Name}";
-		}
-	}
-
-	/// <summary>
-	/// Represents a marshal method entry that has been converted from its original form
-	/// to an optimized native callback. This is used when marshal methods have been 
-	/// pre-processed and converted to a more efficient form.
-	/// </summary>
-	sealed class ConvertedMarshalMethodEntry : MarshalMethodEntry
-	{
-		/// <summary>
-		/// Gets the converted native callback method that has been optimized for performance.
-		/// </summary>
-		public MethodDefinition ConvertedNativeCallback { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ConvertedMarshalMethodEntry"/> class.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="nativeCallback">The original native callback method.</param>
-		/// <param name="connector">The connector method that returns the delegate.</param>
-		/// <param name="registeredMethod">The registered method marked with [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual implementation method.</param>
-		/// <param name="callbackField">The delegate field that holds the callback delegate.</param>
-		/// <param name="jniTypeName">The JNI type name for the Java class.</param>
-		/// <param name="jniName">The JNI method name.</param>
-		/// <param name="jniSignature">The JNI method signature.</param>
-		/// <param name="needsBlittableWorkaround">Whether this method needs a blittable workaround wrapper.</param>
-		/// <param name="convertedNativeCallback">The converted/optimized native callback method.</param>
-		/// <exception cref="ArgumentNullException">Thrown when convertedNativeCallback is null.</exception>
-		public ConvertedMarshalMethodEntry (TypeDefinition declaringType, MethodDefinition nativeCallback, MethodDefinition connector, MethodDefinition
-					   registeredMethod, MethodDefinition implementedMethod, FieldDefinition callbackField, string jniTypeName,
-					   string jniName, string jniSignature, bool needsBlittableWorkaround, MethodDefinition convertedNativeCallback)
-			: base (declaringType, nativeCallback, connector, registeredMethod, implementedMethod, callbackField, jniTypeName, jniName, jniSignature, needsBlittableWorkaround)
-		{
-			ConvertedNativeCallback = convertedNativeCallback ?? throw new ArgumentNullException (nameof (convertedNativeCallback));
-		}
-	}
-
-	/// <summary>
-	/// Represents a marshal method that cannot be converted to a static native callback
-	/// and must be registered dynamically at runtime. This typically happens when
-	/// the method signature or attributes don't meet the requirements for static marshaling.
-	/// </summary>
-	sealed class DynamicallyRegisteredMarshalMethodEntry : MethodEntry
-	{
-		/// <summary>
-		/// Gets the actual implementation method that contains the business logic.
-		/// </summary>
-		public MethodDefinition ImplementedMethod { get; }
-		
-		/// <summary>
-		/// Gets the [Register] attribute that was applied to the method.
-		/// </summary>
-		public CustomAttribute RegisterAttribute { get; }
-		
-		/// <summary>
-		/// Gets the registered method that was marked with the [Register] attribute.
-		/// </summary>
-		public MethodDefinition RegisteredMethod { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="DynamicallyRegisteredMarshalMethodEntry"/> class.
-		/// </summary>
-		/// <param name="declaringType">The type that declares this method.</param>
-		/// <param name="implementedMethod">The actual implementation method.</param>
-		/// <param name="registeredMethod">The registered method marked with [Register] attribute.</param>
-		/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-		public DynamicallyRegisteredMarshalMethodEntry (TypeDefinition declaringType, MethodDefinition implementedMethod, MethodDefinition registeredMethod, CustomAttribute registerAttribute)
-			: base (declaringType)
-		{
-			ImplementedMethod = implementedMethod;
-			RegisteredMethod = registeredMethod;
-			RegisterAttribute = registerAttribute;
-		}
-	}
-
-	/// <summary>
-	/// Analyzes and classifies methods in .NET assemblies to determine which can be converted
-	/// to efficient marshal methods and which must be registered dynamically. This is a core
-	/// component of the marshal method generation pipeline that examines method signatures,
-	/// attributes, and types to make classification decisions.
-	/// </summary>
-	class MarshalMethodsClassifier
-	{
-		/// <summary>
-		/// Contains information about a connector method parsed from a connector specification string.
-		/// Connector methods are responsible for returning delegates that bridge between .NET and native code.
-		/// </summary>
-		public sealed class ConnectorInfo
-		{
-			/// <summary>
-			/// Gets the name of the connector method (e.g., "GetMyMethodHandler").
-			/// </summary>
-			public string MethodName                  { get; }
-			
-			/// <summary>
-			/// Gets the full type name that contains the connector method.
-			/// </summary>
-			public string TypeName                    { get; }
-			
-			/// <summary>
-			/// Gets the assembly name reference for the assembly containing the connector method.
-			/// </summary>
-			public AssemblyNameReference AssemblyName { get; }
-
-			/// <summary>
-			/// Initializes a new instance of the <see cref="ConnectorInfo"/> class by parsing
-			/// a connector specification string.
-			/// </summary>
-			/// <param name="spec">
-			/// The connector specification string in the format: "MethodName:TypeName, AssemblyName"
-			/// For example: "GetMyMethodHandler:MyNamespace.MyType, MyAssembly"
-			/// </param>
-			public ConnectorInfo (string spec)
-			{
-				// Parse connector specification: "MethodName:TypeName, AssemblyName"
-				string[] connectorSpec = spec.Split (':');
-				MethodName = connectorSpec[0];
-
-				if (connectorSpec.Length < 2) {
-					return;
-				}
-
-				// Extract type name and assembly name from the full type specification
-				string fullTypeName = connectorSpec[1];
-				int comma = fullTypeName.IndexOf (',');
-				TypeName = fullTypeName.Substring (0, comma);
-				AssemblyName = AssemblyNameReference.Parse (fullTypeName.Substring (comma + 1).Trim ());
-			}
-		}
-
-		/// <summary>
-		/// Interface for matching method signatures when searching for methods.
-		/// Implementations can provide custom logic for determining if a method's signature matches expected criteria.
-		/// </summary>
-		interface IMethodSignatureMatcher
-		{
-			/// <summary>
-			/// Determines whether the specified method matches the expected signature.
-			/// </summary>
-			/// <param name="method">The method to check.</param>
-			/// <returns>true if the method matches the expected signature; otherwise, false.</returns>
-			bool Matches (MethodDefinition method);
-		}
-
-		/// <summary>
-		/// Implements <see cref="IMethodSignatureMatcher"/> to match native callback method signatures.
-		/// This class generates the expected native callback signature based on a target .NET method
-		/// and can verify if candidate methods match that signature. Native callbacks must follow
-		/// specific patterns to be compatible with JNI and the marshal method system.
-		/// </summary>
-		sealed class NativeCallbackSignature : IMethodSignatureMatcher
-		{
-			/// <summary>
-			/// Set of .NET types that can be passed directly to native code without marshaling.
-			/// These are blittable types that have the same representation in both managed and native memory.
-			/// </summary>
-			static readonly HashSet<string> verbatimTypes = new HashSet<string> (StringComparer.Ordinal) {
-				"System.Boolean",
-				"System.Byte",
-				"System.Char",
-				"System.Double",
-				"System.Int16",
-				"System.Int32",
-				"System.Int64",
-				"System.IntPtr",
-				"System.SByte",
-				"System.Single",
-				"System.UInt16",
-				"System.UInt32",
-				"System.UInt64",
-				"System.Void",
-			};
-
-			readonly List<string> paramTypes;
-			readonly string returnType;
-			readonly TaskLoggingHelper log;
-			readonly TypeDefinitionCache cache;
-
-			/// <summary>
-			/// Initializes a new instance of the <see cref="NativeCallbackSignature"/> class.
-			/// Analyzes the target method and generates the expected native callback signature.
-			/// </summary>
-			/// <param name="target">The target .NET method to generate a native callback signature for.</param>
-			/// <param name="log">The logging helper for diagnostic messages.</param>
-			/// <param name="cache">The type definition cache for resolving types.</param>
-			public NativeCallbackSignature (MethodDefinition target, TaskLoggingHelper log, TypeDefinitionCache cache)
-			{
-				this.log = log;
-				this.cache = cache;
-				
-				// Map the return type to its native equivalent
-				returnType = MapType (target.ReturnType);
-				
-				// Native callbacks always start with JNIEnv* and jobject/jclass parameters
-				paramTypes = new List<string> {
-					"System.IntPtr", // jnienv
-					"System.IntPtr", // native__this
-				};
-
-				// Add mapped parameter types
-				foreach (ParameterDefinition pd in target.Parameters) {
-					paramTypes.Add (MapType (pd.ParameterType));
-				}
-			}
-
-			/// <summary>
-			/// Maps a .NET type reference to its corresponding native type for use in native callbacks.
-			/// This handles the conversion from managed types to types that can be passed through JNI.
-			/// </summary>
-			/// <param name="typeRef">The .NET type reference to map.</param>
-			/// <returns>The full name of the corresponding native type.</returns>
-			/// <exception cref="InvalidOperationException">Thrown when a type cannot be resolved.</exception>
-			string MapType (TypeReference typeRef)
-			{
-				string? typeName = null;
-				
-				// Handle non-generic, non-array types that might be enums
-				if (!typeRef.IsGenericParameter && !typeRef.IsArray) {
-					TypeDefinition typeDef = cache.Resolve (typeRef);
-					if (typeDef == null) {
-						throw new InvalidOperationException ($"Unable to resolve type '{typeRef.FullName}'");
-					}
-
-					// Enums are represented by their underlying type in native code
-					if (typeDef.IsEnum) {
-						return GetEnumUnderlyingType (typeDef).FullName;
-					}
-				}
-
-				// Use the full type name if not already determined
-				if (String.IsNullOrEmpty (typeName)) {
-					typeName = typeRef.FullName;
-				}
-
-				// Types that can be passed directly without conversion
-				if (verbatimTypes.Contains (typeName)) {
-					return typeName;
-				}
-
-				// Special case: Android.Graphics.Color is mapped to/from a native `int`
-				if (MonoAndroidHelper.StringEquals (typeName, "Android.Graphics.Color")) {
-					return "System.Int32";
-				}
-
-				// All other types are passed as IntPtr (jobject references)
-				return "System.IntPtr";
-			}
-
-			/// <summary>
-			/// Gets the underlying type of an enumeration. Enums in .NET have an underlying integral type
-			/// that is used when passing them through JNI.
-			/// </summary>
-			/// <param name="td">The enumeration type definition.</param>
-			/// <returns>The underlying type reference of the enumeration.</returns>
-			/// <exception cref="InvalidOperationException">Thrown when the underlying type cannot be determined.</exception>
-			static TypeReference GetEnumUnderlyingType (TypeDefinition td)
-			{
-				var fields = td.Fields;
-
-				// The first non-static field in an enum is the value field containing the underlying type
-				for (int i = 0; i < fields.Count; i++) {
-					var field = fields [i];
-					if (!field.IsStatic)
-						return field.FieldType;
-				}
-
-				throw new InvalidOperationException ($"Unable to determine underlying type of the '{td.FullName}' enum");
-			}
-
-			/// <summary>
-			/// Determines whether the specified method matches the expected native callback signature.
-			/// This includes checking parameter count, parameter types, return type, and that the method is static.
-			/// </summary>
-			/// <param name="method">The method to check against the expected signature.</param>
-			/// <returns>true if the method matches the expected signature; otherwise, false.</returns>
-			public bool Matches (MethodDefinition method)
-			{
-				// Native callbacks must be static and have the correct number of parameters
-				if (method.Parameters.Count != paramTypes.Count || !method.IsStatic) {
-					log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature (invalid parameter count or not static)");
-					return false;
-				}
-
-				// Check return type match
-				if (!TypeMatches (returnType, method.ReturnType.FullName)) {
-					log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature (invalid return type: expected '{returnType}', found '{method.ReturnType.FullName}')");
-					return false;
-				}
-
-				// Check each parameter type
-				for (int i = 0; i < method.Parameters.Count; i++) {
-					ParameterDefinition pd = method.Parameters[i];
-					string parameterTypeName;
-
-					// Handle array types specially
-					if (pd.ParameterType.IsArray) {
-						parameterTypeName = $"{pd.ParameterType.FullName}[]";
-					} else {
-						parameterTypeName = pd.ParameterType.FullName;
-					}
-
-					if (!TypeMatches (parameterTypeName, paramTypes[i])) {
-						log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature, expected parameter type '{paramTypes[i]}' at position {i}, found '{parameterTypeName}'");
-						return false;
-					}
-				}
-
-				return true;
-			}
-
-			/// <summary>
-			/// Array of equivalent type mappings for marshaling. Some .NET types are marshaled
-			/// as different blittable types when passed through JNI, so we need to treat them as equivalent
-			/// when matching signatures.
-			/// </summary>
-			// Because these types are marshaled as different blittable types,
-			// we need to accept them as equivalent
-			static readonly (string Source, string Replacement)[] equivalent_types = [
-				(Source: "System.Boolean", Replacement: "System.SByte"),
-				(Source: "System.Char", Replacement: "System.UInt16"),
-			];
-
-			/// <summary>
-			/// Determines whether two type names are equivalent for native callback matching purposes.
-			/// This handles both exact matches and equivalent type mappings used during marshaling.
-			/// </summary>
-			/// <param name="type">The expected type name.</param>
-			/// <param name="methodType">The actual method type name.</param>
-			/// <returns>true if the types are equivalent; otherwise, false.</returns>
-			static bool TypeMatches (string type, string methodType)
-			{
-				// Check for exact match first
-				if (MonoAndroidHelper.StringEquals (type, methodType))
-					return true;
-
-				// Check for equivalent type mappings in both directions
-				foreach (var eq in equivalent_types) {
-					if (string.Compare (eq.Source, type, StringComparison.Ordinal) == 0 && string.Compare (eq.Replacement, methodType, StringComparison.Ordinal) == 0)
-						return true;
-
-					if (string.Compare (eq.Source, methodType, StringComparison.Ordinal) == 0 && string.Compare (eq.Replacement, type, StringComparison.Ordinal) == 0)
-						return true;
-				}
-
-				return false;
-			}
-		}
-
-		// Core dependencies for the classifier
-		TypeDefinitionCache tdCache;
-		IAssemblyResolver resolver;
-		TaskLoggingHelper log;
-		readonly AndroidTargetArch targetArch;
-
-		/// <summary>
-		/// Gets the type definition cache used for resolving type references.
-		/// </summary>
-		public TypeDefinitionCache TypeDefinitionCache => tdCache;
-		
-		/// <summary>
-		/// Gets the logging helper for diagnostic messages.
-		/// </summary>
-		public TaskLoggingHelper Log => log;
-		
-		/// <summary>
-		/// Gets the assembly resolver for loading assembly definitions.
-		/// </summary>
-		public IAssemblyResolver Resolver => resolver;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodsClassifier"/> class with target architecture.
-		/// </summary>
-		/// <param name="targetArch">The target architecture for marshal method generation.</param>
-		/// <param name="tdCache">The type definition cache for resolving types.</param>
-		/// <param name="res">The assembly resolver for loading assemblies.</param>
-		/// <param name="log">The logging helper for diagnostic messages.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		public MarshalMethodsClassifier (AndroidTargetArch targetArch, TypeDefinitionCache tdCache, IAssemblyResolver res, TaskLoggingHelper log)
-		{
-			this.targetArch = targetArch;
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.tdCache = tdCache ?? throw new ArgumentNullException (nameof (tdCache));
-			resolver = res ?? throw new ArgumentNullException (nameof (tdCache));
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodsClassifier"/> class without target architecture.
-		/// Used when architecture-specific information is not needed for classification.
-		/// </summary>
-		/// <param name="tdCache">The type definition cache for resolving types.</param>
-		/// <param name="res">The assembly resolver for loading assemblies.</param>
-		/// <param name="log">The logging helper for diagnostic messages.</param>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		public MarshalMethodsClassifier (TypeDefinitionCache tdCache, IAssemblyResolver res, TaskLoggingHelper log)
-		{
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.tdCache = tdCache ?? throw new ArgumentNullException (nameof (tdCache));
-			resolver = res ?? throw new ArgumentNullException (nameof (tdCache));
-		}
-
-		/// <summary>
-		/// Classifies a method to determine whether it can be converted to a marshal method
-		/// or must be registered dynamically. This is the main entry point for method classification.
-		/// </summary>
-		/// <param name="topType">The top-level type that owns this method (may differ from declaring type due to inheritance).</param>
-		/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual method implementation that contains the business logic.</param>
-		/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-		/// <returns>
-		/// A <see cref="MarshalMethodEntry"/> if the method can be converted to a marshal method,
-		/// or a <see cref="DynamicallyRegisteredMarshalMethodEntry"/> if it must be registered dynamically.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">Thrown when required parameters are null.</exception>
-		public MethodEntry ClassifyMethod (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute? registerAttribute)
-		{
-			topType = topType ?? throw new ArgumentNullException (nameof (topType));
-			registeredMethod = registeredMethod ?? throw new ArgumentNullException (nameof (registeredMethod));
-			implementedMethod = implementedMethod ?? throw new ArgumentNullException (nameof (implementedMethod));
-			registerAttribute = registerAttribute ?? throw new ArgumentNullException (nameof (registerAttribute));
-
-			// Try to classify as a standard marshal method first
-			if (IsDynamicallyRegistered (topType, registeredMethod, implementedMethod, registerAttribute, out var marshalMethodEntry)) {
-				// Method must be registered dynamically at runtime
-				return new DynamicallyRegisteredMarshalMethodEntry (topType, implementedMethod, registeredMethod, registerAttribute);
-			}
-
-			// Method can be converted to a marshal method
-			return marshalMethodEntry;
-		}
-
-		// Helper methods for getting assembly path information for debugging/logging
-		/// <summary>
-		/// Gets assembly path information for a field, used in diagnostic messages.
-		/// </summary>
-		/// <param name="field">The field to get assembly information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (FieldDefinition? field)   => GetAssemblyPathInfo (field?.DeclaringType);
-		
-		/// <summary>
-		/// Gets assembly path information for a method, used in diagnostic messages.
-		/// </summary>
-		/// <param name="method">The method to get assembly information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (MethodDefinition? method) => GetAssemblyPathInfo (method?.DeclaringType);
-		
-		/// <summary>
-		/// Gets assembly path information for a type, used in diagnostic messages.
-		/// </summary>
-		/// <param name="type">The type to get assembly information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (TypeDefinition? type)     => GetAssemblyPathInfo (type?.Module?.Assembly);
-
-		/// <summary>
-		/// Gets assembly path information for an assembly definition, used in diagnostic messages.
-		/// </summary>
-		/// <param name="asmdef">The assembly definition to get path information for.</param>
-		/// <returns>A formatted string with assembly path and architecture information.</returns>
-		string GetAssemblyPathInfo (AssemblyDefinition? asmdef)
-		{
-			if (asmdef == null) {
-				return "[assembly definition missing]";
-			}
-
-			string? path = asmdef.MainModule.FileName;
-			if (String.IsNullOrEmpty (path)) {
-				path = "unknown";
-			}
-
-			return $"[Arch: {targetArch}; Assembly: {path}]";
-		}
-
-		/// <summary>
-		/// Determines whether a method must be registered dynamically or can be converted to a marshal method.
-		/// This method analyzes the [Register] attribute and validates the method's compatibility with
-		/// the marshal method system.
-		/// </summary>
-		/// <param name="topType">The top-level type that owns this method.</param>
-		/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual method implementation.</param>
-		/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-		/// <param name="marshalMethodEntry">
-		/// When this method returns false, contains the marshal method entry for the convertible method.
-		/// When this method returns true, this parameter is null.
-		/// </param>
-		/// <returns>
-		/// true if the method must be registered dynamically; false if it can be converted to a marshal method.
-		/// </returns>
-		bool IsDynamicallyRegistered (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute registerAttribute, [NotNullWhen (false)] out MarshalMethodEntry? marshalMethodEntry)
-		{
-			marshalMethodEntry = null;
-			
-			// The [Register] attribute must have exactly 3 arguments: JNI name, JNI signature, and connector
-			if (registerAttribute.ConstructorArguments.Count != 3) {
-				log.LogWarning ($"Method '{registeredMethod.FullName}' will be registered dynamically, not enough arguments to the [Register] attribute to generate marshal method.");
-				return true;
-			}
-
-			// Parse the connector information from the third argument
-			var connector = new ConnectorInfo ((string)registerAttribute.ConstructorArguments[2].Value);
-
-			// Try to classify as a standard handler (most common case)
-			if (IsStandardHandler (topType, connector, registeredMethod, implementedMethod, jniName: (string)registerAttribute.ConstructorArguments[0].Value, jniSignature: (string)registerAttribute.ConstructorArguments[1].Value, out marshalMethodEntry)) {
-				return false; // Method can be converted to marshal method
-			}
-
-			// Method cannot be converted, must be registered dynamically
-			log.LogWarning ($"Method '{registeredMethod.FullName}' will be registered dynamically {GetAssemblyPathInfo (registeredMethod)}");
-			return true;
-		}
-
-		/// <summary>
-		/// Determines whether a method follows the "standard handler" pattern and can be converted to a marshal method.
-		/// The standard handler pattern involves a native callback method, a connector method that returns a delegate,
-		/// and optionally a delegate backing field. This method performs extensive validation to ensure all
-		/// components exist and are compatible.
-		/// </summary>
-		/// <param name="topType">The top-level type that owns this method.</param>
-		/// <param name="connector">Information about the connector method parsed from the [Register] attribute.</param>
-		/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-		/// <param name="implementedMethod">The actual method implementation.</param>
-		/// <param name="jniName">The JNI method name from the [Register] attribute.</param>
-		/// <param name="jniSignature">The JNI method signature from the [Register] attribute.</param>
-		/// <param name="marshalMethodEntry">
-		/// When this method returns true, contains the marshal method entry for the convertible method.
-		/// When this method returns false, this parameter is null.
-		/// </param>
-		/// <returns>true if the method follows the standard handler pattern; false otherwise.</returns>
-		bool IsStandardHandler (TypeDefinition topType, ConnectorInfo connector, MethodDefinition registeredMethod, MethodDefinition implementedMethod, string jniName, string jniSignature, [NotNullWhen (true)] out MarshalMethodEntry? marshalMethodEntry)
-		{
-			marshalMethodEntry = null;
-
-			// Standard handler connector names must follow the pattern: "Get{Name}Handler"
-			const string HandlerNameStart = "Get";
-			const string HandlerNameEnd = "Handler";
-
-			string connectorName = connector.MethodName;
-			if (connectorName.Length < HandlerNameStart.Length + HandlerNameEnd.Length + 1 ||
-			    !connectorName.StartsWith (HandlerNameStart, StringComparison.Ordinal) ||
-			    !connectorName.EndsWith (HandlerNameEnd, StringComparison.Ordinal)) {
-				log.LogWarning ($"Connector name '{connectorName}' must start with '{HandlerNameStart}', end with '{HandlerNameEnd}' and have at least one character between the two parts.");
-				return false;
-			}
-
-			// Extract the core method name from the connector name
-			// e.g., "GetMyMethodHandler" -> "MyMethod"
-			// TODO: if we can't find native callback and/or delegate field using `callbackNameCore`, fall back to `jniName` (which is the first argument to the `[Register]`
-			// attribute). Or simply use `jniName` at once - needs testing.
-			string callbackNameCore = connectorName.Substring (HandlerNameStart.Length, connectorName.Length - HandlerNameStart.Length - HandlerNameEnd.Length);
-			
-			// Generate expected method and field names based on the core name
-			string nativeCallbackName = $"n_{callbackNameCore}";                           // e.g., "n_MyMethod"
-			string nativeConvertedCallbackName = $"n_{callbackNameCore}_mm_wrapper";       // e.g., "n_MyMethod_mm_wrapper"
-			string delegateFieldName = $"cb_{Char.ToLowerInvariant (callbackNameCore[0])}{callbackNameCore.Substring (1)}"; // e.g., "cb_myMethod"
-
-			// Find the type that contains the connector method
-			TypeDefinition connectorDeclaringType = connector.AssemblyName == null ? registeredMethod.DeclaringType : FindType (resolver.Resolve (connector.AssemblyName), connector.TypeName);
-
-			// Create a signature matcher to validate native callback methods
-			var ncbs = new NativeCallbackSignature (registeredMethod, log, tdCache);
-			
-			// Find the native callback method with matching signature
-			MethodDefinition nativeCallbackMethod = FindMethod (connectorDeclaringType, nativeCallbackName, ncbs);
-			if (nativeCallbackMethod == null) {
-				log.LogWarning ($"Unable to find native callback method '{nativeCallbackName}' in type '{connectorDeclaringType.FullName}', matching the '{registeredMethod.FullName}' signature (jniName: '{jniName}') {GetAssemblyPathInfo (connectorDeclaringType)}");
-				return false;
-			}
-
-			// Validate that the native callback can be used with [UnmanagedCallersOnly]
-			if (!EnsureIsValidUnmanagedCallersOnlyTarget (nativeCallbackMethod, out bool needsBlittableWorkaround)) {
-				return false;
-			}
-
-			// Look for a converted callback method (indicates the method has already been processed)
-			MethodDefinition? nativeConvertedCallbackMethod = FindMethod (connectorDeclaringType, nativeConvertedCallbackName, ncbs);
-
-			// Find the connector method that returns the delegate
-			MethodDefinition connectorMethod = FindMethod (connectorDeclaringType, connectorName);
-
-			// If the marshal method has already been converted, the connector method will have been removed
-			if (connectorMethod == null && nativeConvertedCallbackMethod == null) {
-				log.LogWarning ($"Connector method '{connectorName}' not found in type '{connectorDeclaringType.FullName}' {GetAssemblyPathInfo (connectorDeclaringType)}");
-				return false;
-			}
-
-			// Validate connector method return type
-			if (connectorMethod != null && !MonoAndroidHelper.StringEquals ("System.Delegate", connectorMethod.ReturnType.FullName)) {
-				log.LogWarning ($"Connector '{connectorName}' in type '{connectorDeclaringType.FullName}' has invalid return type, expected 'System.Delegate', found '{connectorMethod.ReturnType.FullName}' {GetAssemblyPathInfo (connectorDeclaringType)}");
-				return false;
-			}
-
-			// Find the delegate backing field (optional, but validates if present)
-			// In the standard handler "pattern", the native callback backing field is private, static and thus in the same type
-			// as the native callback.
-			FieldDefinition delegateField = FindField (nativeCallbackMethod.DeclaringType, delegateFieldName);
-			if (delegateField != null) {
-				if (!MonoAndroidHelper.StringEquals ("System.Delegate", delegateField.FieldType.FullName)) {
-					log.LogWarning ($"delegate field '{delegateFieldName}' in type '{nativeCallbackMethod.DeclaringType.FullName}' has invalid type, expected 'System.Delegate', found '{delegateField.FieldType.FullName}' {GetAssemblyPathInfo (delegateField)}");
-					return false;
-				}
-			}
-
-			// TODO: check where DeclaringType is lost between here and rewriter, for:
-			//
-			// The following debug output shows a complex inheritance scenario where the declaring type
-			// information gets lost between classification and rewriting. This needs investigation.
-			//
-			// Classifying:
-			//         method: Java.Lang.Object Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter::GetItem(System.Int32)
-			//         registered method: Java.Lang.Object Android.Widget.BaseAdapter::GetItem(System.Int32))
-			//         Attr: Android.Runtime.RegisterAttribute (parameter count: 3)
-			//         Top type: Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter
-			//         Managed type: Android.Widget.BaseAdapter, Mono.Android
-			//         connector: GetGetItem_IHandler (from spec: 'GetGetItem_IHandler')
-			//         connector name: GetGetItem_IHandler
-			//         native callback name: n_GetItem_I
-			//         delegate field name: cb_getItem_I
-			// ##G1: Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter -> crc640ec207abc449b2ca/ShellSearchViewAdapter
-			// ##G1: top type: Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter -> crc640ec207abc449b2ca/ShellSearchViewAdapter
-			// ##G1: connectorMethod: System.Delegate Android.Widget.BaseAdapter::GetGetItem_IHandler()
-			// ##G1: delegateField: System.Delegate Android.Widget.BaseAdapter::cb_getItem_I
-			//
-			// And in the rewriter:
-			//
-			//         System.IntPtr Android.Widget.BaseAdapter::n_GetItem_I(System.IntPtr,System.IntPtr,System.Int32) (token: 0x5fe3)
-			// Top type == 'Microsoft.Maui.Controls.Platform.Compatibility.ShellSearchViewAdapter'
-			// 	NativeCallback == 'System.IntPtr Android.Widget.BaseAdapter::n_GetItem_I(System.IntPtr,System.IntPtr,System.Int32)'
-			// 	Connector == 'System.Delegate GetGetItem_IHandler()'
-			// 	method.NativeCallback.CustomAttributes == Mono.Collections.Generic.Collection`1[Mono.Cecil.CustomAttribute]
-			// 	method.Connector.DeclaringType == 'null'
-			// 	method.Connector.DeclaringType.Methods == 'null'
-			// 	method.CallbackField == System.Delegate cb_getItem_I
-			// 	method.CallbackField?.DeclaringType == 'null'
-			// 	method.CallbackField?.DeclaringType.Fields == 'null'
-
-			// Create the appropriate marshal method entry based on whether the method has been converted
-			if (nativeConvertedCallbackMethod is null) {
-				// Standard marshal method entry
-				marshalMethodEntry =
-					new MarshalMethodEntry (
-						topType,
-						nativeCallbackMethod,
-						connectorMethod,
-						registeredMethod,
-						implementedMethod,
-						delegateField,
-						JavaNativeTypeManager.ToJniName (topType, tdCache),
-						jniName,
-						jniSignature,
-						needsBlittableWorkaround
-					);
-			} else {
-				// Converted marshal method entry (method has already been processed)
-				marshalMethodEntry =
-					new ConvertedMarshalMethodEntry (
-						topType,
-						nativeCallbackMethod,
-						connectorMethod,
-						registeredMethod,
-						implementedMethod,
-						delegateField,
-						JavaNativeTypeManager.ToJniName (topType, tdCache),
-						jniName,
-						jniSignature,
-						needsBlittableWorkaround,
-						nativeConvertedCallbackMethod
-					);
-			}
-
-			return true;
-		}
-
-		/// <summary>
-		/// Validates that a method is suitable for use with the [UnmanagedCallersOnly] attribute.
-		/// This attribute has strict requirements for method signatures and parameters that must be met
-		/// for marshal methods to work correctly.
-		/// </summary>
-		/// <param name="method">The method to validate.</param>
-		/// <param name="needsBlittableWorkaround">
-		/// When this method returns true, indicates whether the method requires a blittable workaround
-		/// due to non-blittable parameter or return types.
-		/// </param>
-		/// <returns>
-		/// true if the method can be used with [UnmanagedCallersOnly] (possibly with workarounds); 
-		/// false if it has incompatible characteristics.
-		/// </returns>
-		bool EnsureIsValidUnmanagedCallersOnlyTarget (MethodDefinition method, out bool needsBlittableWorkaround)
-		{
-			needsBlittableWorkaround = false;
-
-			// Requirements: https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0#remarks
-			
-			// Method must be static
-			if (!method.IsStatic) {
-				return LogReasonWhyAndReturnFailure ($"is not static");
-			}
-
-			// Method cannot have generic parameters
-			if (method.HasGenericParameters) {
-				return LogReasonWhyAndReturnFailure ($"has generic parameters");
-			}
-
-			// Check return type for blittability
-			TypeReference type;
-			if (!MonoAndroidHelper.StringEquals ("System.Void", method.ReturnType.FullName)) {
-				type = GetRealType (method.ReturnType);
-				if (!IsAcceptable (type)) {
-					needsBlittableWorkaround = true;
-					WarnWhy ($"has a non-blittable return type '{type.FullName}'");
-				}
-			}
-
-			// Declaring type cannot have generic parameters
-			if (method.DeclaringType.HasGenericParameters) {
-				return LogReasonWhyAndReturnFailure ($"is declared in a type with generic parameters");
-			}
-
-			// If method has no parameters, it's valid
-			if (!method.HasParameters) {
-				return true;
-			}
-
-			// Check each parameter for blittability
-			foreach (ParameterDefinition pdef in method.Parameters) {
-				type = GetRealType (pdef.ParameterType);
-
-				if (!IsAcceptable (type)) {
-					needsBlittableWorkaround = true;
-					WarnWhy ($"has a parameter ({pdef.Name}) of non-blittable type '{type.FullName}'");
-				}
-			}
-
-			return true;
-
-			/// <summary>
-			/// Determines if a type is acceptable for [UnmanagedCallersOnly] methods.
-			/// This includes blittable types and single-dimensional arrays of blittable types.
-			/// </summary>
-			/// <param name="type">The type to check.</param>
-			/// <returns>true if the type is acceptable; otherwise, false.</returns>
-			bool IsAcceptable (TypeReference type)
-			{
-				// Multi-dimensional arrays are not allowed
-				if (type.IsArray) {
-					var array = new ArrayType (type);
-					if (array.Rank > 1) {
-						return false;
-					}
-				}
-
-				return type.IsBlittable ();
-			}
-
-			/// <summary>
-			/// Gets the real type from a type reference, handling array types by returning their element type.
-			/// </summary>
-			/// <param name="type">The type reference to process.</param>
-			/// <returns>The element type for arrays, or the original type for non-arrays.</returns>
-			TypeReference GetRealType (TypeReference type)
-			{
-				if (type.IsArray) {
-					return type.GetElementType ();
-				}
-
-				return type;
-			}
-
-			/// <summary>
-			/// Logs a reason why a method cannot be used with [UnmanagedCallersOnly] and returns false.
-			/// </summary>
-			/// <param name="why">The reason why the method is not compatible.</param>
-			/// <returns>Always returns false.</returns>
-			bool LogReasonWhyAndReturnFailure (string why)
-			{
-				log.LogWarning ($"Method '{method.FullName}' {why}. It cannot be used with the `[UnmanagedCallersOnly]` attribute");
-				return false;
-			}
-
-			/// <summary>
-			/// Logs a warning about why a method needs a blittable workaround.
-			/// </summary>
-			/// <param name="why">The reason why a workaround is needed.</param>
-			void WarnWhy (string why)
-			{
-				// TODO: change to LogWarning once the generator can output code which requires no non-blittable wrappers
-				log.LogDebugMessage ($"Method '{method.FullName}' {why}. A workaround is required, this may make the application slower");
-			}
-		}
-
-		/// <summary>
-		/// Finds a type definition by name within an assembly. This method searches through
-		/// all modules in the assembly and handles nested types recursively.
-		/// </summary>
-		/// <param name="asm">The assembly to search in.</param>
-		/// <param name="typeName">The full name of the type to find.</param>
-		/// <returns>The type definition if found; otherwise, null.</returns>
-		TypeDefinition FindType (AssemblyDefinition asm, string typeName)
-		{
-			// Search through all modules in the assembly
-			foreach (ModuleDefinition md in asm.Modules) {
-				foreach (TypeDefinition td in md.Types) {
-					TypeDefinition match = GetMatchingType (td);
-					if (match != null) {
-						return match;
-					}
-				}
-			}
-
-			return null;
-
-			/// <summary>
-			/// Recursively searches for a type with the specified name, including nested types.
-			/// </summary>
-			/// <param name="def">The type definition to check.</param>
-			/// <returns>The matching type definition if found; otherwise, null.</returns>
-			TypeDefinition GetMatchingType (TypeDefinition def)
-			{
-				// Check if this type matches
-				if (MonoAndroidHelper.StringEquals (def.FullName, typeName)) {
-					return def;
-				}
-
-				// Search nested types if they exist
-				if (!def.HasNestedTypes) {
-					return null;
-				}
-
-				TypeDefinition ret;
-				foreach (TypeDefinition nested in def.NestedTypes) {
-					ret = GetMatchingType (nested);
-					if (ret != null) {
-						return ret;
-					}
-				}
-
-				return null;
-			}
-		}
-
-		/// <summary>
-		/// Finds a method definition by name within a type, optionally using a signature matcher.
-		/// This method searches the type hierarchy if the method is not found in the specified type.
-		/// </summary>
-		/// <param name="type">The type to search in.</param>
-		/// <param name="methodName">The name of the method to find.</param>
-		/// <param name="signatureMatcher">Optional signature matcher for additional validation.</param>
-		/// <returns>The method definition if found; otherwise, null.</returns>
-		MethodDefinition FindMethod (TypeDefinition type, string methodName, IMethodSignatureMatcher signatureMatcher = null)
-		{
-			// Search through all methods in the type
-			foreach (MethodDefinition method in type.Methods) {
-				// Skip unmanaged methods and constructors
-				if (!method.IsManaged || method.IsConstructor) {
-					continue;
-				}
-
-				// Check method name match
-				if (!MonoAndroidHelper.StringEquals (methodName, method.Name)) {
-					continue;
-				}
-
-				// Validate signature if matcher is provided
-				if (signatureMatcher == null || signatureMatcher.Matches (method)) {
-					return method;
-				}
-			}
-
-			// Search base type if method not found in current type
-			if (type.BaseType == null) {
-				return null;
-			}
-
-			return FindMethod (tdCache.Resolve (type.BaseType), methodName, signatureMatcher);
-		}
-
-		/// <summary>
-		/// Finds a field definition by name within a type, optionally searching inherited fields.
-		/// </summary>
-		/// <param name="type">The type to search in.</param>
-		/// <param name="fieldName">The name of the field to find.</param>
-		/// <param name="lookForInherited">Whether to search base types if the field is not found.</param>
-		/// <returns>The field definition if found; otherwise, null.</returns>
-		FieldDefinition FindField (TypeDefinition type, string fieldName, bool lookForInherited = false)
-		{
-			// Search through all fields in the type
-			foreach (FieldDefinition field in type.Fields) {
-				if (MonoAndroidHelper.StringEquals (field.Name, fieldName)) {
-					return field;
-				}
-			}
-
-			// Search base type if requested and available
-			if (!lookForInherited || type.BaseType == null) {
-				return null;
-			}
-
-			return FindField (tdCache.Resolve (type.BaseType), fieldName, lookForInherited);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs
deleted file mode 100644
index 8933f91df82..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsCollection.cs
+++ /dev/null
@@ -1,418 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Android.Runtime;
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.Diagnostics;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Collects and manages marshal methods from .NET assemblies, organizing them by type and
-/// determining which can be converted to native LLVM marshal methods versus those that
-/// must be registered dynamically. This class extends <see cref="JavaCallableMethodClassifier"/>
-/// to integrate with the Java callable wrapper generation pipeline.
-/// </summary>
-class MarshalMethodsCollection : JavaCallableMethodClassifier
-{
-	/// <summary>
-	/// Assemblies that contain convertible marshal methods. These assemblies need to
-	/// have the proper assembly references added to them.
-	/// </summary>
-	public HashSet<AssemblyDefinition> AssembliesWithMarshalMethods { get; } = [];
-
-	/// <summary>
-	/// Marshal methods that have already been rewritten as LLVM marshal methods.
-	/// </summary>
-	public IDictionary<string, IList<ConvertedMarshalMethodEntry>> ConvertedMarshalMethods { get; } = new Dictionary<string, IList<ConvertedMarshalMethodEntry>> (StringComparer.Ordinal);
-
-	/// <summary>
-	/// Marshal methods that cannot be rewritten and must be registered dynamically.
-	/// </summary>
-	public List<DynamicallyRegisteredMarshalMethodEntry> DynamicallyRegisteredMarshalMethods { get; } = [];
-
-	/// <summary>
-	/// Marshal methods that can be rewritten as LLVM marshal methods.
-	/// </summary>
-	public IDictionary<string, IList<MarshalMethodEntry>> MarshalMethods { get; } = new Dictionary<string, IList<MarshalMethodEntry>> (StringComparer.Ordinal);
-
-	readonly MarshalMethodsClassifier classifier;
-	readonly TaskLoggingHelper log;
-	readonly IAssemblyResolver resolver;
-	readonly HashSet<TypeDefinition> typesWithDynamicallyRegisteredMarshalMethods = [];
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="MarshalMethodsCollection"/> class.
-	/// </summary>
-	/// <param name="classifier">The marshal methods classifier to use for method classification.</param>
-	/// <exception cref="ArgumentNullException">Thrown when classifier is null.</exception>
-	public MarshalMethodsCollection (MarshalMethodsClassifier classifier)
-	{
-		this.classifier = classifier;
-		log = classifier.Log;
-		resolver = classifier.Resolver;
-	}
-
-	/// <summary>
-	/// Adds marshal method entries for special case methods that won't be detected by the 
-	/// standard JavaInterop type scanner. This primarily handles hand-written methods
-	/// like Java.Interop.TypeManager+JavaTypeManager::n_Activate.
-	/// </summary>
-	/// <remarks>
-	/// Special case methods are typically internal framework methods that don't follow
-	/// the standard Java callable wrapper patterns but still need marshal method generation.
-	/// </remarks>
-	public void AddSpecialCaseMethods ()
-	{
-		AddTypeManagerSpecialCaseMethods ();
-	}
-
-	/// <summary>
-	/// Checks a method for marshal method compatibility and adds it to the collection if suitable.
-	/// This method examines the [Register] attributes on the method and filters out Kotlin-mangled
-	/// methods that cannot be properly overridden.
-	/// </summary>
-	/// <param name="collection">The collection to add the method to.</param>
-	/// <param name="type">The top-level type that owns this method.</param>
-	/// <param name="registeredMethod">The method that was registered with [Register] attributes.</param>
-	/// <param name="implementedMethod">The actual method implementation.</param>
-	/// <param name="methodClassifier">The classifier to use for method classification.</param>
-	/// <param name="cache">The type definition cache for resolving types.</param>
-	static void CheckMethod (MarshalMethodsCollection collection, TypeDefinition type, MethodDefinition registeredMethod, MethodDefinition implementedMethod, MarshalMethodsClassifier methodClassifier, TypeDefinitionCache cache)
-	{
-		foreach (RegisterAttribute attr in CecilExtensions.GetMethodRegistrationAttributes (registeredMethod)) {
-			// Check for Kotlin-mangled methods that cannot be overridden
-			// These methods have names ending with "-impl" or contain a hyphen 8 characters from the end
-			if (attr.Name.Contains ("-impl") || (attr.Name.Length > 7 && attr.Name [attr.Name.Length - 8] == '-'))
-				continue;
-
-			collection.AddMethod (type, registeredMethod, implementedMethod, attr.OriginAttribute);
-		}
-	}
-
-	/// <summary>
-	/// Creates a <see cref="MarshalMethodsCollection"/> by scanning the specified assemblies for
-	/// marshal method candidates. This is the main entry point for building a complete collection
-	/// of marshal methods from a set of .NET assemblies.
-	/// </summary>
-	/// <param name="arch">The target Android architecture.</param>
-	/// <param name="assemblies">The list of assemblies to scan for marshal methods.</param>
-	/// <param name="resolver">The assembly resolver for loading referenced assemblies.</param>
-	/// <param name="log">The logging helper for diagnostic messages.</param>
-	/// <returns>A populated <see cref="MarshalMethodsCollection"/> containing all discovered marshal methods.</returns>
-	public static MarshalMethodsCollection FromAssemblies (AndroidTargetArch arch, List<ITaskItem> assemblies, XAAssemblyResolver resolver, TaskLoggingHelper log)
-	{
-		var cache = new TypeDefinitionCache ();
-		var classifier = new MarshalMethodsClassifier (cache, resolver, log);
-		var collection = new MarshalMethodsCollection (classifier);
-		var scanner = new XAJavaTypeScanner (arch, log, cache);
-
-		// Get all Java-callable types from the assemblies
-		var javaTypes = scanner.GetJavaTypes (assemblies, resolver);
-
-		// Scan each type for marshal method candidates
-		foreach (var type in javaTypes) {
-			// Skip interfaces and types that shouldn't have Java callable wrappers
-			if (type.IsInterface || JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (type, cache))
-				continue;
-
-			ScanTypeForMarshalMethods (type, collection, resolver, cache, log, classifier);
-		}
-
-		return collection;
-	}
-
-	/// <summary>
-	/// Scans a specific type definition for marshal method candidates, including both
-	/// direct methods and methods inherited from implemented interfaces.
-	/// </summary>
-	/// <param name="type">The type definition to scan.</param>
-	/// <param name="collection">The collection to add discovered marshal methods to.</param>
-	/// <param name="resolver">The assembly resolver for loading referenced types.</param>
-	/// <param name="cache">The type definition cache for resolving types.</param>
-	/// <param name="log">The logging helper for diagnostic messages.</param>
-	/// <param name="classifier">The classifier to use for method classification.</param>
-	static void ScanTypeForMarshalMethods (TypeDefinition type, MarshalMethodsCollection collection, XAAssemblyResolver resolver, TypeDefinitionCache cache, TaskLoggingHelper log, MarshalMethodsClassifier classifier)
-	{
-		// Scan direct methods (excluding constructors)
-		foreach (var minfo in type.Methods.Where (m => !m.IsConstructor)) {
-			var baseRegisteredMethod = CecilExtensions.GetBaseRegisteredMethod (minfo, cache);
-
-			if (baseRegisteredMethod is not null)
-				CheckMethod (collection, type, baseRegisteredMethod, minfo, classifier, cache);
-		}
-
-		// Scan methods from implemented interfaces
-		foreach (InterfaceImplementation ifaceInfo in type.Interfaces) {
-			var typeReference = ifaceInfo.InterfaceType;
-			var typeDefinition = cache.Resolve (typeReference);
-
-			if (typeDefinition is null) {
-				Diagnostic.Error (4204,
-					CecilExtensions.LookupSource (type),
-					Java.Interop.Localization.Resources.JavaCallableWrappers_XA4204,
-					typeReference.FullName);
-			}
-
-			// Only process interfaces that have [Register] attributes
-			if (!CecilExtensions.GetTypeRegistrationAttributes (typeDefinition).Any ())
-				continue;
-
-			// Check all non-static methods in the interface
-			foreach (MethodDefinition imethod in typeDefinition.Methods) {
-				if (imethod.IsStatic)
-					continue;
-
-				CheckMethod (collection, type, imethod, imethod, classifier, cache);
-			}
-		}
-	}
-
-	/// <summary>
-	/// Determines whether a method should be registered dynamically rather than converted to a marshal method.
-	/// This method is called by the Java callable wrapper generation pipeline to make registration decisions.
-	/// </summary>
-	/// <param name="topType">The top-level type that owns this method.</param>
-	/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-	/// <param name="implementedMethod">The actual method implementation.</param>
-	/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-	/// <returns>
-	/// true if the method should be registered dynamically; false if it can be converted to a marshal method.
-	/// </returns>
-	public override bool ShouldBeDynamicallyRegistered (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute? registerAttribute)
-	{
-		var method = AddMethod (topType, registeredMethod, implementedMethod, registerAttribute);
-
-		return method is DynamicallyRegisteredMarshalMethodEntry;
-	}
-
-	/// <summary>
-	/// Determines whether a type has any methods that must be registered dynamically.
-	/// This is used during code generation to decide whether to include dynamic registration logic.
-	/// </summary>
-	/// <param name="type">The type to check.</param>
-	/// <returns>true if the type has dynamically registered methods; otherwise, false.</returns>
-	public bool TypeHasDynamicallyRegisteredMethods (TypeDefinition type)
-	{
-		return typesWithDynamicallyRegisteredMarshalMethods.Contains (type);
-	}
-
-	/// <summary>
-	/// Adds a method to the appropriate collection based on its classification result.
-	/// This method coordinates with the classifier to determine the method's type and
-	/// stores it in the correct collection with proper tracking of associated assemblies.
-	/// </summary>
-	/// <param name="topType">The top-level type that owns this method.</param>
-	/// <param name="registeredMethod">The method that was registered with the [Register] attribute.</param>
-	/// <param name="implementedMethod">The actual method implementation.</param>
-	/// <param name="registerAttribute">The [Register] attribute applied to the method.</param>
-	/// <returns>The method entry that was added to the collection.</returns>
-	MethodEntry AddMethod (TypeDefinition topType, MethodDefinition registeredMethod, MethodDefinition implementedMethod, CustomAttribute? registerAttribute)
-	{
-		// Classify the method using the classifier
-		var marshalMethod = classifier.ClassifyMethod (topType, registeredMethod, implementedMethod, registerAttribute);
-
-		// Handle dynamically registered methods
-		if (marshalMethod is DynamicallyRegisteredMarshalMethodEntry dynamicMethod) {
-			DynamicallyRegisteredMarshalMethods.Add (dynamicMethod);
-			typesWithDynamicallyRegisteredMarshalMethods.Add (topType);
-
-			return dynamicMethod;
-		}
-
-		// Handle converted marshal methods (already processed)
-		if (marshalMethod is ConvertedMarshalMethodEntry convertedMethod) {
-			var key = convertedMethod.GetStoreMethodKey (classifier.TypeDefinitionCache);
-
-			if (!ConvertedMarshalMethods.TryGetValue (key, out var list)) {
-				list = new List<ConvertedMarshalMethodEntry> ();
-				ConvertedMarshalMethods.Add (key, list);
-			}
-
-			list.Add (convertedMethod);
-
-			return convertedMethod;
-		}
-
-		// Handle standard marshal methods
-		if (marshalMethod is MarshalMethodEntry marshalMethodEntry) {
-			var key = marshalMethodEntry.GetStoreMethodKey (classifier.TypeDefinitionCache);
-
-			if (!MarshalMethods.TryGetValue (key, out var list)) {
-				list = new List<MarshalMethodEntry> ();
-				MarshalMethods.Add (key, list);
-			}
-
-			list.Add (marshalMethodEntry);
-
-			// Track assemblies that contain marshal methods - these need special handling
-			AssembliesWithMarshalMethods.Add (marshalMethodEntry.NativeCallback.Module.Assembly);
-
-			if (marshalMethodEntry.Connector is not null)
-				AssembliesWithMarshalMethods.Add (marshalMethodEntry.Connector.Module.Assembly);
-
-			if (marshalMethodEntry.CallbackField is not null)
-				AssembliesWithMarshalMethods.Add (marshalMethodEntry.CallbackField.Module.Assembly);
-		}
-
-		return marshalMethod;
-	}
-
-	/// <summary>
-	/// Adds special case marshal methods for the TypeManager class. The TypeManager contains
-	/// hand-written native callback methods that are essential for the Android runtime but
-	/// don't follow the standard Java callable wrapper patterns.
-	/// </summary>
-	/// <remarks>
-	/// The TypeManager's n_Activate method is critical for object activation in the Android runtime.
-	/// This method manually creates marshal method entries for these special cases that would
-	/// otherwise be missed by the standard type scanning process.
-	/// </remarks>
-	void AddTypeManagerSpecialCaseMethods ()
-	{
-		const string FullTypeName = "Java.Interop.TypeManager+JavaTypeManager, Mono.Android";
-
-		// Resolve the TypeManager types from Mono.Android
-		AssemblyDefinition? monoAndroid = resolver.Resolve ("Mono.Android");
-		TypeDefinition? typeManager = monoAndroid?.MainModule.FindType ("Java.Interop.TypeManager");
-		TypeDefinition? javaTypeManager = typeManager?.GetNestedType ("JavaTypeManager");
-
-		if (javaTypeManager == null) {
-			throw new InvalidOperationException ($"Internal error: unable to find the {FullTypeName} type in the Mono.Android assembly");
-		}
-
-		MethodDefinition? nActivate_mm = null;
-		MethodDefinition? nActivate = null;
-
-		// Find the n_Activate methods - both the marshal method and the original
-		foreach (MethodDefinition method in javaTypeManager.Methods) {
-			if (nActivate_mm == null && IsMatchingMethod (method, "n_Activate_mm")) {
-				// Ensure the marshal method has the [UnmanagedCallersOnly] attribute
-				if (method.GetCustomAttributes ("System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute").Any (cattr => cattr != null)) {
-					nActivate_mm = method;
-				} else {
-					log.LogWarning ($"Method '{method.FullName}' isn't decorated with the UnmanagedCallersOnly attribute");
-					continue;
-				}
-			}
-
-			if (nActivate == null && IsMatchingMethod (method, "n_Activate")) {
-				nActivate = method;
-			}
-
-			// Stop searching once we've found both methods
-			if (nActivate_mm != null && nActivate != null) {
-				break;
-			}
-		}
-
-		// Ensure we found the required methods
-		if (nActivate_mm == null) {
-			ThrowMissingMethod ("nActivate_mm");
-		}
-
-		if (nActivate == null) {
-			ThrowMissingMethod ("nActivate");
-		}
-
-		// Extract JNI information from [Register] attributes
-		string? jniTypeName = null;
-		foreach (CustomAttribute cattr in javaTypeManager.GetCustomAttributes ("Android.Runtime.RegisterAttribute")) {
-			if (cattr.ConstructorArguments.Count != 1) {
-				log.LogDebugMessage ($"[Register] attribute on type '{FullTypeName}' is expected to have 1 constructor argument, found {cattr.ConstructorArguments.Count}");
-				continue;
-			}
-
-			jniTypeName = (string) cattr.ConstructorArguments [0].Value;
-			if (!String.IsNullOrEmpty (jniTypeName)) {
-				break;
-			}
-		}
-
-		string? jniMethodName = null;
-		string? jniSignature = null;
-		foreach (CustomAttribute cattr in nActivate.GetCustomAttributes ("Android.Runtime.RegisterAttribute")) {
-			if (cattr.ConstructorArguments.Count != 3) {
-				log.LogDebugMessage ($"[Register] attribute on method '{nActivate.FullName}' is expected to have 3 constructor arguments, found {cattr.ConstructorArguments.Count}");
-				continue;
-			}
-
-			jniMethodName = (string) cattr.ConstructorArguments [0].Value;
-			jniSignature = (string) cattr.ConstructorArguments [1].Value;
-
-			if (!String.IsNullOrEmpty (jniMethodName) && !String.IsNullOrEmpty (jniSignature)) {
-				break;
-			}
-		}
-
-		// Validate that we have all required JNI information
-		bool missingInfo = false;
-		if (String.IsNullOrEmpty (jniTypeName)) {
-			missingInfo = true;
-			log.LogDebugMessage ($"Failed to obtain Java type name from the [Register] attribute on type '{FullTypeName}'");
-		}
-
-		if (String.IsNullOrEmpty (jniMethodName)) {
-			missingInfo = true;
-			log.LogDebugMessage ($"Failed to obtain Java method name from the [Register] attribute on method '{nActivate.FullName}'");
-		}
-
-		if (String.IsNullOrEmpty (jniSignature)) {
-			missingInfo = true;
-			log.LogDebugMessage ($"Failed to obtain Java method signature from the [Register] attribute on method '{nActivate.FullName}'");
-		}
-
-		if (missingInfo) {
-			throw new InvalidOperationException ($"Missing information while constructing marshal method for the '{nActivate_mm.FullName}' method");
-		}
-
-		// Create the special case marshal method entry
-		var entry = new MarshalMethodEntry (javaTypeManager, nActivate_mm, jniTypeName!, jniMethodName!, jniSignature!);  // NRT- Guarded above
-		MarshalMethods.Add (".:!SpEcIaL:Java.Interop.TypeManager+JavaTypeManager::n_Activate_mm", new List<MarshalMethodEntry> { entry });
-
-		/// <summary>
-		/// Throws an exception indicating that a required method was not found.
-		/// This is a local function used for error handling within AddTypeManagerSpecialCaseMethods.
-		/// </summary>
-		/// <param name="name">The name of the missing method.</param>
-		[DoesNotReturn]
-		void ThrowMissingMethod (string name)
-		{
-			throw new InvalidOperationException ($"Internal error: unable to find the '{name}' method in the '{FullTypeName}' type");
-		}
-
-		/// <summary>
-		/// Checks if a method matches the expected criteria for TypeManager special case methods.
-		/// The method must have the correct name, be static, and be private.
-		/// </summary>
-		/// <param name="method">The method to check.</param>
-		/// <param name="name">The expected method name.</param>
-		/// <returns>true if the method matches all criteria; otherwise, false.</returns>
-		bool IsMatchingMethod (MethodDefinition method, string name)
-		{
-			if (!MonoAndroidHelper.StringEquals (name, method.Name)) {
-				return false;
-			}
-
-			if (!method.IsStatic) {
-				log.LogWarning ($"Method '{method.FullName}' is not static");
-				return false;
-			}
-
-			if (!method.IsPrivate) {
-				log.LogWarning ($"Method '{method.FullName}' is not private");
-				return false;
-			}
-
-			return true;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs
deleted file mode 100644
index 9c24e13fd58..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsHelpers.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-
-using Mono.Cecil;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Provides helper methods for working with marshal methods, particularly for
-	/// determining type blittability and compatibility with native interop.
-	/// </summary>
-	static class MarshalMethodsHelpers
-	{
-		/// <summary>
-		/// Set of .NET types that are blittable (can be directly passed between managed and native code
-		/// without marshaling). Based on Microsoft's documentation for blittable and non-blittable types.
-		/// </summary>
-		/// <remarks>
-		/// Reference: https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types
-		/// Blittable types have the same representation in managed and unmanaged memory and can be
-		/// passed directly without marshaling overhead.
-		/// </remarks>
-		// From: https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types
-		static readonly HashSet<string> blittableTypes = new HashSet<string> (StringComparer.Ordinal) {
-			"System.Byte",
-			"System.SByte",
-			"System.Int16",
-			"System.UInt16",
-			"System.Int32",
-			"System.UInt32",
-			"System.Int64",
-			"System.UInt64",
-			"System.IntPtr",
-			"System.UIntPtr",
-			"System.Single",
-			"System.Double",
-		};
-
-		/// <summary>
-		/// Extension method that determines whether a type reference represents a blittable type.
-		/// Blittable types can be passed directly between managed and native code without marshaling,
-		/// making them ideal for use in marshal methods and [UnmanagedCallersOnly] methods.
-		/// </summary>
-		/// <param name="type">The type reference to check for blittability.</param>
-		/// <returns>true if the type is blittable; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="type"/> is null.</exception>
-		/// <remarks>
-		/// This method only checks the type name against a predefined set of known blittable types.
-		/// It does not perform deep analysis of structs or other complex types that might also be blittable.
-		/// </remarks>
-		public static bool IsBlittable (this TypeReference type)
-		{
-			if (type == null) {
-				throw new ArgumentNullException (nameof (type));
-			}
-
-			return blittableTypes.Contains (type.FullName);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
index c82b689738c..53a165ca1c1 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
@@ -1,20 +1,80 @@
-#nullable enable
+using System;
 using System.Collections.Generic;
 using Microsoft.Build.Utilities;
-using Xamarin.Android.Tools;
+using Xamarin.Android.Tasks.LLVMIR;
 
 namespace Xamarin.Android.Tasks;
 
-class MarshalMethodsNativeAssemblyGenerator : MarshalMethodsNativeAssemblyGeneratorBase
+// The native host still expects xamarin_app_init even though marshal methods are disabled.
+class MarshalMethodsNativeAssemblyGenerator : LlvmIrComposer
 {
-	/// <summary>
-	/// Constructor to be used ONLY when marshal methods are DISABLED
-	/// </summary>
-	public MarshalMethodsNativeAssemblyGenerator (TaskLoggingHelper log, AndroidTargetArch targetArch, ICollection<string> uniqueAssemblyNames)
-		: base (log, targetArch, uniqueAssemblyNames)
+	[NativeClass]
+	sealed class _JNIEnv
 	{}
 
-	public MarshalMethodsNativeAssemblyGenerator (TaskLoggingHelper log, ICollection<string> uniqueAssemblyNames, NativeCodeGenStateObject codeGenState)
-		: base (log, uniqueAssemblyNames, codeGenState)
+	public MarshalMethodsNativeAssemblyGenerator (TaskLoggingHelper log) : base (log)
 	{}
+
+	protected override void Construct (LlvmIrModule module)
+	{
+		module.DefaultStringGroup = "mm";
+
+		var getFunctionPtrVariable = module.AddGlobalVariable (
+			typeof (IntPtr),
+			"get_function_pointer",
+			null,
+			LlvmIrVariableOptions.LocalWritableInsignificantAddr,
+			" get_function_pointer (uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr)"
+		);
+
+		var initParams = new List<LlvmIrFunctionParameter> {
+			new (typeof (_JNIEnv), "env") {
+				NoCapture = true,
+				NoUndef = true,
+				ReadNone = true,
+			},
+			new (typeof (IntPtr), "fn") {
+				NoUndef = true,
+			},
+		};
+
+		var initSignature = new LlvmIrFunctionSignature (
+			name: "xamarin_app_init",
+			returnType: typeof (void),
+			parameters: initParams
+		);
+
+		var attributes = module.AddAttributeSet (new LlvmIrFunctionAttributeSet {
+			new MustprogressFunctionAttribute (),
+			new NofreeFunctionAttribute (),
+			new NorecurseFunctionAttribute (),
+			new NosyncFunctionAttribute (),
+			new NounwindFunctionAttribute (),
+			new WillreturnFunctionAttribute (),
+			new MemoryFunctionAttribute {
+				Default = MemoryAttributeAccessKind.Write,
+				Argmem = MemoryAttributeAccessKind.None,
+				InaccessibleMem = MemoryAttributeAccessKind.None,
+			},
+			new UwtableFunctionAttribute (),
+			new MinLegalVectorWidthFunctionAttribute (0),
+			new NoTrappingMathFunctionAttribute (true),
+			new StackProtectorBufferSizeFunctionAttribute (8),
+		});
+		var init = new LlvmIrFunction (initSignature, attributes);
+
+		// Name these variables so LLVM's unnamed labels remain sequential.
+		var fnNullResult = init.CreateLocalVariable (typeof (bool), "fnIsNull");
+		LlvmIrVariable putsResult = init.CreateLocalVariable (typeof (int), "putsResult");
+		var ifThenInstructions = new List<LlvmIrInstruction> {
+			module.CreatePuts ("get_function_pointer MUST be specified\n", putsResult),
+			module.CreateAbort (),
+			new LlvmIrInstructions.Unreachable (),
+		};
+
+		module.AddIfThenElse (init, fnNullResult, LlvmIrIcmpCond.Equal, initParams [1], null, ifThenInstructions);
+		init.Body.Store (initParams [1], getFunctionPtrVariable, module.TbaaAnyPointer);
+		init.Body.Ret (typeof (void));
+		module.Add (init);
+	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs
deleted file mode 100644
index aba0e7c7db6..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGeneratorBase.cs
+++ /dev/null
@@ -1,919 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tasks.LLVMIR;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks
-{
-	abstract partial class MarshalMethodsNativeAssemblyGeneratorBase : LlvmIrComposer
-	{
-		const string GetFunctionPointerVariableName = "get_function_pointer";
-
-		// This is here only to generate strongly-typed IR
-		internal sealed class MonoClass
-		{}
-
-		[NativeClass]
-		sealed class _JNIEnv
-		{}
-
-		// Empty class must have at least one member so that the class address can be obtained
-		[NativeClass]
-		class _jobject
-		{
-#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value - likely populated by native code
-			public byte b;
-#pragma warning restore CS0649
-		}
-
-		sealed class _jclass : _jobject
-		{}
-
-		sealed class _jstring : _jobject
-		{}
-
-		sealed class _jthrowable : _jobject
-		{}
-
-		class _jarray : _jobject
-		{}
-
-		sealed class _jobjectArray : _jarray
-		{}
-
-		sealed class _jbooleanArray : _jarray
-		{}
-
-		sealed class _jbyteArray : _jarray
-		{}
-
-		sealed class _jcharArray : _jarray
-		{}
-
-		sealed class _jshortArray : _jarray
-		{}
-
-		sealed class _jintArray : _jarray
-		{}
-
-		sealed class _jlongArray : _jarray
-		{}
-
-		sealed class _jfloatArray : _jarray
-		{}
-
-		sealed class _jdoubleArray : _jarray
-		{}
-
-		protected sealed class MarshalMethodInfo
-		{
-			public MarshalMethodEntryObject Method          { get; }
-			public string NativeSymbolName                  { get; set; }
-			public List<LlvmIrFunctionParameter> Parameters { get; }
-			public Type ReturnType                          { get; }
-			public uint ClassCacheIndex                     { get; }
-
-			// This one isn't known until the generation time, which happens after we instantiate the class
-			// in Init and it may be different between architectures/ABIs, hence it needs to be settable from
-			// the outside.
-			public uint AssemblyCacheIndex                  { get; set; }
-
-			public MarshalMethodInfo (MarshalMethodEntryObject method, Type returnType, string nativeSymbolName, int classCacheIndex)
-			{
-				Method = method ?? throw new ArgumentNullException (nameof (method));
-				ReturnType = returnType ?? throw new ArgumentNullException (nameof (returnType));
-				if (String.IsNullOrEmpty (nativeSymbolName)) {
-					throw new ArgumentException ("must not be null or empty", nameof (nativeSymbolName));
-				}
-				NativeSymbolName = nativeSymbolName;
-				Parameters = new List<LlvmIrFunctionParameter> {
-					new LlvmIrFunctionParameter (typeof (_JNIEnv), "env"), // JNIEnv *env
-					new LlvmIrFunctionParameter (typeof (_jclass), "klass"), // jclass klass
-				};
-				ClassCacheIndex = (uint)classCacheIndex;
-			}
-		}
-
-		sealed class MarshalMethodsManagedClassDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var klass = EnsureType<MarshalMethodsManagedClass> (data);
-
-				if (MonoAndroidHelper.StringEquals ("token", fieldName)) {
-					return $" class name: {klass.ClassName}";
-				}
-
-				return String.Empty;
-			}
-		}
-
-		[NativeAssemblerStructContextDataProvider (typeof(MarshalMethodsManagedClassDataProvider))]
-		protected sealed class MarshalMethodsManagedClass
-		{
-			[NativeAssembler (UsesDataProvider = true, NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-			public uint       token;
-
-			[NativePointer (IsNull = true)]
-			public MonoClass  klass;
-
-			[NativeAssembler (Ignore = true)]
-			public string ClassName;
-		};
-
-		protected sealed class AssemblyCacheState
-		{
-			public Dictionary<string, uint> AsmNameToIndexData32 = new (StringComparer.Ordinal);
-			public Dictionary<uint, (string name, uint index)> Hashes32 = new ();
-			public List<uint> Keys32 = [];
-			public List<uint> Indices32 = new ();
-
-			public Dictionary<string, uint> AsmNameToIndexData64 = new (StringComparer.Ordinal);
-			public Dictionary<ulong, (string name, uint index)> Hashes64 = new ();
-			public List<ulong> Keys64 = [];
-			public List<uint> Indices64 = new ();
-		}
-
-		sealed class MarshalMethodsWriteState
-		{
-			public AssemblyCacheState AssemblyCacheState;
-			public LlvmIrFunctionAttributeSet AttributeSet;
-			public Dictionary<string, ulong> UniqueAssemblyId;
-			public Dictionary<string, LlvmIrVariable> UsedBackingFields;
-			public LlvmIrVariable GetFunctionPtrVariable;
-			public LlvmIrFunction GetFunctionPtrFunction;
-		}
-
-		sealed class MarshalMethodAssemblyIndexValuePlaceholder : LlvmIrInstructionArgumentValuePlaceholder
-		{
-			MarshalMethodInfo mmi;
-			AssemblyCacheState acs;
-
-			public MarshalMethodAssemblyIndexValuePlaceholder (MarshalMethodInfo mmi, AssemblyCacheState acs)
-			{
-				this.mmi = mmi;
-				this.acs = acs;
-			}
-
-			public override object? GetValue (LlvmIrModuleTarget target)
-			{
-				// What a monstrosity...
-				string asmName = mmi.Method.NativeCallback.DeclaringType.Module.Assembly.NameName;
-				Dictionary<string, uint> asmNameToIndex = target.Is64Bit ? acs.AsmNameToIndexData64 : acs.AsmNameToIndexData32;
-				if (!asmNameToIndex.TryGetValue (asmName, out uint asmIndex)) {
-					throw new InvalidOperationException ($"Unable to translate assembly name '{asmName}' to its index");
-				}
-				return asmIndex;
-			}
-		}
-
-		static readonly Dictionary<char, Type> jniSimpleTypeMap = new Dictionary<char, Type> {
-			{ 'Z', typeof(bool) },
-			{ 'B', typeof(byte) },
-			{ 'C', typeof(char) },
-			{ 'S', typeof(short) },
-			{ 'I', typeof(int) },
-			{ 'J', typeof(long) },
-			{ 'F', typeof(float) },
-			{ 'D', typeof(double) },
-		};
-
-		static readonly Dictionary<char, Type> jniArrayTypeMap = new Dictionary<char, Type> {
-			{ 'Z', typeof(_jbooleanArray) },
-			{ 'B', typeof(_jbyteArray) },
-			{ 'C', typeof(_jcharArray) },
-			{ 'S', typeof(_jshortArray) },
-			{ 'I', typeof(_jintArray) },
-			{ 'J', typeof(_jlongArray) },
-			{ 'F', typeof(_jfloatArray) },
-			{ 'D', typeof(_jdoubleArray) },
-			{ 'L', typeof(_jobjectArray) },
-		};
-
-		readonly ICollection<string> uniqueAssemblyNames;
-
-		StructureInfo marshalMethodsManagedClassStructureInfo;
-
-		List<MarshalMethodInfo> methods;
-		protected List<StructureInstance<MarshalMethodsManagedClass>> classes = new List<StructureInstance<MarshalMethodsManagedClass>> ();
-
-#pragma warning disable CS0414 // Field is assigned but its value is never used - might be used for debugging or future functionality
-		readonly LlvmIrCallMarker defaultCallMarker;
-#pragma warning restore CS0414
-		readonly bool generateEmptyCode;
-		readonly AndroidTargetArch targetArch;
-		readonly NativeCodeGenStateObject? codeGenState;
-
-		protected bool GenerateEmptyCode => generateEmptyCode;
-		protected List<MarshalMethodInfo> Methods => methods;
-
-		/// <summary>
-		/// Constructor to be used ONLY when marshal methods are DISABLED
-		/// </summary>
-		protected MarshalMethodsNativeAssemblyGeneratorBase (TaskLoggingHelper log, AndroidTargetArch targetArch, ICollection<string> uniqueAssemblyNames)
-			: base (log)
-		{
-			this.targetArch = targetArch;
-			this.uniqueAssemblyNames = uniqueAssemblyNames ?? throw new ArgumentNullException (nameof (uniqueAssemblyNames));
-			generateEmptyCode = true;
-			defaultCallMarker = LlvmIrCallMarker.Tail;
-		}
-
-		/// <summary>
-		/// Constructor to be used ONLY when marshal methods are ENABLED
-		/// </summary>
-		protected MarshalMethodsNativeAssemblyGeneratorBase (TaskLoggingHelper log, ICollection<string> uniqueAssemblyNames, NativeCodeGenStateObject codeGenState)
-			: base (log)
-		{
-			this.uniqueAssemblyNames = uniqueAssemblyNames ?? throw new ArgumentNullException (nameof (uniqueAssemblyNames));
-			this.codeGenState = codeGenState ?? throw new ArgumentNullException (nameof (codeGenState));
-
-			generateEmptyCode = false;
-			defaultCallMarker = LlvmIrCallMarker.Tail;
-		}
-
-		void Init ()
-		{
-			if (generateEmptyCode || codeGenState.MarshalMethods.Count == 0) {
-				return;
-			}
-
-			var seenClasses = new Dictionary<string, int> (StringComparer.Ordinal);
-			var allMethods = new List<MarshalMethodInfo> ();
-			IDictionary<string, IList<MarshalMethodEntryObject>> marshalMethods = codeGenState.MarshalMethods;
-
-			// It's possible that several otherwise different methods (from different classes, but with the same
-			// names and similar signatures) will actually share the same **short** native symbol name. In this case we must
-			// ensure that they all use long symbol names.  This has to be done as a post-processing step, after we
-			// have already iterated over the entire method collection.
-			//
-			// A handful of examples from the Hello World MAUI app:
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onActionItemClicked
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean Android.Views.ActionMode/ICallback::OnActionItemClicked(Android.Views.ActionMode,Android.Views.IMenuItem))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean AndroidX.AppCompat.View.ActionMode/ICallback::OnActionItemClicked(AndroidX.AppCompat.View.ActionMode,Android.Views.IMenuItem))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onActionItemClicked__Landroidx_appcompat_view_ActionMode_2Landroid_view_MenuItem_2
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onCreateActionMode
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean Android.Views.ActionMode/ICallback::OnCreateActionMode(Android.Views.ActionMode,Android.Views.IMenu))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean AndroidX.AppCompat.View.ActionMode/ICallback::OnCreateActionMode(AndroidX.AppCompat.View.ActionMode,Android.Views.IMenu))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onCreateActionMode__Landroidx_appcompat_view_ActionMode_2Landroid_view_Menu_2
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onDestroyActionMode
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Void Android.Views.ActionMode/ICallback::OnDestroyActionMode(Android.Views.ActionMode))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Void AndroidX.AppCompat.View.ActionMode/ICallback::OnDestroyActionMode(AndroidX.AppCompat.View.ActionMode))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onDestroyActionMode__Landroidx_appcompat_view_ActionMode_2
-			//
-			// Overloaded MM: Java_crc64e1fb321c08285b90_CellAdapter_n_1onPrepareActionMode
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean Android.Views.ActionMode/ICallback::OnPrepareActionMode(Android.Views.ActionMode,Android.Views.IMenu))
-			//   implemented in: Microsoft.Maui.Controls.Handlers.Compatibility.CellAdapter (System.Boolean AndroidX.AppCompat.View.ActionMode/ICallback::OnPrepareActionMode(AndroidX.AppCompat.View.ActionMode,Android.Views.IMenu))
-			//   new native symbol name: Java_crc64e1fb321c08285b90_CellAdapter_n_1onPrepareActionMode__Landroidx_appcompat_view_ActionMode_2Landroid_view_Menu_2
-			//
-			var overloadedNativeSymbolNames = new Dictionary<string, List<MarshalMethodInfo>> (StringComparer.Ordinal);
-			foreach (IList<MarshalMethodEntryObject> entryList in marshalMethods.Values) {
-				bool useFullNativeSignature = entryList.Count > 1;
-				foreach (MarshalMethodEntryObject entry in entryList) {
-					Log.LogDebugMessage ($"MM: processing {entry.DeclaringType.FullName} {entry.NativeCallback.FullName}");
-					ProcessAndAddMethod (allMethods, entry, useFullNativeSignature, seenClasses, overloadedNativeSymbolNames);
-				}
-			}
-
-			foreach (List<MarshalMethodInfo> mmiList in overloadedNativeSymbolNames.Values) {
-				if (mmiList.Count <= 1) {
-					continue;
-				}
-
-				foreach (MarshalMethodInfo overloadedMethod in mmiList) {
-					overloadedMethod.NativeSymbolName = MakeNativeSymbolName (overloadedMethod.Method, useFullNativeSignature: true);
-				}
-			}
-
-			// In some cases it's possible that a single type implements two different interfaces which have methods with the same native signature:
-			//
-			//   Microsoft.Maui.Controls.Handlers.TabbedPageManager/Listeners
-			//      System.Void AndroidX.ViewPager.Widget.ViewPager/IOnPageChangeListener::OnPageSelected(System.Int32)
-			//      System.Void AndroidX.ViewPager2.Widget.ViewPager2/OnPageChangeCallback::OnPageSelected(System.Int32)
-			//
-			// Both of the above methods will have the same native implementation and symbol name. e.g. (Java type name being `crc649ff77a65592e7d55/TabbedPageManager_Listeners`):
-			//     Java_crc649ff77a65592e7d55_TabbedPageManager_1Listeners_n_1onPageSelected__I
-			//
-			// We need to de-duplicate the entries or the generated native code will fail to build.
-			var seenNativeSymbols = new HashSet<string> (StringComparer.Ordinal);
-			methods = new List<MarshalMethodInfo> ();
-
-			foreach (MarshalMethodInfo method in allMethods) {
-				if (seenNativeSymbols.Contains (method.NativeSymbolName)) {
-					Log.LogDebugMessage ($"Removed MM duplicate '{method.NativeSymbolName}' (implemented: {method.Method.ImplementedMethod.FullName}; registered: {method.Method.RegisteredMethod.FullName}");
-					continue;
-				}
-
-				seenNativeSymbols.Add (method.NativeSymbolName);
-				methods.Add (method);
-			}
-		}
-
-		string MakeNativeSymbolName (MarshalMethodEntryObject entry, bool useFullNativeSignature)
-		{
-			var sb = new StringBuilder ("Java_");
-			sb.Append (MangleForJni (entry.JniTypeName));
-			sb.Append ('_');
-			sb.Append (MangleForJni ($"n_{entry.JniMethodName}"));
-
-			if (useFullNativeSignature) {
-				string signature = entry.JniMethodSignature;
-				if (signature.Length < 2) {
-					ThrowInvalidSignature (signature, "must be at least two characters long");
-				}
-
-				if (signature[0] != '(') {
-					ThrowInvalidSignature (signature, "must start with '('");
-				}
-
-				int sigEndIdx = signature.LastIndexOf (')');
-				if (sigEndIdx < 1) { // the first position where ')' can appear is 1, for a method without parameters
-					ThrowInvalidSignature (signature, "missing closing parenthesis");
-				}
-
-				string sigParams = signature.Substring (1, sigEndIdx - 1);
-				bool haveParams = sigParams.Length > 0;
-				if (useFullNativeSignature || haveParams) {
-					// We always append the underscores for overloaded methods, see https://github.com/dotnet/android/issues/10417#issuecomment-3210789627
-					// for the reason why
-					sb.Append ("__");
-					if (haveParams) {
-						sb.Append (MangleForJni (sigParams));
-					}
-				}
-			}
-
-			return sb.ToString ();
-
-			void ThrowInvalidSignature (string signature, string reason)
-			{
-				throw new InvalidOperationException ($"Invalid JNI signature '{signature}': {reason}");
-			}
-		}
-
-		void ProcessAndAddMethod (List<MarshalMethodInfo> allMethods, MarshalMethodEntryObject entry, bool useFullNativeSignature, Dictionary<string, int> seenClasses, Dictionary<string, List<MarshalMethodInfo>> overloadedNativeSymbolNames)
-		{
-			MarshalMethodEntryMethodObject nativeCallback = entry.NativeCallback;
-			string nativeSymbolName = MakeNativeSymbolName (entry, useFullNativeSignature);
-			string klass = $"{nativeCallback.DeclaringType.FullName}, {nativeCallback.DeclaringType.Module.Assembly.FullName}";
-
-			if (!seenClasses.TryGetValue (klass, out int classIndex)) {
-				classIndex = classes.Count;
-				seenClasses.Add (klass, classIndex);
-
-				var mc = new MarshalMethodsManagedClass {
-					token = nativeCallback.DeclaringType.MetadataToken,
-					ClassName = klass,
-				};
-
-				classes.Add (new StructureInstance<MarshalMethodsManagedClass> (marshalMethodsManagedClassStructureInfo, mc));
-			}
-
-			// Methods with `IsSpecial == true` are "synthetic" methods - they contain only the callback reference
-			(Type returnType, List<LlvmIrFunctionParameter>? parameters) = ParseJniSignature (entry.JniMethodSignature, entry.IsSpecial ? entry.NativeCallback : entry.ImplementedMethod);
-
-			var method = new MarshalMethodInfo (entry, returnType, nativeSymbolName: nativeSymbolName, classIndex);
-			if (parameters != null && parameters.Count > 0) {
-				method.Parameters.AddRange (parameters);
-			}
-
-			if (!overloadedNativeSymbolNames.TryGetValue (method.NativeSymbolName, out List<MarshalMethodInfo> overloadedMethods)) {
-				overloadedMethods = new List<MarshalMethodInfo> ();
-				overloadedNativeSymbolNames.Add (method.NativeSymbolName, overloadedMethods);
-			}
-			overloadedMethods.Add (method);
-
-			allMethods.Add (method);
-		}
-
-		string MangleForJni (string name)
-		{
-			var sb = new StringBuilder ();
-
-			foreach (char ch in name) {
-				switch (ch) {
-					case '/':
-					case '.':
-						sb.Append ('_');
-						break;
-
-					case '_':
-						sb.Append ("_1");
-						break;
-
-					case ';':
-						sb.Append ("_2");
-						break;
-
-					case '[':
-						sb.Append ("_3");
-						break;
-
-					default:
-						if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9')) {
-							sb.Append (ch);
-						} else {
-							sb.Append ("_0");
-							sb.Append (((int)ch).ToString ("x04"));
-						}
-						break;
-				}
-			}
-
-			return sb.ToString ();
-		}
-
-		(Type returnType, List<LlvmIrFunctionParameter>? functionParams) ParseJniSignature (string signature, MarshalMethodEntryMethodObject implementedMethod)
-		{
-			Type returnType = null;
-			List<LlvmIrFunctionParameter>? parameters = null;
-			bool paramsDone = false;
-			int idx = 0;
-			while (!paramsDone && idx < signature.Length) {
-				char jniType = signature[idx];
-
-				if (jniType == '(') {
-					idx++;
-					continue;
-				}
-
-				if (jniType == ')') {
-					paramsDone = true;
-					continue;
-				}
-
-				Type? managedType = JniTypeToManaged (jniType);
-				if (managedType != null) {
-					AddParameter (managedType);
-					continue;
-				}
-
-				throw new InvalidOperationException ($"Unsupported JNI type '{jniType}' at position {idx} of signature '{signature}'");
-			}
-
-			if (!paramsDone || idx >= signature.Length || signature[idx] != ')') {
-				throw new InvalidOperationException ($"Missing closing arguments parenthesis: '{signature}'");
-			}
-
-			idx++;
-			if (signature[idx] == 'V') {
-				returnType = typeof(void);
-			} else {
-				returnType = JniTypeToManaged (signature[idx]);
-			}
-
-			return (returnType, parameters);
-
-			Type? JniTypeToManaged (char jniType)
-			{
-				if (jniSimpleTypeMap.TryGetValue (jniType, out Type managedType)) {
-					idx++;
-					return managedType;
-				}
-
-				if (jniType == 'L') {
-					return JavaClassToManaged (justSkip: false);
-				}
-
-				if (jniType == '[') {
-					// Arrays of arrays (any rank) are bound as a simple pointer, which makes the generated code much simpler (no need to generate pointers to
-					// pointers to pointers etc), especially that we don't need to dereference these pointers in generated code, we simply pass them along to
-					// the managed land after all.
-					while (signature[idx] == '[') {
-						idx++;
-					}
-
-					jniType = signature[idx];
-					if (jniArrayTypeMap.TryGetValue (jniType, out managedType)) {
-						if (jniType == 'L') {
-							JavaClassToManaged (justSkip: true);
-						} else {
-							idx++;
-						}
-
-						return managedType;
-					}
-
-					throw new InvalidOperationException ($"Unsupported JNI array type '{jniType}' at index {idx} of signature '{signature}'");
-				}
-
-				return null;
-			}
-
-			Type? JavaClassToManaged (bool justSkip)
-			{
-				idx++;
-				StringBuilder sb = null;
-				if (!justSkip) {
-					sb = new StringBuilder ();
-				}
-
-				while (idx < signature.Length) {
-					if (signature[idx] == ')') {
-						throw new InvalidOperationException ($"Syntax error: unterminated class type (missing ';' before closing parenthesis) in signature '{signature}'");
-					}
-
-					if (signature[idx] == ';') {
-						idx++;
-						break;
-					}
-
-					sb?.Append (signature[idx]);
-					idx++;
-				}
-
-				if (justSkip) {
-					return null;
-				}
-
-				string typeName = sb.ToString ();
-				if (MonoAndroidHelper.StringEquals (typeName, "java/lang/Class")) {
-					return typeof(_jclass);
-				}
-
-				if (MonoAndroidHelper.StringEquals (typeName, "java/lang/String")) {
-					return typeof(_jstring);
-				}
-
-				if (MonoAndroidHelper.StringEquals (typeName, "java/lang/Throwable")) {
-					return typeof(_jthrowable);
-				}
-
-				return typeof(_jobject);
-			}
-
-			void AddParameter (Type type)
-			{
-				if (parameters == null) {
-					parameters = new List<LlvmIrFunctionParameter> ();
-				}
-
-				if (implementedMethod.Parameters.Count <= parameters.Count) {
-					throw new InvalidOperationException ($"Method {implementedMethod.FullName} managed signature doesn't match its JNI signature '{signature}' (not enough parameters)");
-				}
-
-				// Every parameter which isn't a primitive type becomes a pointer
-				// If the parameter name is null, empty, or whitespace, pass null to let LlvmIrFunction assign a numeric name
-				string? paramName = implementedMethod.Parameters[parameters.Count].Name;
-				if (String.IsNullOrWhiteSpace (paramName)) {
-					paramName = null;
-				}
-				parameters.Add (new LlvmIrFunctionParameter (type, paramName));
-			}
-		}
-
-		protected override void Construct (LlvmIrModule module)
-		{
-			module.DefaultStringGroup = "mm";
-
-			MapStructures (module);
-
-			Init ();
-			AssemblyCacheState acs = CreateAssemblyCache ();
-			AddAssemblyImageCache (module, acs);
-			AddClassCache (module);
-			AddClassNames (module);
-
-			AddMarshalMethodNames (module, acs);
-			(LlvmIrVariable getFunctionPtrVariable, LlvmIrFunction getFunctionPtrFunction) = AddXamarinAppInitFunction (module);
-
-			AddMarshalMethods (module, acs, getFunctionPtrVariable, getFunctionPtrFunction);
-		}
-
-		protected virtual void MapStructures (LlvmIrModule module)
-		{
-			marshalMethodsManagedClassStructureInfo = module.MapStructure<MarshalMethodsManagedClass> ();
-		}
-
-		protected virtual void AddClassNames (LlvmIrModule module)
-		{}
-
-		protected virtual void AddClassCache (LlvmIrModule module)
-		{}
-
-		void AddMarshalMethods (LlvmIrModule module, AssemblyCacheState acs, LlvmIrVariable getFunctionPtrVariable, LlvmIrFunction getFunctionPtrFunction)
-		{
-			if (generateEmptyCode || methods == null || methods.Count == 0) {
-				return;
-			}
-
-			// This will make all the backing fields to appear in a block without empty lines separating them.
-			module.Add (
-				new LlvmIrGroupDelimiterVariable () {
-					Comment = " Marshal methods backing fields, pointers to native functions"
-				}
-			);
-
-			var writeState = new MarshalMethodsWriteState {
-				AssemblyCacheState = acs,
-				AttributeSet = MakeMarshalMethodAttributeSet (module),
-				UsedBackingFields = new Dictionary<string, LlvmIrVariable> (StringComparer.Ordinal),
-				UniqueAssemblyId = new Dictionary<string, ulong> (StringComparer.OrdinalIgnoreCase),
-				GetFunctionPtrVariable = getFunctionPtrVariable,
-				GetFunctionPtrFunction = getFunctionPtrFunction,
-			};
-			foreach (MarshalMethodInfo mmi in methods) {
-				MarshalMethodEntryMethodObject nativeCallback = mmi.Method.NativeCallback;
-				string asmName = nativeCallback.DeclaringType.Module.Assembly.NameName;
-
-				if (!writeState.UniqueAssemblyId.TryGetValue (asmName, out ulong asmId)) {
-					asmId = (ulong)writeState.UniqueAssemblyId.Count;
-					writeState.UniqueAssemblyId.Add (asmName, asmId);
-				}
-
-				AddMarshalMethod (module, mmi, asmId, writeState);
-			}
-
-			module.Add (new LlvmIrGroupDelimiterVariable ());
-		}
-
-		void AddMarshalMethod (LlvmIrModule module, MarshalMethodInfo method, ulong asmId, MarshalMethodsWriteState writeState)
-		{
-			Log.LogDebugMessage ($"MM: generating code for {method.Method.DeclaringType.FullName} (native cb: '{method.Method.NativeCallback.FullName}'; native symbol name: '{method.NativeSymbolName}')");
-			MarshalMethodEntryMethodObject nativeCallback = method.Method.NativeCallback;
-			string backingFieldName = $"native_cb_{method.Method.JniMethodName}_{asmId}_{method.ClassCacheIndex}_{nativeCallback.MetadataToken:x}";
-
-			if (!writeState.UsedBackingFields.TryGetValue (backingFieldName, out LlvmIrVariable backingField)) {
-				backingField = module.AddGlobalVariable (typeof(IntPtr), backingFieldName, null, LlvmIrVariableOptions.LocalWritableInsignificantAddr);
-				writeState.UsedBackingFields.Add (backingFieldName, backingField);
-			}
-
-			var funcComment = new StringBuilder (" Method: ");
-			funcComment.AppendLine (nativeCallback.FullName);
-			funcComment.Append (" Assembly: ");
-			funcComment.AppendLine (nativeCallback.DeclaringType.Module.Assembly.NameFullName);
-			funcComment.Append (" Registered: ");
-			funcComment.AppendLine (method.Method.RegisteredMethod?.FullName ?? "none");
-			funcComment.Append (" Implemented: ");
-			funcComment.AppendLine (method.Method.ImplementedMethod?.FullName ?? "none");
-
-			var func = new LlvmIrFunction (method.NativeSymbolName, method.ReturnType, method.Parameters, writeState.AttributeSet) {
-				Comment = funcComment.ToString (),
-			};
-
-			WriteBody (func.Body);
-			module.Add (func);
-
-			void WriteBody (LlvmIrFunctionBody body)
-			{
-				LlvmIrLocalVariable cb1 = func.CreateLocalVariable (typeof(IntPtr), "cb1");
-				body.Load (backingField, cb1, tbaa: module.TbaaAnyPointer);
-
-				LlvmIrLocalVariable isNullResult = func.CreateLocalVariable (typeof(bool), "isNull");
-				body.Icmp (LlvmIrIcmpCond.Equal, cb1, null, isNullResult);
-
-				var loadCallbackLabel = new LlvmIrFunctionLabelItem ("loadCallback");
-				var callbackLoadedLabel = new LlvmIrFunctionLabelItem ("callbackLoaded");
-				body.Br (isNullResult, loadCallbackLabel, callbackLoadedLabel);
-
-				// Callback variable was null
-				body.Add (loadCallbackLabel);
-
-				LlvmIrLocalVariable getFuncPtrResult = func.CreateLocalVariable (typeof(IntPtr), "get_func_ptr");
-				body.Load (writeState.GetFunctionPtrVariable, getFuncPtrResult, tbaa: module.TbaaAnyPointer);
-
-				var placeholder = new MarshalMethodAssemblyIndexValuePlaceholder (method, writeState.AssemblyCacheState);
-				var getFunctionPointerArguments = new List<object?> { placeholder, method.ClassCacheIndex, nativeCallback.MetadataToken, backingField };
-
-				LlvmIrInstructions.Call call = body.Call (writeState.GetFunctionPtrFunction, arguments: getFunctionPointerArguments, funcPointer: getFuncPtrResult);
-
-				LlvmIrLocalVariable cb2 = func.CreateLocalVariable (typeof(IntPtr), "cb2");
-				body.Load (backingField, cb2, tbaa: module.TbaaAnyPointer);
-				body.Br (callbackLoadedLabel);
-
-				// Callback variable has just been set or it wasn't null
-				body.Add (callbackLoadedLabel);
-				LlvmIrLocalVariable fn = func.CreateLocalVariable (typeof(IntPtr), "fn");
-
-				// Preceding blocks are ordered from the newest to the oldest, so we need to pass the variables referring to our callback in "reverse" order
-				body.Phi (fn, cb2, body.PrecedingBlock1, cb1, body.PrecedingBlock2);
-
-				var nativeFunc = new LlvmIrFunction (method.NativeSymbolName, method.ReturnType, method.Parameters);
-				nativeFunc.Signature.ReturnAttributes.NoUndef = true;
-
-				var arguments = new List<object?> ();
-				foreach (LlvmIrFunctionParameter parameter in nativeFunc.Signature.Parameters) {
-					arguments.Add (new LlvmIrLocalVariable (parameter.Type, parameter.Name));
-				}
-				LlvmIrLocalVariable? result = nativeFunc.ReturnsValue ? func.CreateLocalVariable (nativeFunc.Signature.ReturnType) : null;
-				call = body.Call (nativeFunc, result, arguments, funcPointer: fn);
-				call.CallMarker = LlvmIrCallMarker.Tail;
-
-				body.Ret (nativeFunc.Signature.ReturnType, result);
-			}
-
-		}
-
-		LlvmIrFunctionAttributeSet MakeMarshalMethodAttributeSet (LlvmIrModule module)
-		{
-			var attrSet = new LlvmIrFunctionAttributeSet {
-				new MustprogressFunctionAttribute (),
-				new UwtableFunctionAttribute (),
-				new MinLegalVectorWidthFunctionAttribute (0),
-				new NoTrappingMathFunctionAttribute (true),
-				new StackProtectorBufferSizeFunctionAttribute (8),
-			};
-
-			return module.AddAttributeSet (attrSet);
-		}
-
-		(LlvmIrVariable getFuncPtrVariable, LlvmIrFunction getFuncPtrFunction) AddXamarinAppInitFunction (LlvmIrModule module)
-		{
-			var getFunctionPtrParams = new List<LlvmIrFunctionParameter> {
-				new (typeof(uint), "mono_image_index") {
-					NoUndef = true,
-				},
-				new (typeof(uint), "class_index") {
-					NoUndef = true,
-				},
-				new (typeof(uint), "method_token") {
-					NoUndef = true,
-				},
-				new (typeof(IntPtr), "target_ptr") {
-					NoUndef = true,
-					NonNull = true,
-					Align = 0, // 0 means use natural pointer alignment
-					Dereferenceable = 0, // ditto 👆
-					IsCplusPlusReference = true,
-				},
-			};
-
-			var getFunctionPtrComment = new StringBuilder (" ");
-			getFunctionPtrComment.Append (GetFunctionPointerVariableName);
-			getFunctionPtrComment.Append (" (");
-			for (int i = 0; i < getFunctionPtrParams.Count; i++) {
-				if (i > 0) {
-					getFunctionPtrComment.Append (", ");
-				}
-				LlvmIrFunctionParameter parameter = getFunctionPtrParams[i];
-				getFunctionPtrComment.Append (LlvmIrGenerator.MapManagedTypeToNative (parameter.Type));
-				if (parameter.IsCplusPlusReference.HasValue && parameter.IsCplusPlusReference.Value) {
-				 	getFunctionPtrComment.Append ('&');
-				}
-				getFunctionPtrComment.Append (' ');
-				getFunctionPtrComment.Append (parameter.Name);
-			}
-			getFunctionPtrComment.Append (')');
-
-			LlvmIrFunction getFunctionPtrFunc = new LlvmIrFunction (
-				name: GetFunctionPointerVariableName,
-				returnType: typeof(void),
-				parameters: getFunctionPtrParams
-			);
-
-			LlvmIrVariable getFunctionPtrVariable = module.AddGlobalVariable (
-				typeof(IntPtr),
-				GetFunctionPointerVariableName,
-				null,
-				LlvmIrVariableOptions.LocalWritableInsignificantAddr,
-				getFunctionPtrComment.ToString ()
-			);
-
-			var init_params = new List<LlvmIrFunctionParameter> {
-				new (typeof(_JNIEnv), "env") {
-					NoCapture = true,
-					NoUndef = true,
-					ReadNone = true,
-				},
-				new (typeof(IntPtr), "fn") {
-					NoUndef = true,
-				},
-			};
-
-			var init_signature = new LlvmIrFunctionSignature (
-				name: "xamarin_app_init",
-				returnType: typeof(void),
-				parameters: init_params
-			);
-
-			LlvmIrFunctionAttributeSet attrSet = MakeXamarinAppInitAttributeSet (module);
-			var xamarin_app_init = new LlvmIrFunction (init_signature, attrSet);
-
-			// If `fn` is nullptr, print a message and abort...
-			//
-			// We must allocate result variables for both the null comparison and puts call here and with names, because
-			// labels and local unnamed variables must be numbered sequentially otherwise and the `AddIfThenElse` call will
-			// allocate up to 3 labels which would have been **defined** after these labels, but **used** before them - and
-			// thus the numbering sequence would be out of order and the .ll file wouldn't build.
-			var fnNullResult = xamarin_app_init.CreateLocalVariable (typeof(bool), "fnIsNull");
-			LlvmIrVariable putsResult = xamarin_app_init.CreateLocalVariable (typeof(int), "putsResult");
-			var ifThenInstructions = new List<LlvmIrInstruction> {
-				module.CreatePuts ("get_function_pointer MUST be specified\n", putsResult),
-				module.CreateAbort (),
-				new LlvmIrInstructions.Unreachable (),
-			};
-
-			module.AddIfThenElse (xamarin_app_init, fnNullResult, LlvmIrIcmpCond.Equal, init_params[1], null, ifThenInstructions);
-
-			// ...otherwise store the pointer and return
-			xamarin_app_init.Body.Store (init_params[1], getFunctionPtrVariable, module.TbaaAnyPointer);
-			xamarin_app_init.Body.Ret (typeof(void));
-
-			module.Add (xamarin_app_init);
-
-			return (getFunctionPtrVariable, getFunctionPtrFunc);
-		}
-
-		LlvmIrFunctionAttributeSet MakeXamarinAppInitAttributeSet (LlvmIrModule module)
-		{
-			var attrSet = new LlvmIrFunctionAttributeSet {
-				new MustprogressFunctionAttribute (),
-				new NofreeFunctionAttribute (),
-				new NorecurseFunctionAttribute (),
-				new NosyncFunctionAttribute (),
-				new NounwindFunctionAttribute (),
-				new WillreturnFunctionAttribute (),
-				new MemoryFunctionAttribute {
-					Default = MemoryAttributeAccessKind.Write,
-					Argmem = MemoryAttributeAccessKind.None,
-					InaccessibleMem = MemoryAttributeAccessKind.None,
-				},
-				new UwtableFunctionAttribute (),
-				new MinLegalVectorWidthFunctionAttribute (0),
-				new NoTrappingMathFunctionAttribute (true),
-				new StackProtectorBufferSizeFunctionAttribute (8),
-			};
-
-			return module.AddAttributeSet (attrSet);
-		}
-
-		protected virtual void AddMarshalMethodNames (LlvmIrModule module, AssemblyCacheState acs)
-		{}
-
-		AssemblyCacheState CreateAssemblyCache ()
-		{
-			var acs = new AssemblyCacheState ();
-			uint index = 0;
-
-			foreach (string name in uniqueAssemblyNames) {
-				// We must make sure we keep the possible culture prefix, which will be treated as "directory" path here
-				string cultureName = Path.GetDirectoryName (name) ?? String.Empty;
-				string clippedName = Path.Combine (cultureName, Path.GetFileNameWithoutExtension (name)).Replace (@"\", "/");
-				string inArchiveName;
-
-				if (cultureName.Length == 0) {
-					// Regular assemblies get the 'lib_' prefix
-					inArchiveName = $"{MonoAndroidHelper.MANGLED_ASSEMBLY_REGULAR_ASSEMBLY_MARKER}{name}{MonoAndroidHelper.MANGLED_ASSEMBLY_NAME_EXT}";
-				} else {
-					// Satellite assemblies get the 'lib-{CULTURE}-' prefix
-					inArchiveName = $"{MonoAndroidHelper.MANGLED_ASSEMBLY_SATELLITE_ASSEMBLY_MARKER}{cultureName}-{Path.GetFileName (name)}{MonoAndroidHelper.MANGLED_ASSEMBLY_NAME_EXT}";
-				}
-
-				ulong hashFull32 = MonoAndroidHelper.GetXxHash (name, is64Bit: false);
-				ulong hashInArchive32 = MonoAndroidHelper.GetXxHash (inArchiveName, is64Bit: false);
-				ulong hashClipped32 = MonoAndroidHelper.GetXxHash (clippedName, is64Bit: false);
-
-				ulong hashFull64 = MonoAndroidHelper.GetXxHash (name, is64Bit: true);
-				ulong hashInArchive64 = MonoAndroidHelper.GetXxHash (inArchiveName, is64Bit: true);
-				ulong hashClipped64 = MonoAndroidHelper.GetXxHash (clippedName, is64Bit: true);
-
-				//
-				// If the number of name forms changes, xamarin-app.hh MUST be updated to set value of the
-				// `number_of_assembly_name_forms_in_image_cache` constant to the number of forms.
-				//
-				acs.Hashes32.Add ((uint)Convert.ChangeType (hashFull32, typeof(uint)), (name, index));
-				acs.Hashes32.Add ((uint)Convert.ChangeType (hashInArchive32, typeof(uint)), (inArchiveName, index));
-				acs.Hashes32.Add ((uint)Convert.ChangeType (hashClipped32, typeof(uint)), (clippedName, index));
-
-				acs.Hashes64.Add (hashFull64, (name, index));
-				acs.Hashes64.Add (hashInArchive64, (inArchiveName, index));
-				acs.Hashes64.Add (hashClipped64, (clippedName, index));
-
-				index++;
-			}
-
-			acs.Keys32 = acs.Hashes32.Keys.ToList ();
-			acs.Keys32.Sort ();
-			for (int i = 0; i < acs.Keys32.Count; i++) {
-				(string name, uint idx) = acs.Hashes32[acs.Keys32[i]];
-				acs.Indices32.Add (idx);
-				acs.AsmNameToIndexData32.Add (name, idx);
-			}
-
-			acs.Keys64 = acs.Hashes64.Keys.ToList ();
-			acs.Keys64.Sort ();
-			for (int i = 0; i < acs.Keys64.Count; i++) {
-				(string name, uint idx) = acs.Hashes64[acs.Keys64[i]];
-				acs.Indices64.Add (idx);
-				acs.AsmNameToIndexData64.Add (name, idx);
-			}
-
-			return acs;
-		}
-
-		protected virtual void AddAssemblyImageCache (LlvmIrModule module, AssemblyCacheState acs)
-		{}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs
deleted file mode 100644
index 7576c4ccf25..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsState.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-
-namespace Xamarin.Android.Tasks
-{
-	/// <summary>
-	/// Represents the state of marshal methods for a specific compilation unit.
-	/// This class encapsulates the collection of marshal methods that have been
-	/// classified and are ready for native code generation.
-	/// </summary>
-	sealed class MarshalMethodsState
-	{
-		/// <summary>
-		/// Gets the dictionary of marshal methods organized by their unique keys.
-		/// Each key typically represents a type-method combination, and the value
-		/// is a list of marshal method entries for that key (allowing for method overloads).
-		/// </summary>
-		public IDictionary<string, IList<MarshalMethodEntry>> MarshalMethods { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MarshalMethodsState"/> class.
-		/// </summary>
-		/// <param name="marshalMethods">
-		/// The dictionary of marshal methods organized by their unique keys.
-		/// Cannot be null.
-		/// </param>
-		/// <exception cref="ArgumentNullException">
-		/// Thrown when <paramref name="marshalMethods"/> is null.
-		/// </exception>
-		/// <remarks>
-		/// This constructor also dumps the marshal methods to the console for debugging purposes
-		/// when diagnostic logging is enabled.
-		/// </remarks>
-		public MarshalMethodsState (IDictionary<string, IList<MarshalMethodEntry>> marshalMethods)
-		{
-			// Debug output for troubleshooting marshal method classification
-			MonoAndroidHelper.DumpMarshalMethodsToConsole ("Classified ethods in MarshalMethodsState ctor", marshalMethods);
-
-			MarshalMethods = marshalMethods ?? throw new ArgumentNullException (nameof (marshalMethods));
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
index 099679af4a2..09e4798c301 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
@@ -32,13 +32,9 @@ public partial class MonoAndroidHelper
 		public static AndroidVersions   SupportedVersions;
 		public static AndroidSdkInfo    AndroidSdk;
 
-		internal static XAAssemblyResolver MakeResolver (TaskLoggingHelper log, bool useMarshalMethods, AndroidTargetArch targetArch, Dictionary<string, ITaskItem> assemblies, bool loadDebugSymbols = true)
+		internal static XAAssemblyResolver MakeResolver (TaskLoggingHelper log, AndroidTargetArch targetArch, Dictionary<string, ITaskItem> assemblies, bool loadDebugSymbols = true)
 		{
 			var readerParams = new ReaderParameters ();
-			if (useMarshalMethods) {
-				readerParams.ReadWrite = true;
-				readerParams.InMemory = true;
-			}
 
 			var res = new XAAssemblyResolver (targetArch, log, loadDebugSymbols: loadDebugSymbols, loadReaderParameters: readerParams);
 			var uniqueDirs = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
@@ -772,7 +768,7 @@ static Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> GetPerArchAs
 				assemblies.Add (GetAssemblyNameWithCulture (assembly), assembly);
 			}
 
-			// It's possible some assembly collections will be empty (e.g. `ResolvedUserAssemblies` as passed to the `GenerateJavaStubs` task), which
+			// It's possible some assembly collections will be empty (e.g. `ResolvedUserAssemblies`), which
 			// isn't a problem and such empty collections should not be validated, as it will end in the "should never happen" exception below being
 			// thrown as a false negative.
 			if (assembliesPerArch.Count == 0 || !validate) {
@@ -812,18 +808,6 @@ void EnsureDictionariesHaveTheSameEntries (Dictionary<string, ITaskItem> templat
 			}
 		}
 
-		internal static void DumpMarshalMethodsToConsole (string heading, IDictionary<string, IList<MarshalMethodEntry>> marshalMethods)
-		{
-			Console.WriteLine ();
-			Console.WriteLine ($"{heading}:");
-			foreach (var kvp in marshalMethods) {
-				Console.WriteLine ($"  {kvp.Key}");
-				foreach (var method in kvp.Value) {
-					Console.WriteLine ($"    {method.DeclaringType.FullName} {method.NativeCallback.FullName}");
-				}
-			}
-		}
-
 		public static uint ZipAlignmentToPageSize (int alignment) => ZipAlignmentToMaskOrPageSize (alignment, needMask: false);
 
 		static uint ZipAlignmentToMaskOrPageSize (int alignment, bool needMask)
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs
deleted file mode 100644
index 35a52e9b695..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeCodeGenState.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-
-using Java.Interop.Tools.Cecil;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-/// <summary>
-/// Holds state for typemap and marshal methods generators.  A single instance of this
-/// class is created for each enabled target architecture.
-/// </summary>
-class NativeCodeGenState
-{
-	public static bool TemplateJniAddNativeMethodRegistrationAttributePresent { get; set; }
-
-	/// <summary>
-	/// Target architecture for which this instance was created.
-	/// </summary>
-	public AndroidTargetArch TargetArch                        { get; }
-
-	/// <summary>
-	/// Classifier used when scanning for Java types in the target architecture's
-	/// assemblies.  Will be **null** if marshal methods are disabled.
-	/// </summary>
-	public MarshalMethodsCollection? Classifier                { get; }
-
-	/// <summary>
-	/// All the Java types discovered in the target architecture's assemblies.
-	/// </summary>
-	public List<TypeDefinition> AllJavaTypes                   { get; }
-
-	/// <summary>
-	/// Contains information about p/invokes used by the managed assemblies included in the
-	/// application. Will be **null** unless native runtime linking at application build time
-	/// is enabled.
-	/// </summary>
-	public List<PinvokeScanner.PinvokeEntryInfo>? PinvokeInfos { get; set; }
-
-	public List<TypeDefinition> JavaTypesForJCW                { get; }
-	public XAAssemblyResolver Resolver                         { get; }
-	public TypeDefinitionCache TypeCache                       { get; }
-	public bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
-
-
-	public NativeCodeGenState (AndroidTargetArch arch, TypeDefinitionCache tdCache, XAAssemblyResolver resolver, List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW, MarshalMethodsCollection? classifier)
-	{
-		TargetArch = arch;
-		TypeCache = tdCache;
-		Resolver = resolver;
-		AllJavaTypes = allJavaTypes;
-		JavaTypesForJCW = javaTypesForJCW;
-		Classifier = classifier;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs
deleted file mode 100644
index 1ac17b55fd9..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/NativeTypeMappingData.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Microsoft.Build.Utilities;
-using Microsoft.Android.Build.Tasks;
-
-namespace Xamarin.Android.Tasks
-{
-	class NativeTypeMappingData
-	{
-		public TypeMapGenerator.ModuleReleaseData[] Modules { get; }
-		public TypeMapGenerator.TypeMapReleaseEntry[] JavaTypes { get; }
-
-		public uint MapModuleCount { get; }
-		public uint JavaTypeCount  { get; }
-
-		public NativeTypeMappingData (TaskLoggingHelper log, TypeMapGenerator.ModuleReleaseData[] modules)
-		{
-			Modules = modules ?? throw new ArgumentNullException (nameof (modules));
-
-			MapModuleCount = (uint)modules.Length;
-
-			var tempJavaTypes = new Dictionary<string, TypeMapGenerator.TypeMapReleaseEntry> (StringComparer.Ordinal);
-			var moduleComparer = new TypeMapGenerator.ModuleUUIDArrayComparer ();
-
-			TypeMapGenerator.ModuleReleaseData? monoAndroid = null;
-			foreach (TypeMapGenerator.ModuleReleaseData data in modules) {
-				if (data.AssemblyName == "Mono.Android") {
-					monoAndroid = data;
-					break;
-				}
-			}
-
-			if (monoAndroid != null) {
-				ProcessModule (monoAndroid);
-			}
-
-			foreach (TypeMapGenerator.ModuleReleaseData data in modules) {
-				if (data.AssemblyName == "Mono.Android") {
-					continue;
-				}
-				ProcessModule (data);
-			};
-
-			void ProcessModule (TypeMapGenerator.ModuleReleaseData data)
-			{
-				int moduleIndex = Array.BinarySearch (modules, data, moduleComparer);
-				if (moduleIndex < 0)
-					throw new InvalidOperationException ($"Unable to map module with MVID {data.Mvid} to array index");
-
-				foreach (TypeMapGenerator.TypeMapReleaseEntry entry in data.Types) {
-					entry.ModuleIndex = moduleIndex;
-					if (tempJavaTypes.ContainsKey (entry.JavaName)) {
-						log.LogDebugMessage ($"Skipping typemap entry for `{entry.ManagedTypeName}, {data.AssemblyName}`; `{entry.JavaName}` is already mapped.");
-						continue;
-					}
-					tempJavaTypes.Add (entry.JavaName, entry);
-				}
-			}
-
-			JavaTypes = tempJavaTypes.Values.ToArray ();
-			JavaTypeCount = (uint)JavaTypes.Length;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
index dc3da1e026d..231787fe694 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/PreservePinvokesNativeAssemblyGenerator.cs
@@ -70,21 +70,19 @@ sealed class ConstructionState
 		{ "mono-android.release",        String.Empty },
 	};
 
-	readonly NativeCodeGenStateObject state;
-	public PreservePinvokesNativeAssemblyGenerator (TaskLoggingHelper log, NativeCodeGenStateObject codeGenState)
+	readonly AndroidTargetArch targetArch;
+	readonly List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos;
+
+	public PreservePinvokesNativeAssemblyGenerator (TaskLoggingHelper log, AndroidTargetArch targetArch, List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos)
 		: base (log)
 	{
-		if (codeGenState.PinvokeInfos == null) {
-			throw new InvalidOperationException ($"Internal error: {nameof (codeGenState)} `{nameof (codeGenState.PinvokeInfos)}` property is `null`");
-		}
-
-		this.state = codeGenState;
+		this.targetArch = targetArch;
+		this.pinvokeInfos = pinvokeInfos ?? throw new ArgumentNullException (nameof (pinvokeInfos));
 	}
 
 	protected override void Construct (LlvmIrModule module)
 	{
-		Log.LogDebugMessage ($"[{state.TargetArch}] Constructing p/invoke preserve code");
-		List<PinvokeScanner.PinvokeEntryInfo> pinvokeInfos = state.PinvokeInfos!;
+		Log.LogDebugMessage ($"[{targetArch}] Constructing p/invoke preserve code");
 		if (pinvokeInfos.Count == 0) {
 			// This is a very unlikely scenario, but we will work just fine.  The module that this generator produces will merely result
 			// in an empty (but valid) .ll file and an "empty" object file to link into the shared library.
@@ -123,14 +121,14 @@ protected override void Construct (LlvmIrModule module)
 			return;
 		}
 
-		switch (state.TargetArch) {
+		switch (targetArch) {
 			case AndroidTargetArch.Arm64:
 			case AndroidTargetArch.X86_64:
 			case AndroidTargetArch.Arm:
 			case AndroidTargetArch.X86:
 				break;
 			default:
-				throw new NotSupportedException ($"Architecture {state.TargetArch} is not supported here");
+				throw new NotSupportedException ($"Architecture {targetArch} is not supported here");
 		}
 
 		Log.LogDebugMessage ("  Checking discovered p/invokes against the list of components");
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs
deleted file mode 100644
index 53dde75784c..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapCecilAdapter.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Java.Interop.Tools.Cecil;
-using Mono.Cecil;
-
-using ReflectionAssemblyContentType = System.Reflection.AssemblyContentType;
-using ReflectionAssemblyName = System.Reflection.AssemblyName;
-using ReflectionAssemblyNameFlags = System.Reflection.AssemblyNameFlags;
-using ModuleReleaseData = Xamarin.Android.Tasks.TypeMapGenerator.ModuleReleaseData;
-using ReleaseGenerationState = Xamarin.Android.Tasks.TypeMapGenerator.ReleaseGenerationState;
-using TypeMapDebugEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugEntry;
-using TypeMapReleaseEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapReleaseEntry;
-using TypeMapDebugDataSets = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugDataSets;
-using TypeMapDebugAssembly = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugAssembly;
-
-namespace Xamarin.Android.Tasks;
-
-// Converts types from Mono.Cecil to the format used by the typemap generator.
-class TypeMapCecilAdapter
-{
-	public static TypeMapDebugDataSets GetDebugNativeEntries (NativeCodeGenState state, bool needUniqueAssemblies)
-	{
-		var (dataSets, foundJniNativeRegistration) = GetDebugNativeEntries (state.AllJavaTypes, state.TypeCache, needUniqueAssemblies);
-
-		state.JniAddNativeMethodRegistrationAttributePresent = foundJniNativeRegistration;
-
-		return dataSets;
-	}
-
-	public static (TypeMapDebugDataSets dataSets, bool foundJniNativeRegistration) GetDebugNativeEntries (List<TypeDefinition> types, TypeDefinitionCache cache, bool needUniqueAssemblies)
-	{
-		var javaDuplicates = new Dictionary<string, List<TypeMapDebugEntry>> (StringComparer.Ordinal);
-		var uniqueAssemblies = needUniqueAssemblies ? new Dictionary<string, TypeMapDebugAssembly> (StringComparer.OrdinalIgnoreCase) : null;
-		var javaToManaged = new List<TypeMapDebugEntry> ();
-		var managedToJava = new List<TypeMapDebugEntry> ();
-		var foundJniNativeRegistration = false;
-
-		foreach (var td in types) {
-			foundJniNativeRegistration = JniAddNativeMethodRegistrationAttributeFound (foundJniNativeRegistration, td);
-
-			TypeMapDebugEntry entry = GetDebugEntry (td, cache);
-			HandleDebugDuplicates (javaDuplicates, entry, td, cache);
-
-			javaToManaged.Add (entry);
-			managedToJava.Add (entry);
-
-			if (uniqueAssemblies == null) {
-				continue;
-			}
-
-			string? asmName = td.Module.Assembly.Name.Name;
-			if (String.IsNullOrEmpty (asmName) || uniqueAssemblies.ContainsKey (asmName)) {
-				continue;
-			}
-
-			var asmInfo = new TypeMapDebugAssembly {
-				MVID = td.Module.Mvid,
-				Name = asmName,
-			};
-			asmInfo.MVIDBytes = asmInfo.MVID.ToByteArray ();
-			uniqueAssemblies.Add (asmName, asmInfo);
-		}
-
-		SyncDebugDuplicates (javaDuplicates);
-
-		return (new TypeMapDebugDataSets {
-			JavaToManaged = javaToManaged,
-			ManagedToJava = managedToJava,
-			UniqueAssemblies = uniqueAssemblies != null ? new List<TypeMapDebugAssembly> (uniqueAssemblies.Values) : null
-		}, foundJniNativeRegistration);
-	}
-
-	public static ReleaseGenerationState GetReleaseGenerationState (NativeCodeGenState state)
-	{
-		var genState = new ReleaseGenerationState ();
-
-		foreach (TypeDefinition td in state.AllJavaTypes) {
-			UpdateApplicationConfig (state, td);
-			ProcessReleaseType (state.TypeCache, genState, td);
-		}
-
-		return genState;
-	}
-
-	public static ReleaseGenerationState GetReleaseGenerationState (List<TypeDefinition> types, TypeDefinitionCache cache, out bool foundJniNativeRegistration)
-	{
-		var genState = new ReleaseGenerationState ();
-		foundJniNativeRegistration = false;
-
-		foreach (TypeDefinition td in types) {
-			foundJniNativeRegistration = JniAddNativeMethodRegistrationAttributeFound (foundJniNativeRegistration, td);
-			ProcessReleaseType (cache, genState, td);
-		}
-
-		return genState;
-	}
-
-	static void ProcessReleaseType (TypeDefinitionCache cache, ReleaseGenerationState genState, TypeDefinition td)
-	{
-		// We must NOT use Guid here! The reason is that Guid sort order is different than its corresponding
-		// byte array representation and on the runtime we need the latter in order to be able to binary search
-		// through the module array.
-		byte [] moduleUUID;
-		if (!genState.MvidCache.TryGetValue (td.Module.Mvid, out moduleUUID)) {
-			moduleUUID = td.Module.Mvid.ToByteArray ();
-			genState.MvidCache.Add (td.Module.Mvid, moduleUUID);
-		}
-
-		Dictionary<byte [], ModuleReleaseData> tempModules = genState.TempModules;
-		if (!tempModules.TryGetValue (moduleUUID, out ModuleReleaseData moduleData)) {
-			moduleData = new ModuleReleaseData {
-				Mvid = td.Module.Mvid,
-				MvidBytes = moduleUUID,
-				AssemblyName = td.Module.Assembly.Name.Name,
-				TypesScratch = new Dictionary<string, TypeMapReleaseEntry> (StringComparer.Ordinal),
-				DuplicateTypes = new List<TypeMapReleaseEntry> (),
-			};
-
-			tempModules.Add (moduleUUID, moduleData);
-		}
-
-		string javaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td, cache);
-		// We will ignore generic types and interfaces when generating the Java to Managed map, but we must not
-		// omit them from the table we output - we need the same number of entries in both java-to-managed and
-		// managed-to-java tables.  `SkipInJavaToManaged` set to `true` will cause the native assembly generator
-		// to output `0` as the token id for the type, thus effectively causing the runtime unable to match such
-		// a Java type name to a managed type. This fixes https://github.com/dotnet/android/issues/4660
-		var entry = new TypeMapReleaseEntry {
-			JavaName = javaName,
-			ManagedTypeName = td.FullName,
-			Token = td.MetadataToken.ToUInt32 (),
-			SkipInJavaToManaged = ShouldSkipInJavaToManaged (td),
-		};
-
-		if (moduleData.TypesScratch.ContainsKey (entry.JavaName)) {
-			// This is disabled because it costs a lot of time (around 150ms per standard XF Integration app
-			// build) and has no value for the end user. The message is left here because it may be useful to us
-			// in our devloop at some point.
-			//log.LogDebugMessage ($"Warning: duplicate Java type name '{entry.JavaName}' in assembly '{moduleData.AssemblyName}' (new token: {entry.Token}).");
-			moduleData.DuplicateTypes.Add (entry);
-		} else {
-			moduleData.TypesScratch.Add (entry.JavaName, entry);
-		}
-	}
-
-	static TypeMapDebugEntry GetDebugEntry (TypeDefinition td, TypeDefinitionCache cache)
-	{
-		return new TypeMapDebugEntry {
-			JavaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td, cache),
-			ManagedName = GetManagedTypeName (td),
-			ManagedTypeTokenId = td.MetadataToken.ToUInt32 (),
-			TypeDefinition = td,
-			SkipInJavaToManaged = ShouldSkipInJavaToManaged (td),
-			AssemblyName = td.Module.Assembly.Name.Name,
-			AssemblyFullName = GetRuntimeAssemblyFullName (td.Module.Assembly.Name),
-		};
-	}
-
-	// Cecil's FullName does not escape assembly display names in the same way as Assembly.FullName.
-	public static string GetRuntimeAssemblyFullName (AssemblyNameReference assemblyName)
-	{
-		var runtimeAssemblyName = new ReflectionAssemblyName {
-			Name = assemblyName.Name,
-			Version = assemblyName.Version,
-			CultureName = assemblyName.Culture ?? "",
-			Flags = assemblyName.IsRetargetable ? ReflectionAssemblyNameFlags.Retargetable : ReflectionAssemblyNameFlags.None,
-			ContentType = assemblyName.IsWindowsRuntime ? ReflectionAssemblyContentType.WindowsRuntime : ReflectionAssemblyContentType.Default,
-		};
-		runtimeAssemblyName.SetPublicKeyToken (assemblyName.PublicKeyToken);
-
-		return runtimeAssemblyName.FullName ?? throw new InvalidOperationException ($"Unable to format assembly name '{assemblyName.Name}'.");
-	}
-
-	static string GetManagedTypeName (TypeDefinition td)
-	{
-		// This is necessary because Mono runtime will return to us type name with a `.` for nested types (not a
-		// `/` or a `+`. So, for instance, a type named `DefaultRenderer` found in the
-		// `Xamarin.Forms.Platform.Android.Platform` class in the `Xamarin.Forms.Platform.Android` assembly will
-		// be seen here as
-		//
-		//   Xamarin.Forms.Platform.Android.Platform/DefaultRenderer
-		//
-		// The managed land name for the type will be rendered as
-		//
-		//   Xamarin.Forms.Platform.Android.Platform+DefaultRenderer
-		//
-		// And this is the form that we need in the map file
-		//
-		string managedTypeName = td.FullName.Replace ('/', '+');
-
-		return $"{managedTypeName}, {td.Module.Assembly.Name.Name}";
-	}
-
-	static void HandleDebugDuplicates (Dictionary<string, List<TypeMapDebugEntry>> javaDuplicates, TypeMapDebugEntry entry, TypeDefinition td, TypeDefinitionCache cache)
-	{
-		List<TypeMapDebugEntry> duplicates;
-
-		if (!javaDuplicates.TryGetValue (entry.JavaName, out duplicates)) {
-			javaDuplicates.Add (entry.JavaName, new List<TypeMapDebugEntry> { entry });
-		} else {
-			TypeMapDebugEntry oldEntry = duplicates [0];
-			if ((td.IsAbstract || td.IsInterface) &&
-					!oldEntry.TypeDefinition.IsAbstract &&
-					!oldEntry.TypeDefinition.IsInterface &&
-					td.IsAssignableFrom (oldEntry.TypeDefinition, cache)) {
-				// We found the `Invoker` type *before* the declared type
-				// Fix things up so the abstract type is first, and the `Invoker` is considered a duplicate.
-				duplicates.Insert (0, entry);
-				oldEntry.SkipInJavaToManaged = false;
-				oldEntry.IsInvoker = true;
-			} else {
-				// ¯\_(ツ)_/¯
-				duplicates.Add (entry);
-			}
-		}
-	}
-
-	static bool ShouldSkipInJavaToManaged (TypeDefinition td)
-	{
-		return td.IsInterface || td.HasGenericParameters;
-	}
-
-	static void SyncDebugDuplicates (Dictionary<string, List<TypeMapDebugEntry>> javaDuplicates)
-	{
-		foreach (List<TypeMapDebugEntry> duplicates in javaDuplicates.Values) {
-			if (duplicates.Count < 2) {
-				continue;
-			}
-
-			// Java duplicates must all point to the same managed type
-			// Managed types, however, must point back to the original Java type instead
-			// File/assembly generator use the `DuplicateForJavaToManaged` field to know to which managed type the
-			// duplicate Java type must be mapped.
-			TypeMapDebugEntry template = GetDebugDuplicateTemplate (duplicates);
-			foreach (TypeMapDebugEntry duplicate in duplicates) {
-				if (duplicate == template) {
-					continue;
-				}
-				duplicate.DuplicateForJavaToManaged = template;
-			}
-		}
-	}
-
-	static TypeMapDebugEntry GetDebugDuplicateTemplate (List<TypeMapDebugEntry> duplicates)
-	{
-		foreach (TypeMapDebugEntry duplicate in duplicates) {
-			if (duplicate.AssemblyName == "Mono.Android") {
-				return duplicate;
-			}
-		}
-		return duplicates [0];
-	}
-
-	static void UpdateApplicationConfig (NativeCodeGenState state, TypeDefinition javaType)
-	{
-		state.JniAddNativeMethodRegistrationAttributePresent = JniAddNativeMethodRegistrationAttributeFound (state.JniAddNativeMethodRegistrationAttributePresent, javaType);
-	}
-
-	static bool JniAddNativeMethodRegistrationAttributeFound (bool alreadyFound, TypeDefinition javaType)
-	{
-		if (alreadyFound || !javaType.HasCustomAttributes) {
-			return alreadyFound;
-		}
-
-		foreach (CustomAttribute ca in javaType.CustomAttributes) {
-			if (string.Equals ("JniAddNativeMethodRegistrationAttribute", ca.AttributeType.Name, StringComparison.Ordinal)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
deleted file mode 100644
index b0c9cdd8088..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-using static Xamarin.Android.Tasks.TypeMapGenerator;
-
-namespace Xamarin.Android.Tasks
-{
-	class TypeMapGenerator
-	{
-		internal sealed class ModuleUUIDArrayComparer : IComparer<ModuleReleaseData>
-		{
-			int Compare (byte[] left, byte[] right)
-			{
-				int ret;
-
-				for (int i = 0; i < 16; i++) {
-					ret = left[i].CompareTo (right[i]);
-					if (ret != 0)
-						return ret;
-				}
-
-				return 0;
-			}
-
-			public int Compare (ModuleReleaseData left, ModuleReleaseData right)
-			{
-				return Compare (left.MvidBytes, right.MvidBytes);
-			}
-		}
-
-		internal sealed class TypeMapReleaseEntry
-		{
-			public string JavaName;
-			public string ManagedTypeName;
-			public uint Token;
-			public int ModuleIndex = -1;
-			public bool SkipInJavaToManaged;
-		}
-
-		internal sealed class ModuleReleaseData
-		{
-			public Guid Mvid;
-			public byte[] MvidBytes;
-			public TypeMapReleaseEntry[] Types;
-			public List<TypeMapReleaseEntry> DuplicateTypes;
-			public string AssemblyName;
-
-			public Dictionary<string, TypeMapReleaseEntry> TypesScratch;
-		}
-
-		internal sealed class TypeMapDebugEntry
-		{
-			public string JavaName;
-			public string ManagedName;
-			public uint ManagedTypeTokenId;
-			public bool SkipInJavaToManaged;
-			public TypeMapDebugEntry DuplicateForJavaToManaged;
-			public string AssemblyName;
-			public string AssemblyFullName;
-
-			// This field is only used by the Cecil adapter for temp storage while reading.
-			// It is not used to create the typemap.
-			public TypeDefinition TypeDefinition;
-
-			// These fields are only used by the XML adapter for temp storage while reading.
-			// It is not used to create the typemap.
-			public string? DuplicateForJavaToManagedKey { get; set; }
-			public bool IsInvoker { get; set; }
-			public bool IsMonoAndroid { get; set; } // Types in Mono.Android take precedence over other assemblies
-
-			public string Key => $"{JavaName}|{ManagedName}";
-
-			public override string ToString ()
-			{
-				return $"TypeMapDebugEntry{{JavaName={JavaName}, ManagedName={ManagedName}, SkipInJavaToManaged={SkipInJavaToManaged}, DuplicateForJavaToManaged={DuplicateForJavaToManaged}}}";
-			}
-		}
-
-		internal sealed class TypeMapDebugAssembly
-		{
-			public Guid MVID;
-			public byte[] MVIDBytes;
-			public string Name;
-		}
-
-		internal sealed class TypeMapDebugDataSets
-		{
-			public List<TypeMapDebugEntry> JavaToManaged ;
-			public List<TypeMapDebugEntry> ManagedToJava;
-			public List<TypeMapDebugAssembly>? UniqueAssemblies;
-		}
-
-		// Widths include the terminating nul character but not the padding!
-		internal sealed class ModuleDebugData
-		{
-			public uint EntryCount;
-			public List<TypeMapDebugEntry> JavaToManagedMap;
-			public List<TypeMapDebugEntry> ManagedToJavaMap;
-			public List<TypeMapDebugAssembly>? UniqueAssemblies;
-		}
-
-		internal sealed class ReleaseGenerationState
-		{
-			// This field is only used by the Cecil adapter for temp storage while reading.
-			// It is not used to create the typemap.
-			public readonly Dictionary<Guid, byte []> MvidCache;
-
-			public readonly Dictionary<byte [], ModuleReleaseData> TempModules;
-
-			public ReleaseGenerationState ()
-			{
-				MvidCache = new Dictionary<Guid, byte []> ();
-				TempModules = new Dictionary<byte [], ModuleReleaseData> ();
-			}
-		}
-
-		readonly TaskLoggingHelper log;
-		readonly ITypeMapGeneratorAdapter state;
-		readonly AndroidRuntime runtime;
-
-		public IList<string> GeneratedBinaryTypeMaps { get; } = new List<string> ();
-
-		/// <summary>
-		/// Whether to write descriptive comments into the generated LLVM IR type maps.
-		/// See <see cref="LLVMIR.LlvmIrGenerator.EmitComments" />.
-		/// </summary>
-		public bool EmitComments { get; set; }
-
-		public TypeMapGenerator (TaskLoggingHelper log, ITypeMapGeneratorAdapter state, AndroidRuntime runtime)
-		{
-			this.log = log ?? throw new ArgumentNullException (nameof (log));
-			this.state = state ?? throw new ArgumentNullException (nameof (state));
-			this.runtime = runtime;
-		}
-
-		public void Generate (bool debugBuild, bool skipJniAddNativeMethodRegistrationAttributeScan, string outputDirectory)
-		{
-			if (String.IsNullOrEmpty (outputDirectory)) {
-				throw new ArgumentException ("must not be null or empty", nameof (outputDirectory));
-			}
-			Directory.CreateDirectory (outputDirectory);
-
-			state.JniAddNativeMethodRegistrationAttributePresent = skipJniAddNativeMethodRegistrationAttributeScan;
-			string typemapsOutputDirectory = Path.Combine (outputDirectory, "typemaps");
-			if (debugBuild) {
-				GenerateDebugNativeAssembly (typemapsOutputDirectory);
-				return;
-			}
-
-			GenerateRelease (typemapsOutputDirectory);
-		}
-
-		void GenerateDebugNativeAssembly (string outputDirectory)
-		{
-			TypeMapDebugDataSets dataSets = state.GetDebugNativeEntries (needUniqueAssemblies: runtime == AndroidRuntime.CoreCLR);
-
-			var data = new ModuleDebugData {
-				EntryCount = (uint)dataSets.JavaToManaged.Count,
-				JavaToManagedMap = dataSets.JavaToManaged,
-				ManagedToJavaMap = dataSets.ManagedToJava,
-				UniqueAssemblies = dataSets.UniqueAssemblies,
-			};
-
-			data.JavaToManagedMap.Sort ((TypeMapDebugEntry a, TypeMapDebugEntry b) => String.Compare (a.JavaName, b.JavaName, StringComparison.Ordinal));
-			data.ManagedToJavaMap.Sort ((TypeMapDebugEntry a, TypeMapDebugEntry b) => String.Compare (a.ManagedName, b.ManagedName, StringComparison.Ordinal));
-
-			LLVMIR.LlvmIrComposer composer = runtime switch {
-				AndroidRuntime.CoreCLR => new TypeMappingDebugNativeAssemblyGenerator (log, data),
-				_ => throw new NotSupportedException ($"Internal error: unsupported runtime {runtime}")
-			};
-			GenerateNativeAssembly (composer, composer.Construct (), outputDirectory);
-		}
-
-		void GenerateRelease (string outputDirectory)
-		{
-			var genState = state.GetReleaseGenerationState ();
-
-			ModuleReleaseData [] modules = genState.TempModules.Values.ToArray ();
-			Array.Sort (modules, new ModuleUUIDArrayComparer ());
-
-			foreach (ModuleReleaseData module in modules) {
-				if (module.TypesScratch.Count == 0) {
-					module.Types = [];
-					continue;
-				}
-
-				// No need to sort here, the LLVM IR generator will compute hashes and sort
-				// the array on write.
-				module.Types = module.TypesScratch.Values.ToArray ();
-			}
-
-			LLVMIR.LlvmIrComposer composer = runtime switch {
-				AndroidRuntime.CoreCLR => new TypeMappingReleaseNativeAssemblyGenerator (log, new NativeTypeMappingData (log, modules)),
-				_ => throw new NotSupportedException ($"Internal error: unsupported runtime {runtime}")
-			};
-
-			GenerateNativeAssembly (composer, composer.Construct (), outputDirectory);
-		}
-
-		void GenerateNativeAssembly (LLVMIR.LlvmIrComposer composer, LLVMIR.LlvmIrModule typeMapModule, string baseFileName)
-		{
-			string outputFile = $"{baseFileName}.{MonoAndroidHelper.ArchToAbi (state.TargetArch)}.ll";
-
-			composer.EmitComments = EmitComments;
-
-			// TODO: each .ll file should have a comment which lists paths to all the DLLs that were used to generate
-			// the native code
-			using (var sw = MemoryStreamPool.Shared.CreateStreamWriter ()) {
-				try {
-					composer.Generate (typeMapModule, state.TargetArch, sw, outputFile);
-				} catch {
-					throw;
-				} finally {
-					sw.Flush ();
-					Files.CopyIfStreamChanged (sw.BaseStream, outputFile);
-				}
-			}
-		}
-	}
-
-	interface ITypeMapGeneratorAdapter
-	{
-		AndroidTargetArch TargetArch { get; }
-		bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
-		TypeMapDebugDataSets GetDebugNativeEntries (bool needUniqueAssemblies);
-		ReleaseGenerationState GetReleaseGenerationState ();
-	}
-
-	class NativeCodeGenStateAdapter : ITypeMapGeneratorAdapter
-	{
-		readonly NativeCodeGenState state;
-
-		public NativeCodeGenStateAdapter (NativeCodeGenState state)
-		{
-			this.state = state ?? throw new ArgumentNullException (nameof (state));
-		}
-
-		public AndroidTargetArch TargetArch => state.TargetArch;
-
-		public bool JniAddNativeMethodRegistrationAttributePresent {
-			get => state.JniAddNativeMethodRegistrationAttributePresent;
-			set => state.JniAddNativeMethodRegistrationAttributePresent = value;
-		}
-
-		public TypeMapDebugDataSets GetDebugNativeEntries (bool needUniqueAssemblies)
-		{
-			return TypeMapCecilAdapter.GetDebugNativeEntries (state, needUniqueAssemblies);
-		}
-
-		public ReleaseGenerationState GetReleaseGenerationState ()
-		{
-			return TypeMapCecilAdapter.GetReleaseGenerationState (state);
-		}
-	}
-
-	class TypeMapObjectsFileAdapter : ITypeMapGeneratorAdapter
-	{
-		public List<TypeMapObjectsXmlFile> XmlFiles { get; } = [];
-		public AndroidTargetArch TargetArch { get; }
-
-		public TypeMapObjectsFileAdapter (AndroidTargetArch targetArch)
-		{
-			TargetArch = targetArch;
-		}
-
-		public bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
-
-		public TypeMapDebugDataSets GetDebugNativeEntries (bool needUniqueAssemblies)
-		{
-			var javaToManaged = new List<TypeMapDebugEntry> ();
-			var managedToJava = new List<TypeMapDebugEntry> ();
-			var uniqueAssemblies = new Dictionary<string, TypeMapDebugAssembly> (StringComparer.OrdinalIgnoreCase);
-
-			foreach (var xml in XmlFiles) {
-				if (!uniqueAssemblies.ContainsKey (xml.AssemblyName)) {
-					var assm = new TypeMapDebugAssembly {
-						MVID = xml.AssemblyMvid,
-						MVIDBytes = xml.AssemblyMvid.ToByteArray (),
-						Name = xml.AssemblyName,
-					};
-					uniqueAssemblies.Add (xml.AssemblyName, assm);
-				}
-
-				javaToManaged.AddRange (xml.JavaToManagedDebugEntries);
-				managedToJava.AddRange (xml.ManagedToJavaDebugEntries);
-			}
-
-			// Handle entries with duplicate JavaNames
-			GroupDuplicateDebugEntries (javaToManaged);
-			GroupDuplicateDebugEntries (managedToJava);
-
-			return new TypeMapDebugDataSets {
-				JavaToManaged = javaToManaged,
-				ManagedToJava = managedToJava,
-				UniqueAssemblies = uniqueAssemblies.Values.ToList (),
-			};
-		}
-
-		void GroupDuplicateDebugEntries (List<TypeMapDebugEntry> debugEntries)
-		{
-			foreach (var group in debugEntries.GroupBy (ent => ent.JavaName).Where (g => g.Count () > 1)) {
-				// We need to sort:
-				// - Types in Mono.Android come first
-				// - Types that are not invokers come first
-				var entries = group
-					.OrderBy (e => e.IsMonoAndroid ? 0 : 1)
-					.ThenBy (e => e.IsInvoker ? 1 : 0)
-					.ToList ();
-
-				for (var i = 1; i < entries.Count; i++)
-					entries [i].DuplicateForJavaToManaged = entries [0];
-			}
-		}
-
-		public ReleaseGenerationState GetReleaseGenerationState ()
-		{
-			var state = new ReleaseGenerationState ();
-
-			foreach (var xml in XmlFiles)
-				if (xml.HasReleaseEntries)
-					state.TempModules.Add (xml.ModuleReleaseData.MvidBytes, xml.ModuleReleaseData);
-
-			return state;
-		}
-
-		public static TypeMapObjectsFileAdapter? Create (AndroidTargetArch targetArch, List<ITaskItem> assemblies, TaskLoggingHelper log)
-		{
-			var adapter = new TypeMapObjectsFileAdapter (targetArch);
-
-			foreach (var assembly in assemblies) {
-				var typeMapPath = TypeMapObjectsXmlFile.GetTypeMapObjectsXmlFilePath (assembly);
-
-				if (!File.Exists (typeMapPath)) {
-					log.LogError ($"'{typeMapPath}' not found.");
-					return null;
-				}
-
-				var xml = TypeMapObjectsXmlFile.Import (typeMapPath);
-
-				if (xml.WasScanned)
-					adapter.XmlFiles.Add (xml);
-			}
-
-			return adapter;
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs
deleted file mode 100644
index 5a610af49d1..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapObjectsXmlFile.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Xml;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-using ModuleReleaseData = Xamarin.Android.Tasks.TypeMapGenerator.ModuleReleaseData;
-using TypeMapDebugEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapDebugEntry;
-using TypeMapReleaseEntry = Xamarin.Android.Tasks.TypeMapGenerator.TypeMapReleaseEntry;
-
-namespace Xamarin.Android.Tasks;
-
-class TypeMapObjectsXmlFile
-{
-	static readonly XmlWriterSettings settings = new XmlWriterSettings {
-		Indent = true,
-		NewLineOnAttributes = false,
-		OmitXmlDeclaration = true,
-	};
-
-	static readonly TypeMapObjectsXmlFile unscanned = new TypeMapObjectsXmlFile { WasScanned = false };
-
-	public string? AssemblyName { get; set; }
-	public string? AssemblyFullName { get; set; }
-	public Guid AssemblyMvid { get; set; } = Guid.Empty;
-	public bool FoundJniNativeRegistration { get; set; }
-	public List<TypeMapDebugEntry> JavaToManagedDebugEntries { get; } = [];
-	public List<TypeMapDebugEntry> ManagedToJavaDebugEntries { get; } = [];
-	public ModuleReleaseData? ModuleReleaseData { get; set; }
-	public bool HasDebugEntries => JavaToManagedDebugEntries.Count > 0 || ManagedToJavaDebugEntries.Count > 0;
-	public bool HasReleaseEntries => ModuleReleaseData is not null;
-
-	public bool WasScanned { get; private set; }
-
-	public void Export (string filename, TaskLoggingHelper log)
-	{
-		if (!HasDebugEntries && ModuleReleaseData == null) {
-			WriteEmptyFile (filename, log);
-			return;
-		}
-
-		using var sw = MemoryStreamPool.Shared.CreateStreamWriter ();
-
-		using (var xml = XmlWriter.Create (sw, settings))
-			Export (xml);
-
-		sw.Flush ();
-
-		Files.CopyIfStreamChanged (sw.BaseStream, filename);
-
-		log.LogDebugMessage ($"Wrote '{filename}', {JavaToManagedDebugEntries.Count} JavaToManagedDebugEntries, {ManagedToJavaDebugEntries.Count} ManagedToJavaDebugEntries, FoundJniNativeRegistration: {FoundJniNativeRegistration}");
-	}
-
-	void Export (XmlWriter xml)
-	{
-		xml.WriteStartElement ("api");
-		xml.WriteAttributeString ("type", HasDebugEntries ? "debug" : "release");
-		xml.WriteAttributeStringIfNotDefault ("assembly-name", AssemblyName);
-		xml.WriteAttributeStringIfNotDefault ("assembly-full-name", AssemblyFullName);
-
-		if (AssemblyMvid != Guid.Empty) {
-			xml.WriteAttributeString ("mvid", AssemblyMvid.ToString ("N"));
-		}
-		xml.WriteAttributeStringIfNotDefault ("found-jni-native-registration", FoundJniNativeRegistration);
-
-		if (HasDebugEntries)
-			ExportDebugData (xml);
-		else if (HasReleaseEntries)
-			ExportReleaseData (xml);
-
-		xml.WriteEndElement ();
-	}
-
-	void ExportDebugData (XmlWriter xml)
-	{
-		if (JavaToManagedDebugEntries.Count > 0) {
-			xml.WriteStartElement ("java-to-managed");
-
-			foreach (var entry in JavaToManagedDebugEntries)
-				WriteTypeMapDebugEntry (xml, entry);
-
-			xml.WriteEndElement ();
-		}
-
-		if (ManagedToJavaDebugEntries.Count > 0) {
-			xml.WriteStartElement ("managed-to-java");
-
-			foreach (var entry in ManagedToJavaDebugEntries)
-				WriteTypeMapDebugEntry (xml, entry);
-
-			xml.WriteEndElement ();
-		}
-	}
-
-	void WriteTypeMapDebugEntry (XmlWriter xml, TypeMapDebugEntry entry)
-	{
-		xml.WriteStartElement ("entry");
-		xml.WriteAttributeStringIfNotDefault ("java-name", entry.JavaName);
-		xml.WriteAttributeStringIfNotDefault ("managed-name", entry.ManagedName);
-		xml.WriteAttributeStringIfNotDefault ("skip-in-java-to-managed", entry.SkipInJavaToManaged);
-		xml.WriteAttributeStringIfNotDefault ("is-invoker", entry.IsInvoker);
-		xml.WriteAttributeString ("managed-type-token-id", entry.ManagedTypeTokenId.ToString (CultureInfo.InvariantCulture));
-		xml.WriteEndElement ();
-	}
-
-	void ExportReleaseData (XmlWriter xml)
-	{
-		if (ModuleReleaseData is null)
-			return;
-
-		xml.WriteStartElement ("module");
-
-		xml.WriteAttributeStringIfNotDefault ("assembly-name", ModuleReleaseData.AssemblyName);
-		xml.WriteAttributeStringIfNotDefault ("mvid", ModuleReleaseData.Mvid.ToString ("N"));
-		xml.WriteAttributeStringIfNotDefault ("mvid-bytes", Convert.ToBase64String (ModuleReleaseData.MvidBytes));
-
-		if (ModuleReleaseData.Types?.Length > 0) {
-			xml.WriteStartElement ("types");
-
-			foreach (var entry in ModuleReleaseData.DuplicateTypes)
-				ExportTypeMapReleaseEntry (xml, entry, null);
-
-			xml.WriteEndElement ();
-		}
-
-		if (ModuleReleaseData.DuplicateTypes?.Count > 0) {
-			xml.WriteStartElement ("duplicates");
-
-			foreach (var entry in ModuleReleaseData.DuplicateTypes)
-				ExportTypeMapReleaseEntry (xml, entry, null);
-
-			xml.WriteEndElement ();
-		}
-
-		if (ModuleReleaseData.TypesScratch?.Count > 0) {
-			xml.WriteStartElement ("types-scratch");
-
-			foreach (var kvp in ModuleReleaseData.TypesScratch)
-				ExportTypeMapReleaseEntry (xml, kvp.Value, kvp.Key);
-
-			xml.WriteEndElement ();
-		}
-
-		xml.WriteEndElement ();
-	}
-
-	void ExportTypeMapReleaseEntry (XmlWriter xml, TypeMapReleaseEntry entry, string? key)
-	{
-		xml.WriteStartElement ("entry");
-
-		xml.WriteAttributeStringIfNotDefault ("key", key);
-		xml.WriteAttributeStringIfNotDefault ("java-name", entry.JavaName);
-		xml.WriteAttributeStringIfNotDefault ("managed-type-name", entry.ManagedTypeName);
-		xml.WriteAttributeStringIfNotDefault ("token", entry.Token.ToString ());
-		xml.WriteAttributeStringIfNotDefault ("skip-in-java-to-managed", entry.SkipInJavaToManaged);
-
-		xml.WriteEndElement ();
-	}
-
-	/// <summary>
-	/// Given an assembly path, return the path to the ".typemap.xml" file that should be next to it.
-	/// </summary>
-	public static string GetTypeMapObjectsXmlFilePath (string assemblyPath)
-		=> Path.ChangeExtension (assemblyPath, ".typemap.xml");
-
-	public static string GetTypeMapObjectsXmlFilePath (ITaskItem assembly)
-	{
-		var path = assembly.GetMetadata ("TypeMapObjectsXmlFile");
-		return path.IsNullOrEmpty () ? GetTypeMapObjectsXmlFilePath (assembly.ItemSpec) : path;
-	}
-
-	public static TypeMapObjectsXmlFile Import (string filename)
-	{
-		// If the file has zero length, then the assembly wasn't scanned because it couldn't contain JLOs.
-		// This check is much faster than loading and parsing an empty XML file.
-		var fi = new FileInfo (filename);
-
-		if (fi.Length == 0)
-			return unscanned;
-
-		using var reader = XmlReader.Create (filename);
-
-		if (!reader.ReadToFollowing ("api"))
-			throw new InvalidOperationException ($"Invalid XML file '{filename}'");
-
-		var type = reader.GetAttribute ("type");
-
-		if (type.IsNullOrWhiteSpace ())
-			throw new InvalidOperationException ($"Missing required attribute 'type' in '{filename}'");
-
-		var assemblyName = reader.GetAttribute ("assembly-name");
-		var assemblyFullName = reader.GetAttribute ("assembly-full-name");
-		var mvidValue = reader.GetAttribute ("mvid");
-		var mvid = mvidValue.IsNullOrWhiteSpace () ? Guid.Empty : Guid.Parse (mvidValue);
-		var foundJniNativeRegistration = GetAttributeOrDefault (reader, "found-jni-native-registration", false);
-
-		var file = new TypeMapObjectsXmlFile {
-			WasScanned = true,
-			AssemblyName = assemblyName,
-			AssemblyFullName = assemblyFullName,
-			AssemblyMvid = mvid,
-			FoundJniNativeRegistration = foundJniNativeRegistration,
-		};
-
-		if (type == "debug")
-			ImportDebugData (reader, file);
-		else if (type == "release")
-			ImportReleaseData (reader, file);
-
-		return file;
-	}
-
-	static void ImportDebugData (XmlReader reader, TypeMapObjectsXmlFile file)
-	{
-		var assemblyName = file.AssemblyName ?? string.Empty;
-		var assemblyFullName = file.AssemblyFullName ?? string.Empty;
-		var isMonoAndroid = assemblyName == "Mono.Android";
-
-		while (reader.Read ()) {
-			if (reader.NodeType != XmlNodeType.Element)
-				continue;
-
-			if (reader.Name == "java-to-managed")
-				ReadDebugEntries (reader, file.JavaToManagedDebugEntries, assemblyName, assemblyFullName, isMonoAndroid);
-			else if (reader.Name == "managed-to-java")
-				ReadDebugEntries (reader, file.ManagedToJavaDebugEntries, assemblyName, assemblyFullName, isMonoAndroid);
-		}
-	}
-
-	static void ImportReleaseData (XmlReader reader, TypeMapObjectsXmlFile file)
-	{
-		if (!reader.ReadToFollowing ("module"))
-			return;
-
-		var mvidValue = reader.GetAttribute ("mvid");
-		file.ModuleReleaseData = new ModuleReleaseData {
-			AssemblyName = reader.GetAttribute ("assembly-name") ?? string.Empty,
-			Mvid = mvidValue.IsNullOrWhiteSpace () ? Guid.Empty : Guid.Parse (mvidValue),
-			MvidBytes = Convert.FromBase64String (GetAttributeOrDefault (reader, "mvid-bytes", string.Empty)),
-			TypesScratch = new Dictionary<string, TypeMapReleaseEntry> (StringComparer.Ordinal),
-			DuplicateTypes = new List<TypeMapReleaseEntry> (),
-		};
-
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType != XmlNodeType.Element)
-				continue;
-
-			switch (reader.Name) {
-				case "types":
-					var types = new List<TypeMapReleaseEntry> ();
-					ReadReleaseEntries (reader, types);
-					file.ModuleReleaseData.Types = types.ToArray ();
-					break;
-				case "duplicates":
-					ReadReleaseEntries (reader, file.ModuleReleaseData.DuplicateTypes);
-					break;
-				case "types-scratch":
-					ReadReleaseScratchEntries (reader, file.ModuleReleaseData.TypesScratch);
-					break;
-			}
-		}
-	}
-
-	public static void WriteEmptyFile (string destination, TaskLoggingHelper log)
-	{
-		log.LogDebugMessage ($"Writing empty file '{destination}'");
-
-		// We write a zero byte file to indicate the file couldn't have JLO types and wasn't scanned
-		File.Create (destination).Dispose ();
-	}
-
-	static TypeMapDebugEntry FromDebugEntryXml (XmlReader reader, string assemblyName, string assemblyFullName, bool isMonoAndroid)
-	{
-		return new TypeMapDebugEntry {
-			JavaName = reader.GetAttribute ("java-name") ?? string.Empty,
-			ManagedName = reader.GetAttribute ("managed-name") ?? string.Empty,
-			ManagedTypeTokenId = GetAttributeOrDefault (reader, "managed-type-token-id", 0u),
-			SkipInJavaToManaged = GetAttributeOrDefault (reader, "skip-in-java-to-managed", false),
-			IsInvoker = GetAttributeOrDefault (reader, "is-invoker", false),
-			IsMonoAndroid = isMonoAndroid,
-			AssemblyName = assemblyName,
-			AssemblyFullName = assemblyFullName,
-		};
-	}
-
-	static TypeMapReleaseEntry FromReleaseEntryXml (XmlReader reader)
-	{
-		return new TypeMapReleaseEntry {
-			JavaName = reader.GetAttribute ("java-name") ?? string.Empty,
-			ManagedTypeName = reader.GetAttribute ("managed-type-name") ?? string.Empty,
-			Token = GetAttributeOrDefault (reader, "token", 0u),
-			SkipInJavaToManaged = GetAttributeOrDefault (reader, "skip-in-java-to-managed", false),
-		};
-	}
-
-	static T GetAttributeOrDefault<T> (XmlReader reader, string name, T defaultValue)
-	{
-		var value = reader.GetAttribute (name);
-
-		if (value.IsNullOrWhiteSpace ())
-			return defaultValue;
-
-		return (T) Convert.ChangeType (value, typeof (T), CultureInfo.InvariantCulture);
-	}
-
-	static void ReadDebugEntries (XmlReader reader, List<TypeMapDebugEntry> entries, string assemblyName, string assemblyFullName, bool isMonoAndroid)
-	{
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType == XmlNodeType.Element && reader.Name == "entry")
-				entries.Add (FromDebugEntryXml (reader, assemblyName, assemblyFullName, isMonoAndroid));
-		}
-	}
-
-	static void ReadReleaseEntries (XmlReader reader, List<TypeMapReleaseEntry> entries)
-	{
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType == XmlNodeType.Element && reader.Name == "entry")
-				entries.Add (FromReleaseEntryXml (reader));
-		}
-	}
-
-	static void ReadReleaseScratchEntries (XmlReader reader, Dictionary<string, TypeMapReleaseEntry> entries)
-	{
-		if (reader.IsEmptyElement)
-			return;
-
-		int depth = reader.Depth;
-
-		while (reader.Read ()) {
-			if (reader.NodeType == XmlNodeType.EndElement && reader.Depth == depth)
-				return;
-
-			if (reader.NodeType == XmlNodeType.Element && reader.Name == "entry") {
-				var key = reader.GetAttribute ("key") ?? string.Empty;
-				entries.Add (key, FromReleaseEntryXml (reader));
-			}
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs
deleted file mode 100644
index 7b188b18a5e..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingAssemblyGenerator.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-#nullable enable
-using System;
-using Xamarin.Android.Tasks.LLVMIR;
-
-using Microsoft.Build.Utilities;
-
-namespace Xamarin.Android.Tasks
-{
-	abstract class TypeMappingAssemblyGenerator : LlvmIrComposer
-	{
-		protected TypeMappingAssemblyGenerator (TaskLoggingHelper log)
-			: base (log)
-		{
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
deleted file mode 100644
index 17064c7c5e6..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tasks.LLVMIR;
-
-namespace Xamarin.Android.Tasks;
-
-class TypeMappingDebugNativeAssemblyGenerator : LlvmIrComposer
-{
-	const string JavaToManagedSymbol = "map_java_to_managed";
-	const string ManagedToJavaSymbol = "map_managed_to_java";
-
-	// These names MUST match src/native/clr/include/xamarin-app.hh
-	const string TypeMapSymbol = "type_map";
-	const string AssemblyNamesBlobSymbol = "type_map_assembly_names";
-	const string ManagedTypeNamesBlobSymbol = "type_map_managed_type_names";
-	const string JavaTypeNamesBlobSymbol = "type_map_java_type_names";
-	const string TypeMapManagedTypeInfoSymbol = "type_map_managed_type_info";
-
-	sealed class TypeMapContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override ulong GetBufferSize (object data, string fieldName)
-		{
-			var map_module = EnsureType<TypeMap> (data);
-			return fieldName switch {
-				"java_to_managed" => map_module.entry_count,
-				"managed_to_java" => map_module.entry_count,
-				_ => 0
-			};
-		}
-
-		public override string? GetPointedToSymbolName (object data, string fieldName)
-		{
-			var map_module = EnsureType<TypeMap> (data);
-
-			if (MonoAndroidHelper.StringEquals ("java_to_managed", fieldName)) {
-				return map_module.JavaToManagedCount == 0 ? null : JavaToManagedSymbol;
-			}
-
-			if (MonoAndroidHelper.StringEquals ("managed_to_java", fieldName)) {
-				return map_module.ManagedToJavaCount == 0 ? null : ManagedToJavaSymbol;
-			}
-
-			return base.GetPointedToSymbolName (data, fieldName);
-		}
-	}
-
-	sealed class TypeMapEntryContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override string GetComment (object data, string fieldName)
-		{
-			var entry = EnsureType<TypeMapEntry> (data);
-
-			if (MonoAndroidHelper.StringEquals ("from", fieldName)) {
-				return $" from: '{entry.From}'";
-			}
-
-			if (MonoAndroidHelper.StringEquals ("to", fieldName)) {
-				return $" to: '{entry.To}'";
-			}
-
-			return String.Empty;
-		}
-	}
-
-	sealed class TypeMapManagedTypeInfoContextDataProvider : NativeAssemblerStructContextDataProvider
-	{
-		public override string GetComment (object data, string fieldName)
-		{
-			var entry = EnsureType<TypeMapManagedTypeInfo> (data);
-
-			if (MonoAndroidHelper.StringEquals ("assembly_name_index", fieldName)) {
-				return $" '{entry.AssemblyName}'";
-			}
-
-			if (MonoAndroidHelper.StringEquals ("managed_type_token_id", fieldName)) {
-				return $" '{entry.ManagedTypeName}'";
-			}
-
-			return String.Empty;
-		}
-	}
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh TypeMapEntry structure
-	[NativeAssemblerStructContextDataProvider (typeof (TypeMapEntryContextDataProvider))]
-	sealed class TypeMapEntry
-	{
-		[NativeAssembler (Ignore = true)]
-		public string From = String.Empty;
-
-		[NativeAssembler (Ignore = true)]
-		public string To = String.Empty;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint from;
-
-		[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-		public uint from_hash;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint to;
-	};
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh TypeMapManagedTypeInfo structure
-	[NativeAssemblerStructContextDataProvider (typeof (TypeMapManagedTypeInfoContextDataProvider))]
-	sealed class TypeMapManagedTypeInfo
-	{
-		[NativeAssembler (Ignore = true)]
-		public string AssemblyName = String.Empty;
-
-		[NativeAssembler (Ignore = true)]
-		public string ManagedTypeName = String.Empty;
-
-		[NativeAssembler (UsesDataProvider = true)]
-		public uint assembly_name_index;
-
-		[NativeAssembler (UsesDataProvider = true, NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-		public uint managed_type_token_id;
-	};
-
-	// Order of fields and their type must correspond *exactly* to that in
-	// src/native/clr/include/xamarin-app.hh TypeMap structure
-	[NativeAssemblerStructContextDataProvider (typeof (TypeMapContextDataProvider))]
-	sealed class TypeMap
-	{
-		[NativeAssembler (Ignore = true)]
-		public int    JavaToManagedCount;
-
-		[NativeAssembler (Ignore = true)]
-		public int    ManagedToJavaCount;
-
-		public uint   entry_count;
-
-		[NativeAssembler (UsesDataProvider = true), NativePointer (PointsToSymbol = "")]
-		public TypeMapEntry? java_to_managed = null;
-
-		[NativeAssembler (UsesDataProvider = true), NativePointer (PointsToSymbol = "")]
-		public TypeMapEntry? managed_to_java = null;
-	};
-
-	readonly TypeMapGenerator.ModuleDebugData data;
-	StructureInfo? typeMapEntryStructureInfo;
-	StructureInfo? typeMapStructureInfo;
-	StructureInfo? typeMapManagedTypeInfoStructureInfo;
-	List<StructureInstance<TypeMapEntry>> javaToManagedMap;
-	List<StructureInstance<TypeMapEntry>> managedToJavaMap;
-	List<StructureInstance<TypeMapManagedTypeInfo>> managedTypeInfos;
-	StructureInstance<TypeMap>? type_map;
-
-	public TypeMappingDebugNativeAssemblyGenerator (TaskLoggingHelper log, TypeMapGenerator.ModuleDebugData data)
-		: base (log)
-	{
-		if (data.UniqueAssemblies == null || data.UniqueAssemblies.Count == 0) {
-			throw new InvalidOperationException ("Internal error: set of unique assemblies must be provided.");
-		}
-
-		this.data = data;
-
-		javaToManagedMap = new ();
-		managedToJavaMap = new ();
-		managedTypeInfos = new ();
-	}
-
-	protected override void Construct (LlvmIrModule module)
-	{
-		module.DefaultStringGroup = "tmd";
-
-		if (data.UniqueAssemblies == null) {
-			throw new InvalidOperationException ("Internal error: unique assemblies collection must be present");
-		}
-
-		MapStructures (module);
-
-		var managedTypeNames = new LlvmIrStringBlob ();
-		var javaTypeNames = new LlvmIrStringBlob ();
-
-		// CoreCLR supports only 64-bit targets, so we can make things simpler by hashing all the things here instead of
-		// in a callback during code generation
-
-		foreach (TypeMapGenerator.TypeMapDebugEntry entry in data.ManagedToJavaMap) {
-			if (String.IsNullOrEmpty (entry.AssemblyFullName)) {
-				throw new InvalidOperationException ($"Internal error: assembly full name is missing for managed type '{entry.ManagedName}'.");
-			}
-
-			if (!entry.ManagedName.EndsWith (entry.AssemblyName, StringComparison.Ordinal)) {
-				throw new InvalidOperationException ($"Internal error: managed type name '{entry.ManagedName}' does not end with assembly name '{entry.AssemblyName}'.");
-			}
-
-			string managedName = entry.ManagedName.Substring (0, entry.ManagedName.Length - entry.AssemblyName.Length) + entry.AssemblyFullName;
-			(int managedTypeNameOffset, int _) = managedTypeNames.Add (managedName);
-			(int javaTypeNameOffset, int _) = javaTypeNames.Add (entry.JavaName);
-			var m2j = new TypeMapEntry {
-				From = managedName,
-				To = entry.JavaName,
-
-				from = (uint)managedTypeNameOffset,
-				from_hash = TypeMapHelper.HashNameForCLR (managedName),
-				to = (uint)javaTypeNameOffset,
-			};
-			managedToJavaMap.Add (new StructureInstance<TypeMapEntry> (typeMapEntryStructureInfo, m2j));
-		}
-
-		// Input is sorted on name, we need to re-sort it on hashes.
-		managedToJavaMap.Sort ((StructureInstance<TypeMapEntry> a, StructureInstance<TypeMapEntry> b) => {
-			if (a.Instance == null) {
-				return b.Instance == null ? 0 : -1;
-			}
-
-			if (b.Instance == null) {
-				return 1;
-			}
-
-			return a.Instance.from_hash.CompareTo (b.Instance.from_hash);
-		});
-
-		var assemblyNamesBlob = new LlvmIrStringBlob ();
-		data.UniqueAssemblies.Sort ((a, b) => String.Compare (a.Name, b.Name, StringComparison.Ordinal));
-		foreach (TypeMapGenerator.TypeMapDebugAssembly asm in data.UniqueAssemblies) {
-			assemblyNamesBlob.Add (asm.Name);
-		}
-
-		var managedTypeInfos = new List<StructureInstance<TypeMapManagedTypeInfo>> ();
-		// Java-to-managed maps don't use hashes since many mappings have multiple instances
-		foreach (TypeMapGenerator.TypeMapDebugEntry entry in data.JavaToManagedMap) {
-			TypeMapGenerator.TypeMapDebugEntry managedEntry = entry.DuplicateForJavaToManaged != null ? entry.DuplicateForJavaToManaged : entry;
-			(int managedTypeNameOffset, int _) = managedTypeNames.Add (managedEntry.ManagedName);
-			(int javaTypeNameOffset, int _) = javaTypeNames.Add (entry.JavaName);
-
-			var j2m = new TypeMapEntry {
-				From = entry.JavaName,
-				To = managedEntry.SkipInJavaToManaged ? String.Empty : managedEntry.ManagedName,
-
-				from = (uint)javaTypeNameOffset,
-				from_hash = 0,
-				to = managedEntry.SkipInJavaToManaged ? uint.MaxValue : (uint)managedTypeNameOffset,
-			};
-			javaToManagedMap.Add (new StructureInstance<TypeMapEntry> (typeMapEntryStructureInfo, j2m));
-
-			int assemblyNameOffset = assemblyNamesBlob.GetIndexOf (managedEntry.AssemblyName);
-			if (assemblyNameOffset < 0) {
-				throw new InvalidOperationException ($"Internal error: assembly name '{managedEntry.AssemblyName}' not found in the assembly names blob.");
-			}
-
-			var typeInfo = new TypeMapManagedTypeInfo {
-				AssemblyName = managedEntry.AssemblyName,
-				ManagedTypeName = managedEntry.ManagedName,
-
-				assembly_name_index = (uint)assemblyNameOffset,
-				managed_type_token_id = managedEntry.ManagedTypeTokenId,
-			};
-			managedTypeInfos.Add (new StructureInstance<TypeMapManagedTypeInfo> (typeMapManagedTypeInfoStructureInfo, typeInfo));
-		}
-
-		var map = new TypeMap {
-			JavaToManagedCount = data.JavaToManagedMap == null ? 0 : data.JavaToManagedMap.Count,
-			ManagedToJavaCount = data.ManagedToJavaMap == null ? 0 : data.ManagedToJavaMap.Count,
-
-			entry_count = data.EntryCount,
-		};
-		type_map = new StructureInstance<TypeMap> (typeMapStructureInfo, map);
-
-		module.AddGlobalVariable (TypeMapSymbol, type_map, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (ManagedToJavaSymbol, managedToJavaMap, LlvmIrVariableOptions.LocalConstant);
-		module.AddGlobalVariable (JavaToManagedSymbol, javaToManagedMap, LlvmIrVariableOptions.LocalConstant);
-		module.AddGlobalVariable (TypeMapManagedTypeInfoSymbol, managedTypeInfos, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (AssemblyNamesBlobSymbol, assemblyNamesBlob, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (ManagedTypeNamesBlobSymbol, managedTypeNames, LlvmIrVariableOptions.GlobalConstant);
-		module.AddGlobalVariable (JavaTypeNamesBlobSymbol, javaTypeNames, LlvmIrVariableOptions.GlobalConstant);
-	}
-
-	void MapStructures (LlvmIrModule module)
-	{
-		typeMapEntryStructureInfo = module.MapStructure<TypeMapEntry> ();
-		typeMapStructureInfo = module.MapStructure<TypeMap> ();
-		typeMapManagedTypeInfoStructureInfo = module.MapStructure<TypeMapManagedTypeInfo> ();
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
deleted file mode 100644
index 9283922719d..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
+++ /dev/null
@@ -1,486 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tasks.LLVMIR;
-
-namespace Xamarin.Android.Tasks
-{
-	partial class TypeMappingReleaseNativeAssemblyGenerator : LlvmIrComposer
-	{
-		sealed class TypeMapModuleContextDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var map_module = EnsureType<TypeMapModule> (data);
-
-				if (MonoAndroidHelper.StringEquals ("module_uuid", fieldName)) {
-					return $" module_uuid: {map_module.MVID}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("assembly_name_index", fieldName)) {
-					return $" assembly_name: {map_module.AssemblyName}";
-				}
-
-				return String.Empty;
-			}
-
-			public override ulong GetBufferSize (object data, string fieldName)
-			{
-				var map_module = EnsureType<TypeMapModule> (data);
-
-				if (MonoAndroidHelper.StringEquals ("map", fieldName)) {
-					return map_module.entry_count;
-				}
-
-				if (MonoAndroidHelper.StringEquals ("duplicate_map", fieldName)) {
-					return map_module.duplicate_count;
-				}
-
-				return base.GetBufferSize (data, fieldName);
-			}
-		}
-
-		sealed class TypeMapJavaContextDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var java_map_entry = EnsureType<TypeMapJava> (data);
-
-				if (MonoAndroidHelper.StringEquals ("managed_type_name_index", fieldName)) {
-					return $" managed type name: {java_map_entry.ManagedTypeName}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("java_name_index", fieldName)) {
-					return $" Java type name: {java_map_entry.JavaName}";
-				}
-
-				return String.Empty;
-			}
-		};
-
-		sealed class TypeMapModuleEntryContextDataProvider : NativeAssemblerStructContextDataProvider
-		{
-			public override string GetComment (object data, string fieldName)
-			{
-				var module_map_entry = EnsureType<TypeMapModuleEntry> (data);
-
-				if (MonoAndroidHelper.StringEquals ("managed_type_name_hash", fieldName)) {
-					return $" managed type name: {module_map_entry.ManagedTypeName}";
-				}
-
-				if (MonoAndroidHelper.StringEquals ("java_map_index", fieldName)) {
-					return $" Java type name: {module_map_entry.JavaTypeMapEntry.JavaName}";
-				}
-
-				return String.Empty;
-			}
-		};
-
-		// Order of fields and their type must correspond *exactly* to that in
-		// src/native/clr/include/xamarin-app.hh TypeMapModuleEntry structure
-		[NativeAssemblerStructContextDataProvider (typeof (TypeMapModuleEntryContextDataProvider))]
-		sealed class TypeMapModuleEntry
-		{
-			[NativeAssembler (Ignore = true)]
-			public TypeMapJava JavaTypeMapEntry;
-
-			[NativeAssembler (Ignore = true)]
-			public string ManagedTypeName;
-
-			[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-			public uint managed_type_name_hash;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint managed_type_name_index;
-
-			public uint managed_type_name_length;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint java_map_index;
-		}
-
-		// Order of fields and their type must correspond *exactly* to that in
-		// src/native/clr/include/xamarin-app.hh TypeMapModule structure
-		[NativeAssemblerStructContextDataProvider (typeof (TypeMapModuleContextDataProvider))]
-		sealed class TypeMapModule
-		{
-			[NativeAssembler (Ignore = true)]
-			public Guid    MVID;
-
-			[NativeAssembler (Ignore = true)]
-			public TypeMapGenerator.ModuleReleaseData Data;
-
-			[NativeAssembler (Ignore = true)]
-			public string AssemblyName;
-
-			[NativeAssembler (UsesDataProvider = true, InlineArray = true, InlineArraySize = 16)]
-			public byte[]  module_uuid;
-			public uint    entry_count;
-			public uint    duplicate_count;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint    assembly_name_index;
-			public uint    assembly_name_length;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint map_index;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint duplicate_map_index;
-		}
-
-		// Order of fields and their type must correspond *exactly* to that in
-		// src/native/clr/include/xamarin-app.hh TypeMapJava structure
-		[NativeAssemblerStructContextDataProvider (typeof (TypeMapJavaContextDataProvider))]
-		sealed class TypeMapJava
-		{
-			[NativeAssembler (Ignore = true)]
-			public string JavaName;
-
-			[NativeAssembler (Ignore = true)]
-			public string ManagedTypeName;
-
-			[NativeAssembler (Ignore = true)]
-			public uint JavaNameHash;
-
-			public uint module_index;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint managed_type_name_index;
-			public uint managed_type_name_length;
-
-			[NativeAssembler (NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal)]
-			public uint managed_type_token_id;
-
-			[NativeAssembler (UsesDataProvider = true)]
-			public uint java_name_index;
-			public uint java_name_length;
-		}
-
-		sealed class ModuleMapData
-		{
-			public List<StructureInstance<TypeMapModuleEntry>> Entries { get; }
-
-			public ModuleMapData (List<StructureInstance<TypeMapModuleEntry>> entries)
-			{
-				Entries = entries;
-			}
-		}
-
-		sealed class JavaNameHashComparer : IComparer<StructureInstance<TypeMapJava>>
-		{
-			public int Compare (StructureInstance<TypeMapJava> a, StructureInstance<TypeMapJava> b)
-			{
-				int hashCompare = a.Instance.JavaNameHash.CompareTo (b.Instance.JavaNameHash);
-				if (hashCompare != 0) {
-					return hashCompare;
-				}
-
-				return StringComparer.Ordinal.Compare (a.Instance.JavaName, b.Instance.JavaName);
-			}
-		}
-
-		sealed class ConstructionState
-		{
-			public List<StructureInstance<TypeMapModule>> MapModules;
-			public Dictionary<string, TypeMapJava> JavaTypesByName;
-			public List<StructureInstance<TypeMapJava>> JavaMap;
-			public List<ModuleMapData> AllModulesData;
-			public LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>> AllModulesMaps;
-			public LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>> AllModulesDuplicates;
-			public LlvmIrStringBlob AssemblyNamesBlob;
-			public LlvmIrStringBlob JavaTypeNamesBlob;
-			public LlvmIrStringBlob ManagedTypeNamesBlob;
-		}
-
-		readonly NativeTypeMappingData mappingData;
-		StructureInfo typeMapJavaStructureInfo;
-		StructureInfo typeMapModuleStructureInfo;
-		StructureInfo typeMapModuleEntryStructureInfo;
-		JavaNameHashComparer javaNameHashComparer;
-
-		public TypeMappingReleaseNativeAssemblyGenerator (TaskLoggingHelper log, NativeTypeMappingData mappingData)
-			: base (log)
-		{
-			this.mappingData = mappingData ?? throw new ArgumentNullException (nameof (mappingData));
-			javaNameHashComparer = new JavaNameHashComparer ();
-
-			// Unfortunate, but we have to fix this up before proceeding
-			foreach (TypeMapGenerator.ModuleReleaseData module in mappingData.Modules) {
-				foreach (TypeMapGenerator.TypeMapReleaseEntry entry in module.Types) {
-					if (entry.ManagedTypeName.IndexOf ('/') < 0) {
-						continue;
-					}
-
-					// CoreCLR will request for subtypes with the `+` level separator instead of
-					// the `/` one.
-					entry.ManagedTypeName = entry.ManagedTypeName.Replace ('/', '+');
-				}
-			}
-		}
-
-		protected override void Construct (LlvmIrModule module)
-		{
-			module.DefaultStringGroup = "tmr";
-
-			MapStructures (module);
-
-			var cs = new ConstructionState ();
-			cs.JavaTypesByName = new Dictionary<string, TypeMapJava> (StringComparer.Ordinal);
-			InitJavaMap (cs);
-			InitMapModules (cs);
-			PrepareModules (cs);
-
-			module.AddGlobalVariable ("managed_to_java_map_module_count", mappingData.MapModuleCount);
-			module.AddGlobalVariable ("java_type_count", cs.JavaMap.Count);
-
-			var managed_to_java_map = new LlvmIrGlobalVariable (cs.MapModules, "managed_to_java_map", LlvmIrVariableOptions.GlobalWritable) {
-				Comment = " Managed modules map",
-			};
-			module.Add (managed_to_java_map);
-
-			// Java hashes are output before Java type map **and** managed modules, because they will also sort the Java map for us.
-			// This is not strictly necessary, as we could do the sorting in the java map BeforeWriteCallback, but this way we save
-			// time sorting only once.
-			var java_to_managed_hashes = new LlvmIrGlobalVariable (typeof(List<uint>), "java_to_managed_hashes") {
-				Comment = " Java types name hashes",
-				BeforeWriteCallback = GenerateAndSortJavaHashes,
-				BeforeWriteCallbackCallerState = cs,
-				GetArrayItemCommentCallback = GetJavaHashesItemComment,
-				GetArrayItemCommentCallbackCallerState = cs,
-				NumberFormat = LlvmIrVariableNumberFormat.Hexadecimal,
-			};
-			java_to_managed_hashes.WriteOptions &= ~LlvmIrVariableWriteOptions.ArrayWriteIndexComments;
-			module.Add (java_to_managed_hashes);
-
-			var modulesMapData = new LlvmIrGlobalVariable (cs.AllModulesMaps, "modules_map_data", LlvmIrVariableOptions.GlobalConstant) {
-				BeforeWriteCallback = SortEntriesAndUpdateJavaIndexes,
-				BeforeWriteCallbackCallerState = cs,
-			};
-			module.Add (modulesMapData);
-
-			var modulesDuplicatesData = new LlvmIrGlobalVariable (cs.AllModulesDuplicates, "modules_duplicates_data", LlvmIrVariableOptions.GlobalConstant) {
-				BeforeWriteCallback = SortEntriesAndUpdateJavaIndexes,
-				BeforeWriteCallbackCallerState = cs,
-			};
-			module.Add (modulesDuplicatesData);
-
-			module.AddGlobalVariable ("java_to_managed_map", cs.JavaMap, LlvmIrVariableOptions.GlobalConstant, " Java to managed map");
-			module.AddGlobalVariable ("java_type_names", cs.JavaTypeNamesBlob, LlvmIrVariableOptions.GlobalConstant, " Java type names");
-			module.AddGlobalVariable ("java_type_names_size", (ulong)cs.JavaTypeNamesBlob.Size, LlvmIrVariableOptions.GlobalConstant, " Java type names blob size");
-			module.AddGlobalVariable ("managed_type_names", cs.ManagedTypeNamesBlob, LlvmIrVariableOptions.GlobalConstant, " Managed type names");
-			module.AddGlobalVariable ("managed_assembly_names", cs.AssemblyNamesBlob, LlvmIrVariableOptions.GlobalConstant, " Managed assembly names");
-		}
-
-		void SortEntriesAndUpdateJavaIndexes (LlvmIrVariable variable, LlvmIrModuleTarget target, object? callerState)
-		{
-			ConstructionState cs = EnsureConstructionState (callerState);
-			LlvmIrGlobalVariable gv = EnsureGlobalVariable (variable);
-
-			var array = (LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>>)variable.Value;
-			foreach (LlvmIrArraySection<StructureInstance<TypeMapModuleEntry>> section in array.Sections) {
-				section.Data.Sort (
-					(object a, object b) => {
-						var entryA = ((StructureInstance<TypeMapModuleEntry>)a).Instance;
-						var entryB = ((StructureInstance<TypeMapModuleEntry>)b).Instance;
-						int hashCompare = entryA.managed_type_name_hash.CompareTo (entryB.managed_type_name_hash);
-						if (hashCompare != 0) {
-							return hashCompare;
-						}
-
-						return StringComparer.Ordinal.Compare (entryA.ManagedTypeName, entryB.ManagedTypeName);
-					}
-				);
-
-				foreach (StructureInstance<TypeMapModuleEntry> entry in section.Data) {
-					entry.Instance.java_map_index = GetJavaEntryIndex (entry.Instance.JavaTypeMapEntry);
-				}
-			}
-
-			uint GetJavaEntryIndex (TypeMapJava javaEntry)
-			{
-				var key = new StructureInstance<TypeMapJava> (typeMapJavaStructureInfo, javaEntry);
-				int idx = cs.JavaMap.BinarySearch (key, javaNameHashComparer);
-				if (idx < 0) {
-					throw new InvalidOperationException ($"Could not map entry '{javaEntry.JavaName}' to array index");
-				}
-
-				return (uint)idx;
-			}
-		}
-
-		string? GetJavaHashesItemComment (LlvmIrVariable v, LlvmIrModuleTarget target, ulong index, object? value, object? callerState)
-		{
-			var cs = callerState as ConstructionState;
-			if (cs == null) {
-				throw new InvalidOperationException ("Internal error: construction state expected but not found");
-			}
-
-			return $" {index} => {cs.JavaMap[(int)index].Instance.JavaName}";
-		}
-
-		void GenerateAndSortJavaHashes (LlvmIrVariable variable, LlvmIrModuleTarget target, object? callerState)
-		{
-			ConstructionState cs = EnsureConstructionState (callerState);
-			LlvmIrGlobalVariable gv = EnsureGlobalVariable (variable);
-
-			for (int i = 0; i < cs.JavaMap.Count; i++) {
-				TypeMapJava entry = cs.JavaMap[i].Instance;
-				entry.JavaNameHash = TypeMapHelper.HashNameForCLR (entry.JavaName);
-			}
-
-			cs.JavaMap.Sort (javaNameHashComparer);
-
-			var hashes = new List<uint> ();
-			foreach (StructureInstance<TypeMapJava> si in cs.JavaMap) {
-				hashes.Add (si.Instance.JavaNameHash);
-			}
-
-			gv.OverrideTypeAndValue (typeof(List<uint>), hashes);
-		}
-
-		ConstructionState EnsureConstructionState (object? callerState)
-		{
-			var cs = callerState as ConstructionState;
-			if (cs == null) {
-				throw new InvalidOperationException ("Internal error: construction state expected but not found");
-			}
-
-			return cs;
-		}
-
-		uint GetEntryIndex (string entryValue, Dictionary<string, uint> seenCache, List<string> entryList)
-		{
-			if (!seenCache.TryGetValue (entryValue, out uint assemblyNameIndex)) {
-				entryList.Add (entryValue);
-				assemblyNameIndex = (uint)(entryList.Count - 1);
-				seenCache.Add (entryValue, assemblyNameIndex);
-			}
-
-			return assemblyNameIndex;
-		}
-
-		void InitJavaMap (ConstructionState cs)
-		{
-			var seenManagedTypeNames = new Dictionary<string, uint> (StringComparer.Ordinal);
-			cs.JavaMap = new List<StructureInstance<TypeMapJava>> ();
-			cs.ManagedTypeNamesBlob = new ();
-			cs.JavaTypeNamesBlob = new ();
-
-			TypeMapJava map_entry;
-			foreach (TypeMapGenerator.TypeMapReleaseEntry entry in mappingData.JavaTypes) {
-				string assemblyName = mappingData.Modules[entry.ModuleIndex].AssemblyName;
-				(int managedTypeNameIndex, int managedTypeNameLength) = cs.ManagedTypeNamesBlob.Add (entry.ManagedTypeName);
-				(int javaTypeNameIndex, int javaTypeNameLength) = cs.JavaTypeNamesBlob.Add (entry.JavaName);
-
-				map_entry = new TypeMapJava {
-					ManagedTypeName = entry.ManagedTypeName,
-
-					module_index = (uint)entry.ModuleIndex, // UInt32.MaxValue,
-					managed_type_name_index = (uint)managedTypeNameIndex,
-					managed_type_name_length = (uint)managedTypeNameLength,
-					managed_type_token_id = entry.Token,
-					java_name_index = (uint)javaTypeNameIndex,
-					java_name_length = (uint)javaTypeNameLength,
-					JavaName = entry.JavaName,
-				};
-
-				cs.JavaMap.Add (new StructureInstance<TypeMapJava> (typeMapJavaStructureInfo, map_entry));
-				cs.JavaTypesByName.Add (map_entry.JavaName, map_entry);
-			}
-		}
-
-		void InitMapModules (ConstructionState cs)
-		{
-			var seenAssemblyNames = new Dictionary<string, uint> (StringComparer.OrdinalIgnoreCase);
-
-			cs.MapModules = new List<StructureInstance<TypeMapModule>> ();
-			cs.AssemblyNamesBlob = new ();
-			cs.AllModulesMaps = new ();
-			cs.AllModulesDuplicates = new ();
-
-			uint map_start_index = 0;
-			uint duplicates_start_index = 0;
-			foreach (TypeMapGenerator.ModuleReleaseData data in mappingData.Modules) {
-				bool haveDuplicates = data.DuplicateTypes.Count > 0;
-				(int assemblyNameIndex, int assemblyNameLength) = cs.AssemblyNamesBlob.Add (data.AssemblyName);
-
-				var map_module = new TypeMapModule {
-					MVID = data.Mvid,
-					Data = data,
-					AssemblyName = data.AssemblyName,
-
-					module_uuid = data.MvidBytes,
-					entry_count = (uint)data.Types.Length,
-					duplicate_count = (uint)data.DuplicateTypes.Count,
-					assembly_name_index = (uint)assemblyNameIndex,
-					assembly_name_length = (uint)assemblyNameLength,
-					map_index = map_start_index,
-					duplicate_map_index = haveDuplicates ? duplicates_start_index : UInt32.MaxValue,
-				};
-
-				map_start_index += map_module.entry_count;
-				duplicates_start_index += map_module.duplicate_count;
-
-				cs.MapModules.Add (new StructureInstance<TypeMapModule> (typeMapModuleStructureInfo, map_module));
-			}
-		}
-
-		void MapStructures (LlvmIrModule module)
-		{
-			typeMapJavaStructureInfo = module.MapStructure<TypeMapJava> ();
-			typeMapModuleStructureInfo = module.MapStructure<TypeMapModule> ();
-			typeMapModuleEntryStructureInfo = module.MapStructure<TypeMapModuleEntry> ();
-		}
-
-		void PrepareMapModuleData (IEnumerable<TypeMapGenerator.TypeMapReleaseEntry> moduleEntries, LlvmIrSectionedArray<StructureInstance<TypeMapModuleEntry>> destCollection, string sectionHeader, ConstructionState cs)
-		{
-			var moduleSection = new LlvmIrArraySection<StructureInstance<TypeMapModuleEntry>> (sectionHeader);
-			foreach (TypeMapGenerator.TypeMapReleaseEntry entry in moduleEntries) {
-				if (!cs.JavaTypesByName.TryGetValue (entry.JavaName, out TypeMapJava javaType)) {
-					throw new InvalidOperationException ($"Internal error: Java type '{entry.JavaName}' not found in cache");
-				}
-
-				(int managedTypeNameIndex, int managedTypeNameLength) = cs.ManagedTypeNamesBlob.Add (entry.ManagedTypeName);
-				var map_entry = new TypeMapModuleEntry {
-					JavaTypeMapEntry = javaType,
-					ManagedTypeName = entry.ManagedTypeName,
-
-					managed_type_name_hash = TypeMapHelper.HashNameForCLR (entry.ManagedTypeName),
-					managed_type_name_index = (uint)managedTypeNameIndex,
-					managed_type_name_length = (uint)managedTypeNameLength,
-					java_map_index = UInt32.MaxValue, // will be set later, when the target is known
-				};
-				moduleSection.Add (new StructureInstance<TypeMapModuleEntry> (typeMapModuleEntryStructureInfo, map_entry));
-			}
-			destCollection.Add (moduleSection);
-		}
-
-		void PrepareModules (ConstructionState cs)
-		{
-			cs.AllModulesData = new List<ModuleMapData> ();
-			foreach (StructureInstance<TypeMapModule> moduleInstance in cs.MapModules) {
-				TypeMapModule module = moduleInstance.Instance;
-				PrepareMapModuleData (
-					module.Data.Types,
-					cs.AllModulesMaps,
-					$" Module: {module.AssemblyName}; MVID: {module.MVID}; number of entries: {module.Data.Types.Length}",
-					cs
-				);
-				if (module.Data.DuplicateTypes.Count > 0) {
-					PrepareMapModuleData (
-						module.Data.DuplicateTypes,
-						cs.AllModulesDuplicates,
-						$" Module: {module.AssemblyName}; MVID: {module.MVID}; number of entries: {module.Data.DuplicateTypes.Count}",
-						cs
-					);
-				}
-			}
-		}
-
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index 0f6df31c98b..8f5a9ec54d6 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -47,7 +47,6 @@
     <!-- Include only the linker sources required for the build tasks (LinkAssembliesNoShrink and PostTrimmingPipeline) -->
     <!-- These include: AddKeepAlivesStep, AddKeepAlivesHelper, CheckForObsoletePreserveAttributeStep, StripEmbeddedLibrariesStep, PostTrimmingAddKeepAlivesStep, FixAbstractMethodsStep, FixLegacyResourceDesignerStep, LinkDesignerBase -->
     <Compile Remove="Linker\**" />
-    <Compile Include="Linker\MonoDroid.Tuner\FindTypeMapObjectsStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\FindJavaObjectsStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\AddKeepAlivesStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\AddKeepAlivesHelper.cs" />
@@ -204,9 +203,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\Mono.Android\java\mono\android\TypeManager.java">
-      <LogicalName>JavaInteropTypeManager.java</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="Resources\*" Exclude="Resources\LayoutBinding.cs">
       <LogicalName>%(Filename)%(Extension)</LogicalName>
     </EmbeddedResource>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index b268e1c4b30..2156c1f13f9 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -55,8 +55,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.CreateTemporaryDirectory" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.FilterAssemblies" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.FindLayoutsToBind" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateACWMap" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateAdditionalProviderSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateLayoutBindings" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateLibraryResources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateManagedAidlProxies" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -64,9 +62,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateNativeMarshalMethodSources" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesigner" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GenerateResourceDesignerAssembly" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateJavaCallableWrappers" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateJavaStubs" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.GenerateMainAndroidManifest" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GeneratePackageManagerJava" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GetAndroidDefineConstants" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GetAppSettingsDirectory" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -82,7 +77,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 <UsingTask TaskName="Xamarin.Android.Tasks.ProcessAssemblyCompressionFailures" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.RemoveDirFixed" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.ReadAndroidManifest" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
-<UsingTask TaskName="Xamarin.Android.Tasks.RewriteMarshalMethods" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.GetExtraPackages" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.CopyGeneratedJavaResourceClasses" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 <UsingTask TaskName="Xamarin.Android.Tasks.SplitProperty" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
@@ -269,7 +263,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 
 	<!-- If true it will cause all the assemblies in the apk to be preloaded on startup time -->
 	<_NativeAssemblySourceDir>$(IntermediateOutputPath)android\</_NativeAssemblySourceDir>
-	<_SkipJniAddNativeMethodRegistrationAttributeScan Condition=" '$(_SkipJniAddNativeMethodRegistrationAttributeScan)' == '' ">False</_SkipJniAddNativeMethodRegistrationAttributeScan>
 
 	<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' And '$(EmbedAssembliesIntoApk)' == 'False' ">True</_AndroidFastDeployEnvironmentFiles>
 	<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' ">False</_AndroidFastDeployEnvironmentFiles>
@@ -321,16 +314,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
   <_AndroidUseAssemblyStore Condition="'$(EmbedAssembliesIntoApk)' != 'true' ">false</_AndroidUseAssemblyStore>
 </PropertyGroup>
 
-<PropertyGroup>
-  <AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' and ('$(UsingMicrosoftNETSdkRazor)' == 'true') ">False</AndroidEnableMarshalMethods>
-  <!-- NOTE: temporarily disable for NativeAOT and CoreCLR for now -->
-  <AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' ">False</AndroidEnableMarshalMethods>
-
-  <_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">False</_AndroidUseMarshalMethods>
-  <_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">$(AndroidEnableMarshalMethods)</_AndroidUseMarshalMethods>
-
-</PropertyGroup>
-
 <!-- Do not resolve from the GAC under any circumstances in Mobile -->
 <PropertyGroup>
 	<AssemblySearchPaths>
@@ -495,7 +478,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
   />
   <AndroidError Code="XA1049"
       ResourceName="XA1049"
-      Condition=" '$(AndroidEnableMarshalMethods)' == 'True' And '$(PublishReadyToRun)' == 'True' "
+      Condition=" '$(AndroidApplication)' == 'true' And '$(AndroidEnableMarshalMethods)' == 'True' "
   />
   <AndroidWarning Code="XA1027"
       ResourceName="XA1027"
@@ -891,8 +874,6 @@ because xbuild doesn't support framework reference assemblies.
 	<_AndroidLinkFlag>$(IntermediateOutputPath)link.flag</_AndroidLinkFlag>
 	<_AndroidApkPerAbiFlagFile>$(IntermediateOutputPath)android\bin\apk_per_abi.flag</_AndroidApkPerAbiFlagFile>
 	<_AndroidDebugKeyStoreFlag>$(IntermediateOutputPath)android_debug_keystore.flag</_AndroidDebugKeyStoreFlag>
-	<_AdditionalPostLinkerStepsFlag>$(_AndroidStampDirectory)_AdditionalPostLinkerSteps.stamp</_AdditionalPostLinkerStepsFlag>
-	<_AfterILLinkOutputDir>$(IntermediateOutputPath)afterlink\</_AfterILLinkOutputDir>
 	<_AcwMapFile>$(IntermediateOutputPath)acw-map.txt</_AcwMapFile>
 	<_CustomViewMapFile>$(IntermediateOutputPath)customview-map.txt</_CustomViewMapFile>
 	<AndroidResgenNamespace Condition="'$(AndroidResgenNamespace)'==''" >$(RootNamespace)</AndroidResgenNamespace>
@@ -951,7 +932,6 @@ because xbuild doesn't support framework reference assemblies.
 		<_PropertyCacheItems Include="ProjectFullPath=$(MSBuildProjectFullPath)" />
 		<_PropertyCacheItems Include="AndroidUseDesignerAssembly=$(AndroidUseDesignerAssembly)" />
 		<_PropertyCacheItems Include="AndroidTypeMapImplementation=$(AndroidTypeMapImplementation)" />
-		<_PropertyCacheItems Include="_AndroidUseMarshalMethods=$(_AndroidUseMarshalMethods)" />
 		<_PropertyCacheItems Include="_AndroidJcwCodegenTarget=$(_AndroidJcwCodegenTarget)" />
 		<_PropertyCacheItems Include="_AndroidAssemblyStoreCompressionLevel=$(_AndroidAssemblyStoreCompressionLevel)" />
 	</ItemGroup>
@@ -1354,17 +1334,9 @@ because xbuild doesn't support framework reference assemblies.
 <!-- Runtime jar selection.
      Trimmable jars replace JavaProxyObject/JavaProxyThrowable with non-native implementations. -->
 <Target Name="_CollectRuntimeJarFilenames">
-  <PropertyGroup Condition=" '$(_AndroidRuntime)' != 'CoreCLR' and '$(AndroidTypeMapImplementation)' != 'trimmable' ">
-    <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime.jar</_RuntimeJar>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">
+  <PropertyGroup>
     <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime_trimmable.jar</_RuntimeJar>
   </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(_AndroidRuntime)' == 'CoreCLR' and '$(AndroidTypeMapImplementation)' != 'trimmable' ">
-    <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime_clr.jar</_RuntimeJar>
-  </PropertyGroup>
 </Target>
 
 <Target Name="_AddStaticResources"
@@ -1394,14 +1366,6 @@ because xbuild doesn't support framework reference assemblies.
   <ItemGroup>
     <!-- We need this in its own item group so it isn't lost during a partial build -->
     <_AllResolvedAssemblies Include="@(ResolvedAssemblies)" />
-    <ResolvedAssemblies>
-      <JavaObjectsXmlFile
-          Condition=" '$(PublishTrimmed)' == 'true' And '$(AndroidTypeMapImplementation)' != 'trimmable' And $([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) "
-      >$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubDirectory)%(Filename).scan.empty</JavaObjectsXmlFile>
-      <TypeMapObjectsXmlFile
-          Condition=" '$(PublishTrimmed)' == 'true' And '$(AndroidTypeMapImplementation)' != 'trimmable' And $([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) "
-      >$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubDirectory)%(Filename).scan.empty</TypeMapObjectsXmlFile>
-    </ResolvedAssemblies>
   </ItemGroup>
 </Target>
 
@@ -1414,7 +1378,6 @@ because xbuild doesn't support framework reference assemblies.
       ApplicationJavaClass="$(AndroidApplicationJavaClass)"
       CodeGenerationTarget="$(AndroidCodegenTarget)"
       Debug="$(AndroidIncludeDebugSymbols)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
       PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
       ResolvedAssemblies="@(_AllResolvedAssemblies)"
@@ -1434,77 +1397,6 @@ because xbuild doesn't support framework reference assemblies.
   </ItemGroup>
 </Target>
 
-<!-- Runs additional steps after ILLink runs (_LinkAssemblies).
-     Preserve the existing in-place rewrite behavior when marshal methods are explicitly enabled.
-     Otherwise, write to afterlink/ so linked/ stays unchanged and downstream incrementalism is
-     preserved. -->
-<Target Name="_RunAfterILLinkAdditionalSteps"
-    DependsOnTargets="_LinkAssembliesNoShrinkInputs"
-    Condition="'$(PublishTrimmed)' == 'true' and '$(AndroidTypeMapImplementation)' != 'trimmable'"
-    Inputs="$(_AndroidLinkFlag)"
-    Outputs="$(_AdditionalPostLinkerStepsFlag)">
-  <MakeDir Directories="$(_AfterILLinkOutputDir)" Condition=" '$(_AndroidUseMarshalMethods)' != 'True' " />
-  <ItemGroup>
-    <_AfterILLinkSourceFiles Include="@(ResolvedAssemblies)"
-        Condition=" '$(_AndroidUseMarshalMethods)' != 'True' or !$([System.String]::Copy('%(ResolvedAssemblies.Filename)').ToLowerInvariant().EndsWith('.resources')) " />
-    <_AfterILLinkDestFiles Condition=" '$(_AndroidUseMarshalMethods)' != 'True' " Include="@(_AfterILLinkSourceFiles->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-    <_AfterILLinkDestFiles Condition=" '$(_AndroidUseMarshalMethods)' == 'True' " Include="@(_AfterILLinkSourceFiles)" />
-    <_AndroidScanMarkerFiles Include="@(ResolvedAssemblies->'%(JavaObjectsXmlFile)')" Condition=" '%(ResolvedAssemblies.JavaObjectsXmlFile)' != '' " />
-  </ItemGroup>
-  <AssemblyModifierPipeline
-      ApplicationJavaClass="$(AndroidApplicationJavaClass)"
-      CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
-      Debug="$(AndroidIncludeDebugSymbols)"
-      DestinationFiles="@(_AfterILLinkDestFiles)"
-      Deterministic="$(Deterministic)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
-      ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
-      PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
-      ReadSymbols="$(_AndroidLinkAssembliesReadSymbols)"
-      ResolvedAssemblies="@(_AllResolvedAssemblies)"
-      ResolvedUserAssemblies="@(ResolvedUserAssemblies)"
-      SourceFiles="@(_AfterILLinkSourceFiles)"
-      TargetName="$(TargetName)">
-  </AssemblyModifierPipeline>
-  <MakeDir Directories="@(_AndroidScanMarkerFiles->'%(RootDir)%(Directory)')" />
-  <Touch Files="@(_AndroidScanMarkerFiles)" AlwaysCreate="true" />
-  <Touch Files="$(_AdditionalPostLinkerStepsFlag)" AlwaysCreate="true" />
-  <ItemGroup>
-    <FileWrites Include="@(_AndroidScanMarkerFiles)" />
-    <_AfterILLinkSourceFiles Remove="@(_AfterILLinkSourceFiles)" />
-    <_AfterILLinkDestFiles Remove="@(_AfterILLinkDestFiles)" />
-    <_AndroidScanMarkerFiles Remove="@(_AndroidScanMarkerFiles)" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">
-    <FileWrites Include="$(_AfterILLinkOutputDir)**" />
-  </ItemGroup>
-</Target>
-
-<!-- Updates assembly itemgroups to point to afterlink/ outputs.
-     When marshal methods are enabled, assemblies were modified in-place in linked/
-     so no redirection is needed, but the target still runs to trigger _RunAfterILLinkAdditionalSteps. -->
-<Target Name="_AfterILLinkAdditionalSteps"
-    DependsOnTargets="_RunAfterILLinkAdditionalSteps"
-    Condition="'$(PublishTrimmed)' == 'true' and '$(AndroidTypeMapImplementation)' != 'trimmable'">
-  <ItemGroup Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">
-    <_OrigResolvedAssemblies Include="@(ResolvedAssemblies)" />
-    <ResolvedAssemblies Remove="@(ResolvedAssemblies)" />
-    <ResolvedAssemblies Include="@(_OrigResolvedAssemblies->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-
-    <_OrigResolvedUserAssemblies Include="@(ResolvedUserAssemblies)" />
-    <ResolvedUserAssemblies Remove="@(ResolvedUserAssemblies)" />
-    <ResolvedUserAssemblies Include="@(_OrigResolvedUserAssemblies->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-
-    <_OrigResolvedFrameworkAssemblies Include="@(ResolvedFrameworkAssemblies)" />
-    <ResolvedFrameworkAssemblies Remove="@(ResolvedFrameworkAssemblies)" />
-    <ResolvedFrameworkAssemblies Include="@(_OrigResolvedFrameworkAssemblies->'$(_AfterILLinkOutputDir)%(DestinationSubPath)')" />
-
-    <_OrigResolvedAssemblies Remove="@(_OrigResolvedAssemblies)" />
-    <_OrigResolvedUserAssemblies Remove="@(_OrigResolvedUserAssemblies)" />
-    <_OrigResolvedFrameworkAssemblies Remove="@(_OrigResolvedFrameworkAssemblies)" />
-  </ItemGroup>
-</Target>
-
 <!-- _PrepareAssemblies lives in Microsoft.Android.Sdk.AssemblyResolution.targets -->
 
 <Target Name="_GetGenerateJavaStubsInputs" DependsOnTargets="_GenerateEnvironmentFiles">
@@ -1763,7 +1655,6 @@ because xbuild doesn't support framework reference assemblies.
       AndroidPackageName="$(_AndroidPackage)"
       PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
       UseAssemblyStore="$(_AndroidUseAssemblyStore)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       CustomBundleConfigFile="$(AndroidBundleConfigurationFile)"
       AndroidRuntime="$(_AndroidRuntime)"
       ProjectRuntimeConfigFilePath="$(ProjectRuntimeConfigFilePath)"
@@ -1773,12 +1664,9 @@ because xbuild doesn't support framework reference assemblies.
 
   <GenerateNativeMarshalMethodSources
       AndroidRuntime="$(_AndroidRuntime)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
       EnvironmentOutputDirectory="$(IntermediateOutputPath)android"
-      IntermediateOutputDirectory="$(IntermediateOutputPath)"
       ResolvedAssemblies="@(_ResolvedAssemblies)"
-      SatelliteAssemblies="@(_AndroidResolvedSatellitePaths)"
       SupportedAbis="@(_BuildTargetAbis)">
   </GenerateNativeMarshalMethodSources>
 
@@ -2994,7 +2882,5 @@ because xbuild doesn't support framework reference assemblies.
 <!-- TypeMap imports must be last so their target overrides (e.g. _RemoveRegisterAttribute) take precedence -->
 <Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.Android.Sdk.TypeMap.Trimmable.targets"
     Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' and '$(AndroidApplication)' == 'true' " />
-<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.Android.Sdk.TypeMap.LlvmIr.targets"
-    Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' " />
 
 </Project>
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 40879cbfd01..cce5f669ba5 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -883,20 +883,10 @@ public void ActivityAliasRuns ([ValueSource (typeof (BaseTest), nameof (BaseTest
 		}
 
 		[Test]
-		public void NativeAssemblyCacheWithSatelliteAssemblies ([Values] bool enableMarshalMethods, [Values (AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
+		public void NativeAssemblyCacheWithSatelliteAssemblies ([Values (AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
 		{
 			const bool isRelease = true;
-			if (enableMarshalMethods && runtime == AndroidRuntime.CoreCLR) {
-				// This currently fails with the following exception:
-				//
-				// error XARMM7015: System.NotSupportedException: Writing mixed-mode assemblies is not supported
-				//  at Mono.Cecil.ModuleWriter.Write(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleWriter.WriteModule(ModuleDefinition module, Disposable`1 stream, WriterParameters parameters)
-				//  at Mono.Cecil.ModuleDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Mono.Cecil.AssemblyDefinition.Write(String fileName, WriterParameters parameters)
-				//  at Xamarin.Android.Tasks.MarshalMethodsAssemblyRewriter.Rewrite(Boolean brokenExceptionTransitions) in src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs:line 165
-				//  at Xamarin.Android.Tasks.RewriteMarshalMethods.RewriteMethods(NativeCodeGenState state, Boolean brokenExceptionTransitionsEnabled) in src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs:line 160
-				Assert.Ignore ("CoreCLR: fails because of a Mono.Cecil lack of support");
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
 				return;
 			}
 
@@ -923,7 +913,6 @@ public void NativeAssemblyCacheWithSatelliteAssemblies ([Values] bool enableMars
 
 			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
-				EnableMarshalMethods = enableMarshalMethods,
 			};
 			proj.SetRuntime (runtime);
 			proj.References.Add (new BuildItem.ProjectReference ($"..\\{lib.ProjectName}\\{lib.ProjectName}.csproj", lib.ProjectName, lib.ProjectGuid));
diff --git a/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs b/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs
deleted file mode 100644
index ca817105d4d..00000000000
--- a/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using NUnit.Framework;
-using Xamarin.ProjectTools;
-using System.IO;
-using System.Linq;
-using Microsoft.Build.Framework;
-using System.Text;
-using System.Xml.Linq;
-using System.Collections.Generic;
-using Xamarin.Android.Tasks;
-
-namespace Xamarin.Android.Build.Tests;
-
-[TestFixture]
-[Category ("UsesDevice")]
-[Category ("MayHang")]
-public class MarshalMethodsGCHangTests : DeviceTest
-{
-	static readonly string MarshalMethodsAppRuns_PermissionManifest = @"<?xml version=""1.0"" encoding=""utf-8""?>
-<manifest xmlns:android=""http://schemas.android.com/apk/res/android"" android:versionCode=""1"" android:versionName=""1.0"" package=""{0}"">
-        <uses-sdk />
-        <application android:label=""{0}"">
-        </application>
-        <uses-permission android:name=""android.permission.INTERNET"" />
-</manifest>";
-
-	static readonly string MarshalMethodsAppRuns_MainActivity = @"using Android.Media;
-
-namespace marshal2;
-
-[Activity (Label = ""@string/app_name"", MainLauncher = true)]
-public class MainActivity : Activity
-{
-	protected override void OnCreate (Bundle? savedInstanceState)
-	{
-		base.OnCreate (savedInstanceState);
-		SetContentView (Resource.Layout.Main);
-	}
-
-	protected override void OnStart ()
-	{
-		base.OnStart ();
-
-		try {
-			var mp = new MediaPlayer ();
-			mp.SetDataSource (new StreamMediaDataSource (new MemoryStream (new byte[65536])));
-			mp.Prepare ();
-		} catch (Java.IO.IOException) {
-			GC.Collect ();
-		}
-		Console.WriteLine (""XXX:OnStart done"");
-	}
-
-	class StreamMediaDataSource (System.IO.Stream data) : MediaDataSource
-	{
-		public override long Size => data.Length;
-
-		public override int ReadAt (long position, byte[]? buffer, int offset, int size)
-		{
-			try {
-				Console.WriteLine ($""XXX:START StreamMediaDataSource.ReadAt {position} {buffer} {buffer?.Length ?? 0} {offset} {size}"");
-
-				// Allocate enough to trigger GC
-				for (int i = 0; i < 1000; i++) {
-					_ = new byte[8192];
-				}
-
-				if (data.CanSeek) {
-					data.Seek (position, SeekOrigin.Begin);
-				}
-				return data.Read (buffer ?? [], offset, size);
-			} finally {
-				Console.WriteLine ($""XXX:END //StreamMediaDataSource.ReadAt {position} {buffer} {buffer?.Length ?? 0} {offset} {size}"");
-			}
-		}
-
-		public override void Close ()
-		{
-			data.Dispose ();
-			data = System.IO.Stream.Null;
-		}
-	}
-}
-";
-
-	[Test]
-	[Ignore ("Marshal methods are not yet working on CoreCLR: https://github.com/dotnet/android/issues/12206")]
-	public void MarshalMethodsAppRuns ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
-	{
-		const bool isRelease = true;
-		if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
-			return;
-		}
-
-		if (runtime == AndroidRuntime.NativeAOT) {
-			Assert.Ignore ("Not supported with NativeAOT");
-		}
-
-		var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime, "marshal2")) {
-			IsRelease = isRelease,
-			EnableMarshalMethods = true,
-			SupportedOSPlatformVersion = "24", // Minimum 24 to be able to test on Android 16
-			TrimModeRelease = TrimMode.Full,
-			ProjectName = "marshal2",
-		};
-		proj.SetRuntime (runtime);
-		proj.SetRuntimeIdentifiers (new[] { DeviceAbi });
-		proj.AndroidManifest = String.Format (MarshalMethodsAppRuns_PermissionManifest, proj.PackageName);
-		proj.MainActivity = MarshalMethodsAppRuns_MainActivity;
-		proj.SetDefaultTargetDevice ();
-		// TODO: AndroidEnableMarshalMethods and ReadyToRun do not work together
-		if (runtime == AndroidRuntime.CoreCLR) {
-			proj.SetProperty ("PublishReadyToRun", "false");
-		}
-
-		using var apkBuilder = CreateApkBuilder ();
-		Assert.True (apkBuilder.Install (proj), "Project should have installed.");
-		ClearAdbLogcat ();
-
-		const string expectedLogcatOutput = "XXX:OnStart done";
-		Assert.IsTrue (
-			MonitorAdbLogcat (
-				InstallAndRunTests.CreateLineChecker (expectedLogcatOutput),
-				logcatFilePath: Path.Combine (Root, apkBuilder.ProjectDirectory, "startup-logcat.log"),
-				timeout: 60,
-				onMonitoringStarted: () => StartActivityAndAssert (proj)
-			),
-			$"Output did not contain {expectedLogcatOutput}!"
-		);
-	}
-}

From ce2b7ca55e6702b4bd700346a4236f84bd38708f Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 08:44:15 +0200
Subject: [PATCH 41/58] Preserve library Java runtime jar selection

Use trimmable Java APIs for explicit library opt-ins without importing application type map targets, and retain the packaged CoreCLR/default jars for libraries without an implementation selection.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Xamarin.Android.Common.targets                            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 2156c1f13f9..6075d981d88 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1335,7 +1335,9 @@ because xbuild doesn't support framework reference assemblies.
      Trimmable jars replace JavaProxyObject/JavaProxyThrowable with non-native implementations. -->
 <Target Name="_CollectRuntimeJarFilenames">
   <PropertyGroup>
-    <_RuntimeJar>$(MSBuildThisFileDirectory)\java_runtime_trimmable.jar</_RuntimeJar>
+    <_RuntimeJar Condition=" '$(AndroidTypeMapImplementation)' == 'trimmable' ">$(MSBuildThisFileDirectory)\java_runtime_trimmable.jar</_RuntimeJar>
+    <_RuntimeJar Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' and '$(_AndroidRuntime)' == 'CoreCLR' ">$(MSBuildThisFileDirectory)\java_runtime_clr.jar</_RuntimeJar>
+    <_RuntimeJar Condition=" '$(AndroidTypeMapImplementation)' != 'trimmable' and '$(_AndroidRuntime)' != 'CoreCLR' ">$(MSBuildThisFileDirectory)\java_runtime.jar</_RuntimeJar>
   </PropertyGroup>
 </Target>
 

From ee9dc12baf3ca06016863cd78c87461e13c88c5e Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 15:34:34 +0200
Subject: [PATCH 42/58] Restore CoreCLR remote-process provider generation

Keep generating additional Java runtime providers for trimmable CoreCLR apps after removing the legacy GenerateAdditionalProviderSources task. Register a dedicated task and track generated Java files for incremental Clean.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
index af917b7a586..833f47a99e7 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
@@ -545,6 +545,11 @@
         OutputDirectory="$(IntermediateOutputPath)android"
         AdditionalProviderSources="@(_AdditionalProviderSources)" />
 
+    <GenerateCoreClrRuntimeProviderSources
+        Condition=" '$(_AndroidRuntime)' == 'CoreCLR' and '@(_AdditionalProviderSources->Count())' != '0' "
+        OutputDirectory="$(IntermediateOutputPath)android"
+        AdditionalProviderSources="@(_AdditionalProviderSources)" />
+
     <!-- Copy generated manifest to expected location -->
     <Copy SourceFiles="$(_TypeMapBaseOutputDir)AndroidManifest.xml"
         DestinationFiles="$(IntermediateOutputPath)AndroidManifest.xml"

From d52cab0054b795b5360c4ea420ba560ad4140d55 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 30 Sep 2026 18:11:03 +0200
Subject: [PATCH 43/58] Remove duplicate provider invocation after main rebase

The shared CoreCLR provider generation is already supplied by main. Keep a single call while preserving the legacy typemap removals and upstream prelink fixes.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
index 833f47a99e7..af917b7a586 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
@@ -545,11 +545,6 @@
         OutputDirectory="$(IntermediateOutputPath)android"
         AdditionalProviderSources="@(_AdditionalProviderSources)" />
 
-    <GenerateCoreClrRuntimeProviderSources
-        Condition=" '$(_AndroidRuntime)' == 'CoreCLR' and '@(_AdditionalProviderSources->Count())' != '0' "
-        OutputDirectory="$(IntermediateOutputPath)android"
-        AdditionalProviderSources="@(_AdditionalProviderSources)" />
-
     <!-- Copy generated manifest to expected location -->
     <Copy SourceFiles="$(_TypeMapBaseOutputDir)AndroidManifest.xml"
         DestinationFiles="$(IntermediateOutputPath)AndroidManifest.xml"

From 8497d3cbd80ad09b73ade35611fa24daf47fcd34 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 30 Sep 2026 23:27:23 +0200
Subject: [PATCH 44/58] Fix remaining trimmable typemap CI regressions

Exercise the supported typemap validation target instead of deleted build targets. Remove obsolete Cecil JCW/XML scanning from the no-shrink pipeline, retaining compatibility fixups and assembly copying, and update managed-typemap regression coverage.

Isolate relocation-test builds from persistent compiler and MSBuild servers without weakening move, incremental-build, or signing assertions.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../MonoDroid.Tuner/FindJavaObjectsStep.cs    | 119 --------------
 .../Tasks/AssemblyModifierPipeline.cs         |  14 --
 .../Xamarin.Android.Build.Tests/BuildTest2.cs |  13 +-
 .../BuildWithLibraryTests.cs                  |  21 +--
 .../InvalidConfigTests.cs                     |  11 +-
 .../Tasks/LinkerTests.cs                      |  58 ++++++-
 .../Utilities/ACWMapGenerator.cs              | 151 ------------------
 .../Utilities/JavaObjectsXmlFile.cs           | 148 -----------------
 .../Utilities/XAJavaTypeScanner.cs            | 135 ----------------
 .../Xamarin.Android.Build.Tasks.csproj        |   1 -
 .../Xamarin.Android.Common.targets            |   4 +-
 11 files changed, 78 insertions(+), 597 deletions(-)
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/ACWMapGenerator.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/JavaObjectsXmlFile.cs
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs

diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
deleted file mode 100644
index 269e8f152b4..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.JavaCallableWrappers.Adapters;
-using Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Mono.Linker;
-using Mono.Linker.Steps;
-using Xamarin.Android.Tasks;
-
-namespace MonoDroid.Tuner;
-
-/// <summary>
-/// Scans an assembly for JLOs that need JCWs generated and writes them to an XML file.
-/// </summary>
-public class FindJavaObjectsStep : BaseStep, IAssemblyModifierPipelineStep
-{
-	public string ApplicationJavaClass { get; set; } = "";
-
-	public bool ErrorOnCustomJavaObject { get; set; }
-
-	public TaskLoggingHelper Log { get; set; }
-
-	public FindJavaObjectsStep (TaskLoggingHelper log) => Log = log;
-
-	public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
-	{
-		var destinationJLOXml = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (context.Destination.ItemSpec);
-		var scanned = ScanAssembly (assembly, context, destinationJLOXml);
-
-		if (!scanned) {
-			// We didn't scan for Java objects, so write an empty .xml file for later steps
-			JavaObjectsXmlFile.WriteEmptyFile (destinationJLOXml, Log);
-		}
-	}
-
-	public bool ScanAssembly (AssemblyDefinition assembly, StepContext context, string destinationJLOXml)
-	{
-		if (!ShouldScan (context))
-			return false;
-
-		var action = Annotations.HasAction (assembly) ? Annotations.GetAction (assembly) : AssemblyAction.Skip;
-
-		if (action == AssemblyAction.Delete)
-			return false;
-
-		var types = ScanForJavaTypes (assembly);
-		var initial_count = types.Count;
-
-		// Filter out Java types we don't care about
-		types = types.Where (t => !JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (t, Context)).ToList ();
-
-		Log.LogDebugMessage ($"{assembly.Name.Name} - Found {initial_count} Java types, filtered to {types.Count}");
-
-		var xml = new JavaObjectsXmlFile ();
-
-		xml.ACWMapEntries.AddRange (types.Select (t => ACWMapEntry.Create (t, Context)));
-		xml.JavaCallableWrappers.AddRange (ConvertToCallableWrappers (types.Where (t => !t.IsInterface).ToList ()));
-
-		xml.Export (destinationJLOXml);
-
-		Log.LogDebugMessage ($"Wrote '{destinationJLOXml}', {xml.JavaCallableWrappers.Count} JCWs, {xml.ACWMapEntries.Count} ACWs");
-
-		return true;
-	}
-
-	bool ShouldScan (StepContext context)
-	{
-		if (!context.IsAndroidAssembly)
-			return false;
-
-		// XAJavaInterop1 uses the framework JCWs from the runtime jar.
-		var shouldSkipNonUserAssemblies = context.CodeGenerationTarget == JavaPeerStyle.XAJavaInterop1;
-
-		if (shouldSkipNonUserAssemblies && !context.IsUserAssembly) {
-			Log.LogDebugMessage ($"Skipping assembly '{context.Source.ItemSpec}' because it is not a user assembly and we don't need JLOs from non-user assemblies");
-			return false;
-		}
-
-		return true;
-	}
-
-	List<TypeDefinition> ScanForJavaTypes (AssemblyDefinition assembly)
-	{
-		var types = new List<TypeDefinition> ();
-
-		var scanner = new XAJavaTypeScanner (Xamarin.Android.Tools.AndroidTargetArch.None, Log, Context) {
-			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject
-		};
-
-		foreach (ModuleDefinition md in assembly.Modules) {
-			foreach (TypeDefinition td in md.Types) {
-				scanner.AddJavaType (td, types);
-			}
-		}
-
-		return types;
-	}
-
-	List<CallableWrapperType> ConvertToCallableWrappers (List<TypeDefinition> types)
-	{
-		var wrappers = new List<CallableWrapperType> ();
-
-		var reader_options = new CallableWrapperReaderOptions {
-			DefaultApplicationJavaClass = ApplicationJavaClass,
-			DefaultMonoRuntimeInitialization = "mono.MonoPackageManager.LoadApplication (context);",
-		};
-
-		foreach (var type in types) {
-			var wrapper = CecilImporter.CreateType (type, Context, reader_options);
-			wrappers.Add (wrapper);
-		}
-
-		return wrappers;
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs b/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
index d16a3bbcf99..be4e2de00e9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/AssemblyModifierPipeline.cs
@@ -26,8 +26,6 @@ public class AssemblyModifierPipeline : AndroidTask
 {
 	public override string TaskPrefix => "AMP";
 
-	public string ApplicationJavaClass { get; set; } = "";
-
 	public string CodeGenerationTarget { get; set; } = "";
 
 	public bool Debug { get; set; }
@@ -37,8 +35,6 @@ public class AssemblyModifierPipeline : AndroidTask
 
 	public bool Deterministic { get; set; }
 
-	public bool ErrorOnCustomJavaObject { get; set; }
-
 	public string? PackageNamingPolicy { get; set; }
 
 	/// <summary>
@@ -128,15 +124,6 @@ public override bool RunTask ()
 
 	protected virtual void BuildPipeline (AssemblyPipeline pipeline, MSBuildLinkContext context)
 	{
-		// FindJavaObjectsStep
-		var findJavaObjectsStep = new FindJavaObjectsStep (Log) {
-			ApplicationJavaClass = ApplicationJavaClass,
-			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject,
-		};
-
-		findJavaObjectsStep.Initialize (context);
-		pipeline.Steps.Add (findJavaObjectsStep);
-
 		// SaveChangedAssemblyStep
 		var writerParameters = new WriterParameters {
 			DeterministicMvid = Deterministic,
@@ -144,7 +131,6 @@ protected virtual void BuildPipeline (AssemblyPipeline pipeline, MSBuildLinkCont
 
 		var saveChangedAssemblyStep = new SaveChangedAssemblyStep (Log, writerParameters);
 		pipeline.Steps.Add (saveChangedAssemblyStep);
-
 	}
 
 	void RunPipeline (AssemblyPipeline pipeline, ITaskItem source, ITaskItem destination)
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
index 22ace1122ea..effcc029672 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -186,11 +186,16 @@ public void BuildBasicApplicationThenMoveIt ([ValueSource (typeof (BaseTest), na
 				IsRelease = isRelease,
 			};
 			proj.SetRuntime (runtime);
+			// This test relocates build inputs; no compiler/build server may retain them.
+			proj.SetProperty ("UseSharedCompilation", "false");
+			var environmentVariables = new Dictionary<string, string> {
+				["DOTNET_CLI_USE_MSBUILD_SERVER"] = "0",
+			};
 			using (var b = CreateApkBuilder (path)) {
 				b.Target = "Build";
-				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
+				Assert.IsTrue (b.Build (proj, environmentVariables: environmentVariables), "Build should have succeeded.");
 				b.Target = "SignAndroidPackage";
-				Assert.IsTrue (b.Build (proj), "SignAndroidPackage should have succeeded.");
+				Assert.IsTrue (b.Build (proj, environmentVariables: environmentVariables), "SignAndroidPackage should have succeeded.");
 
 
 				string path2 = Path.Combine (Root, "temp", TestName, "App2");
@@ -201,11 +206,11 @@ public void BuildBasicApplicationThenMoveIt ([ValueSource (typeof (BaseTest), na
 				foreach (var r in proj.AndroidResources)
 					r.Timestamp = DateTime.UtcNow;
 				b.Target = "Build";
-				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "Build should have succeeded.");
+				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false, environmentVariables: environmentVariables), "Build should have succeeded.");
 				Assert.IsTrue (!b.Output.IsTargetSkipped ("_CleanIntermediateIfNeeded"), "_CleanIntermediateIfNeeded should be built.");
 				Assert.IsTrue (!b.Output.IsTargetSkipped ("_CompileResources"), "_CompileResources Should have built.");
 				b.Target = "SignAndroidPackage";
-				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "SignAndroidPackage should have succeeded.");
+				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false, environmentVariables: environmentVariables), "SignAndroidPackage should have succeeded.");
 
 			}
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs
index 61b8881b4dc..764e2b7294d 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs
@@ -1111,8 +1111,7 @@ public void DotNetLibraryAarChanges ([Values (AndroidRuntime.CoreCLR, AndroidRun
 		/// And MultiTfmLib contains Java-interop types (e.g. BroadcastReceiver) that only
 		/// exist in the net11.0-android TFM, the build tasks must load the Android-TFM assembly
 		/// and generate JCWs for those types. Previously, the net11.0 (non-Android) assembly
-		/// could be loaded instead, causing FindJavaObjectsStep to report "Found 0 Java types"
-		/// and producing empty .jlo.xml files.
+		/// could be loaded instead, omitting Android-only types from the managed type map.
 		/// </summary>
 		[Test]
 		public void MultiTfmTransitiveReference ([Values (AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
@@ -1209,18 +1208,12 @@ public class CoreClass
 			using var appBuilder = CreateApkBuilder (Path.Combine (path, app.ProjectName));
 			Assert.IsTrue (appBuilder.Build (app), $"{app.ProjectName} should build");
 
-			// Verify: MultiTfmLib.jlo.xml should NOT be empty (i.e. the assembly was scanned as an Android assembly)
-			var jloXml = appBuilder.Output.GetIntermediaryPath (
-				Path.Combine ("android", "assets", "arm64-v8a", "MultiTfmLib.jlo.xml"));
-			FileAssert.Exists (jloXml);
-
-			var jloXmlInfo = new FileInfo (jloXml);
-			Assert.IsTrue (jloXmlInfo.Length > 0,
-				"MultiTfmLib.jlo.xml should not be empty — the Android-TFM assembly was not loaded (wrong TFM loaded instead)");
-
-			var jloContent = File.ReadAllText (jloXml);
-			Assert.IsTrue (jloContent.Contains ("MyReceiver"),
-				$"MultiTfmLib.jlo.xml should contain the MyReceiver JCW type, but got: {jloContent}");
+			var typeMapPath = appBuilder.Output.GetIntermediaryPath (
+				Path.Combine ("typemap", "_MultiTfmLib.TypeMap.dll"));
+			FileAssert.Exists (typeMapPath, "The Android-TFM library should have a managed type map.");
+			using var typeMap = Mono.Cecil.AssemblyDefinition.ReadAssembly (typeMapPath);
+			Assert.IsTrue (typeMap.MainModule.GetTypeReferences ().Any (type => type.FullName == "MultiTfmLib.MyReceiver"),
+				"The managed type map should reference the Android-only MyReceiver type.");
 		}
 
 	}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
index 6861b0f90f2..b0192a921e7 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs
@@ -120,17 +120,14 @@ public void UnsupportedTypeMapIsRejected (bool isApplication, string typeMapImpl
 		[TestCase (false, "Build")]
 		[TestCase (true, "Publish")]
 		[TestCase (false, "Publish")]
-		[TestCase (true, "_GenerateJavaStubs")]
-		[TestCase (true, "_PrepareLinking")]
+		[TestCase (true, "_ValidateAndroidTypeMapImplementation")]
+		[TestCase (false, "_ValidateAndroidTypeMapImplementation")]
 		public void LegacyTypeMapIsRejectedBeforeBuildTargets (bool isApplication, string target)
 		{
 			XamarinProject project = isApplication
 				? new XamarinAndroidApplicationProject ()
 				: new XamarinAndroidLibraryProject ();
 			project.SetProperty ("AndroidTypeMapImplementation", "llvm-ir");
-			if (target == "_PrepareLinking") {
-				project.SetProperty ("PublishTrimmed", "true");
-			}
 
 			using var builder = isApplication ? CreateApkBuilder () : CreateDllBuilder ();
 			builder.Target = target;
@@ -145,8 +142,8 @@ public void LegacyTypeMapIsRejectedBeforeBuildTargets (bool isApplication, strin
 		[TestCase (false, "Build")]
 		[TestCase (true, "Publish")]
 		[TestCase (false, "Publish")]
-		[TestCase (true, "_GenerateJavaStubs")]
-		[TestCase (true, "_PrepareLinking")]
+		[TestCase (true, "_ValidateAndroidTypeMapImplementation")]
+		[TestCase (false, "_ValidateAndroidTypeMapImplementation")]
 		public void EmptyGlobalTypeMapIsRejected (bool isApplication, string target)
 		{
 			XamarinProject project = isApplication
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
index 22c0fc57419..812ac5f1a22 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -46,7 +46,8 @@ public void LinkAssembliesNoShrinkLegacyCompatibilityFixups (bool enabled)
 				$"{nameof (FixLegacyResourceDesignerStep)} presence should match the compatibility fixup setting.");
 			Assert.AreEqual (enabled, pipeline.Steps.Any (step => step is AddKeepAlivesStep),
 				$"{nameof (AddKeepAlivesStep)} presence should match the compatibility fixup setting.");
-			Assert.IsTrue (pipeline.Steps.Any (step => step is FindJavaObjectsStep), $"{nameof (FindJavaObjectsStep)} should always run.");
+			Assert.AreEqual (enabled ? 4 : 1, pipeline.Steps.Count,
+				"Only requested compatibility fixups and the assembly-copy step should run; JCW generation is handled by the trimmable generator.");
 			Assert.IsTrue (pipeline.Steps.Any (step => step is SaveChangedAssemblyStep), $"{nameof (SaveChangedAssemblyStep)} should always run.");
 		}
 
@@ -56,6 +57,61 @@ public void BuildPipelineForTest (AssemblyPipeline pipeline, MSBuildLinkContext
 				BuildPipeline (pipeline, context);
 		}
 
+		[Test]
+		public void LinkAssembliesNoShrinkCopiesJavaPeersWithoutLegacyImport ()
+		{
+			var path = Path.Combine (Root, "temp", TestName);
+			Directory.CreateDirectory (path);
+			try {
+				var androidPath = Path.Combine (path, "Mono.Android.dll");
+				var assemblyPath = Path.Combine (path, "App.dll");
+				var destinationPath = Path.Combine (path, "linked", "App.dll");
+				using (var android = CreateFauxMonoAndroidAssembly ())
+				using (var assembly = AssemblyDefinition.CreateAssembly (new AssemblyNameDefinition ("App", new Version ()), "App", ModuleKind.Dll)) {
+					android.Write (androidPath);
+					var module = assembly.MainModule;
+					var peer = new TypeDefinition ("Example", "Peer", TypeAttributes.Public,
+						module.ImportReference (android.MainModule.GetType ("Java.Lang.Object")));
+					module.Types.Add (peer);
+					var method = new MethodDefinition ("Callback", MethodAttributes.Public | MethodAttributes.Virtual, module.TypeSystem.Void);
+					method.Body.Instructions.Add (Instruction.Create (OpCodes.Ret));
+					var registerType = new TypeReference ("Android.Runtime", "RegisterAttribute", module, peer.BaseType.Scope);
+					var registerConstructor = new MethodReference (".ctor", module.TypeSystem.Void, registerType) { HasThis = true };
+					registerConstructor.Parameters.Add (new ParameterDefinition (module.TypeSystem.String));
+					var register = new CustomAttribute (registerConstructor);
+					register.ConstructorArguments.Add (new CustomAttributeArgument (module.TypeSystem.String, "callback"));
+					method.CustomAttributes.Add (register);
+					peer.Methods.Add (method);
+					assembly.Write (assemblyPath);
+				}
+
+				var source = new TaskItem (assemblyPath);
+				source.SetMetadata ("Abi", "arm64-v8a");
+				source.SetMetadata ("TargetFrameworkIdentifier", "MonoAndroid");
+				var destination = new TaskItem (destinationPath);
+				destination.SetMetadata ("Abi", "arm64-v8a");
+				var androidItem = new TaskItem (androidPath);
+				androidItem.SetMetadata ("Abi", "arm64-v8a");
+				var task = new LinkAssembliesNoShrink {
+					BuildEngine = new MockBuildEngine (TestContext.Out),
+					CodeGenerationTarget = "XAJavaInterop1",
+					DestinationFiles = [destination],
+					EnableLegacyCompatibilityAssemblyFixups = false,
+					ResolvedAssemblies = [source, androidItem],
+					ResolvedUserAssemblies = [source],
+					SourceFiles = [source],
+					TargetName = "App",
+				};
+
+				Assert.IsTrue (task.Execute (), "Assembly copying must not reimport Java peers using legacy JNI signatures or connectors.");
+				CollectionAssert.AreEqual (File.ReadAllBytes (assemblyPath), File.ReadAllBytes (destinationPath));
+				Assert.IsFalse (File.Exists (Path.ChangeExtension (destinationPath, ".jlo.xml")),
+					"Legacy Java-object XML should not be generated.");
+			} finally {
+				Directory.Delete (path, recursive: true);
+			}
+		}
+
 		[Test]
 		public void PostTrimmingSkipsLegacyAbstractFixupsButWarnsAboutAppDomain ()
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ACWMapGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ACWMapGenerator.cs
deleted file mode 100644
index 625e49aa5d7..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ACWMapGenerator.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-using Java.Interop.Tools.Cecil;
-using Java.Interop.Tools.TypeNameMappings;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-
-namespace Xamarin.Android.Tasks;
-
-class ACWMapGenerator
-{
-	readonly TaskLoggingHelper log;
-
-	public ACWMapGenerator (TaskLoggingHelper log)
-	{
-		this.log = log;
-	}
-
-	public void Generate (List<ACWMapEntry> javaTypes, string acwMapFile)
-	{
-		// We need to save a map of .NET type -> ACW type for resource file fixups
-		var managed = new Dictionary<string, ACWMapEntry> (javaTypes.Count, StringComparer.Ordinal);
-		var java = new Dictionary<string, ACWMapEntry> (javaTypes.Count, StringComparer.Ordinal);
-
-		var managedConflicts = new Dictionary<string, List<string>> (0, StringComparer.Ordinal);
-		var javaConflicts = new Dictionary<string, List<string>> (0, StringComparer.Ordinal);
-
-		using var acw_map = MemoryStreamPool.Shared.CreateStreamWriter ();
-
-		foreach (var type in javaTypes.OrderBy (t => t.ManagedKey)) {
-			string managedKey = type.ManagedKey;
-			string javaKey = type.JavaKey;
-
-			acw_map.Write (type.PartialAssemblyQualifiedName);
-			acw_map.Write (';');
-			acw_map.Write (javaKey);
-			acw_map.WriteLine ();
-
-			ACWMapEntry conflict;
-			bool hasConflict = false;
-
-			if (managed.TryGetValue (managedKey, out conflict)) {
-				if (!conflict.ModuleName.Equals (type.ModuleName)) {
-					if (!managedConflicts.TryGetValue (managedKey, out var list))
-						managedConflicts.Add (managedKey, list = new List<string> { conflict.PartialAssemblyName });
-					list.Add (type.PartialAssemblyName);
-				}
-				hasConflict = true;
-			}
-
-			if (java.TryGetValue (javaKey, out conflict)) {
-				if (!conflict.ModuleName.Equals(type.ModuleName)) {
-					if (!javaConflicts.TryGetValue (javaKey, out var list))
-						javaConflicts.Add (javaKey, list = new List<string> { conflict.AssemblyQualifiedName });
-					list.Add (type.AssemblyQualifiedName);
-				}
-				hasConflict = true;
-			}
-
-			if (!hasConflict) {
-				managed.Add (managedKey, type);
-				java.Add (javaKey, type);
-
-				acw_map.Write (managedKey);
-				acw_map.Write (';');
-				acw_map.Write (javaKey);
-				acw_map.WriteLine ();
-
-				acw_map.Write (type.CompatJniName);
-				acw_map.Write (';');
-				acw_map.Write (javaKey);
-				acw_map.WriteLine ();
-			}
-		}
-
-		acw_map.Flush ();
-
-		foreach (var kvp in managedConflicts) {
-			log.LogCodedWarning ("XA4214", Properties.Resources.XA4214, kvp.Key, string.Join (", ", kvp.Value));
-			log.LogCodedWarning ("XA4214", Properties.Resources.XA4214_Result, kvp.Key, kvp.Value [0]);
-		}
-
-		foreach (var kvp in javaConflicts) {
-			log.LogCodedError ("XA4215", Properties.Resources.XA4215, kvp.Key);
-
-			foreach (var typeName in kvp.Value) {
-				log.LogCodedError ("XA4215", Properties.Resources.XA4215_Details, kvp.Key, typeName);
-			}
-		}
-
-		// Don't write the output file if there are any errors so that
-		// future incremental builds will try again.
-		if (javaConflicts.Count > 0)
-			return;
-
-		Files.CopyIfStreamChanged (acw_map.BaseStream, acwMapFile);
-	}
-}
-
-class ACWMapEntry
-{
-	public string AssemblyQualifiedName { get; set; }
-	public string CompatJniName { get; set; }
-	public string JavaKey { get; set; }
-	public string ManagedKey { get; set; }
-	public string ModuleName { get; set; }
-	public string PartialAssemblyName { get; set; }
-	public string PartialAssemblyQualifiedName { get; set; }
-
-	public ACWMapEntry (string assemblyQualifiedName, string compatJniName, string javaKey, string managedKey, string moduleName, string partialAssemblyName, string partialAssemblyQualifiedName)
-	{
-		AssemblyQualifiedName = assemblyQualifiedName;
-		CompatJniName = compatJniName;
-		JavaKey = javaKey;
-		ManagedKey = managedKey;
-		ModuleName = moduleName;
-		PartialAssemblyName = partialAssemblyName;
-		PartialAssemblyQualifiedName = partialAssemblyQualifiedName;
-	}
-
-	public static ACWMapEntry Create (TypeDefinition type, TypeDefinitionCache cache)
-	{
-		return new ACWMapEntry (
-			assemblyQualifiedName: type.GetAssemblyQualifiedName (cache),
-			compatJniName: JavaNativeTypeManager.ToCompatJniName (type, cache).Replace ('/', '.'),
-			javaKey: JavaNativeTypeManager.ToJniName (type, cache).Replace ('/', '.'),
-			managedKey: type.FullName.Replace ('/', '.'),
-			moduleName: type.Module.Name,
-			partialAssemblyName: type.GetPartialAssemblyName (cache),
-			partialAssemblyQualifiedName: type.GetPartialAssemblyQualifiedName (cache)
-		);
-	}
-
-	public static ACWMapEntry Create (XElement type, string partialAssemblyName, string moduleName)
-	{
-		return new ACWMapEntry (
-			assemblyQualifiedName: type.GetAttributeOrDefault ("assembly-qualified-name", string.Empty),
-			compatJniName: type.GetAttributeOrDefault ("compat-jni-name", string.Empty),
-			javaKey: type.GetAttributeOrDefault ("java-key", string.Empty),
-			managedKey: type.GetAttributeOrDefault ("managed-key", string.Empty),
-			moduleName: moduleName,
-			partialAssemblyName: partialAssemblyName,
-			partialAssemblyQualifiedName: type.GetAttributeOrDefault ("partial-assembly-qualified-name", string.Empty)
-		);
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JavaObjectsXmlFile.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JavaObjectsXmlFile.cs
deleted file mode 100644
index d3e51243322..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JavaObjectsXmlFile.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-using Java.Interop.Tools.JavaCallableWrappers.Adapters;
-using Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Xamarin.Android.Tasks;
-
-class JavaObjectsXmlFile
-{
-	static readonly XmlWriterSettings settings = new XmlWriterSettings {
-		Indent = true,
-		NewLineOnAttributes = false,
-		OmitXmlDeclaration = true,
-	};
-
-	static readonly JavaObjectsXmlFile unscanned = new JavaObjectsXmlFile { WasScanned = false };
-
-	public List<ACWMapEntry> ACWMapEntries { get; } = [];
-	public List<CallableWrapperType> JavaCallableWrappers { get; } = [];
-	public bool WasScanned { get; private set; }
-
-	public void Export (string filename)
-	{
-		using var sw = MemoryStreamPool.Shared.CreateStreamWriter ();
-
-		using (var xml = XmlWriter.Create (sw, settings))
-			Export (xml);
-
-		sw.Flush ();
-
-		Files.CopyIfStreamChanged (sw.BaseStream, filename);
-	}
-
-	void Export (XmlWriter xml)
-	{
-		xml.WriteStartElement ("api");
-
-		ExportJCWTypes (xml);
-		ExportACWMappingTypes (xml);
-
-		xml.WriteEndElement ();
-	}
-
-	void ExportJCWTypes (XmlWriter xml)
-	{
-		if (JavaCallableWrappers.Count == 0)
-			return;
-
-		xml.WriteStartElement ("jcw-types");
-
-		XmlExporter.Export (xml, JavaCallableWrappers);
-
-		xml.WriteEndElement ();
-	}
-
-	void ExportACWMappingTypes (XmlWriter xml)
-	{
-		if (ACWMapEntries.Count == 0)
-			return;
-
-		var t = ACWMapEntries.First ();
-
-		xml.WriteStartElement ("acw-types");
-
-		xml.WriteAttributeStringIfNotDefault ("partial-assembly-name", t.PartialAssemblyName);
-		xml.WriteAttributeStringIfNotDefault ("module-name", t.ModuleName);
-
-		foreach (var type in ACWMapEntries) {
-			xml.WriteStartElement ("type");
-			xml.WriteAttributeStringIfNotDefault ("assembly-qualified-name", type.AssemblyQualifiedName);
-			xml.WriteAttributeStringIfNotDefault ("compat-jni-name", type.CompatJniName);
-			xml.WriteAttributeStringIfNotDefault ("java-key", type.JavaKey);
-			xml.WriteAttributeStringIfNotDefault ("managed-key", type.ManagedKey);
-			xml.WriteAttributeStringIfNotDefault ("partial-assembly-qualified-name", type.PartialAssemblyQualifiedName);
-			xml.WriteEndElement ();
-		}
-
-		xml.WriteEndElement ();
-	}
-
-	/// <summary>
-	/// Given an assembly path, return the path to the ".jlo.xml" file that should be next to it.
-	/// </summary>
-	public static string GetJavaObjectsXmlFilePath (string assemblyPath)
-		=> Path.ChangeExtension (assemblyPath, ".jlo.xml");
-
-	public static string GetJavaObjectsXmlFilePath (ITaskItem assembly)
-	{
-		var path = assembly.GetMetadata ("JavaObjectsXmlFile");
-		return path.IsNullOrEmpty () ? GetJavaObjectsXmlFilePath (assembly.ItemSpec) : path;
-	}
-
-	public static JavaObjectsXmlFile Import (string filename, JavaObjectsXmlFileReadType readType)
-	{
-		// If the file has zero length, then the assembly wasn't scanned because it couldn't contain JLOs.
-		// This check is much faster than loading and parsing an empty XML file.
-		var fi = new FileInfo (filename);
-
-		if (fi.Length == 0)
-			return unscanned;
-
-		var file = new JavaObjectsXmlFile {
-			WasScanned = true,
-		};
-
-		var xml = XDocument.Load (filename);
-
-		// We let callers specify which part(s) of the file they want to deserialize to save time
-		if (readType.HasFlag (JavaObjectsXmlFileReadType.JavaCallableWrappers) && xml.Root?.Element ("jcw-types") is XElement jcw)
-			file.JavaCallableWrappers.AddRange (XmlImporter.Import (jcw));
-
-		if (readType.HasFlag (JavaObjectsXmlFileReadType.AndroidResourceFixups) && xml.Root?.Element ("acw-types") is XElement acw) {
-			var partialAssemblyName = acw.GetAttributeOrDefault ("partial-assembly-name", string.Empty);
-			var moduleName = acw.GetAttributeOrDefault ("module-name", string.Empty);
-
-			foreach (var type in acw.Elements ("type")) {
-				var entry = ACWMapEntry.Create (type, partialAssemblyName, moduleName);
-				file.ACWMapEntries.Add (entry);
-			}
-		}
-
-		return file;
-	}
-
-	public static void WriteEmptyFile (string destination, TaskLoggingHelper log)
-	{
-		log.LogDebugMessage ($"Writing empty file '{destination}'");
-
-		// We write a zero byte file to indicate the file couldn't have JLO types and wasn't scanned
-		File.Create (destination).Dispose ();
-	}
-}
-
-[Flags]
-enum JavaObjectsXmlFileReadType
-{
-	None = 0,
-	AndroidResourceFixups = 1,
-	JavaCallableWrappers = 2,
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs b/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs
deleted file mode 100644
index 49abcb50c33..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Java.Interop.Tools.Cecil;
-using Microsoft.Android.Build.Tasks;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using Xamarin.Android.Tools;
-
-namespace Xamarin.Android.Tasks;
-
-class XAJavaTypeScanner
-{
-	// Names of assemblies which don't have Mono.Android.dll references, or are framework assemblies, but which must
-	// be scanned for Java types.
-	static readonly HashSet<string> SpecialAssemblies = new HashSet<string> (StringComparer.OrdinalIgnoreCase) {
-		"Java.Interop.dll",
-		"Mono.Android.dll",
-		"Mono.Android.Runtime.dll",
-	};
-
-	public bool ErrorOnCustomJavaObject { get; set; }
-
-	readonly TaskLoggingHelper log;
-	readonly TypeDefinitionCache cache;
-	readonly AndroidTargetArch targetArch;
-
-	public XAJavaTypeScanner (AndroidTargetArch targetArch, TaskLoggingHelper log, TypeDefinitionCache cache)
-	{
-		this.targetArch = targetArch;
-		this.log = log;
-		this.cache = cache;
-	}
-
-	public List<TypeDefinition> GetJavaTypes (ICollection<ITaskItem> inputAssemblies, XAAssemblyResolver resolver)
-	{
-		var types = new List<TypeDefinition> ();
-		var inputItems  = inputAssemblies
-			.Where (a => ShouldScan (a))
-			.ToList ();
-		var monoAndroid = inputItems.FirstOrDefault (a => Path.GetFileName (a.ItemSpec) == "Mono.Android.dll");
-		if (monoAndroid != null) {
-			inputItems.Remove (monoAndroid);
-			inputItems.Insert (0, monoAndroid);
-		}
-		foreach (ITaskItem asmItem in inputItems) {
-			log.LogDebugMessage ($"[{targetArch}] Scanning assembly '{asmItem.ItemSpec}' for Java types");
-
-			AndroidTargetArch arch = MonoAndroidHelper.GetTargetArch (asmItem);
-			if (arch != targetArch) {
-				throw new InvalidOperationException ($"Internal error: assembly '{asmItem.ItemSpec}' should be in the '{targetArch}' architecture, but is in '{arch}' instead.");
-			}
-
-			AssemblyDefinition? asmdef = resolver.Load (asmItem.ItemSpec);
-			if (asmdef == null) {
-				log.LogDebugMessage ($"[{targetArch}] Unable to load assembly '{asmItem.ItemSpec}'");
-				continue;
-			}
-
-			foreach (ModuleDefinition md in asmdef.Modules) {
-				foreach (TypeDefinition td in md.Types) {
-					AddJavaType (td, types);
-				}
-			}
-		}
-
-		return types;
-	}
-
-	public List<TypeDefinition> GetJavaTypes (AssemblyDefinition assembly)
-	{
-		var types = new List<TypeDefinition> ();
-
-		foreach (ModuleDefinition md in assembly.Modules) {
-			foreach (TypeDefinition td in md.Types) {
-				AddJavaType (td, types);
-			}
-		}
-
-		return types;
-	}
-
-	bool ShouldScan (ITaskItem assembly)
-	{
-		string name = Path.GetFileName (assembly.ItemSpec);
-		if (SpecialAssemblies.Contains (name)) {
-			return true;
-		}
-
-		string? hasMonoAndroidReferenceMetadata = assembly.GetMetadata ("HasMonoAndroidReference");
-		if (hasMonoAndroidReferenceMetadata.IsNullOrEmpty ()) {
-			return true; // Just in case - the metadata missing might be a false negative
-		}
-
-		if (Boolean.TryParse (hasMonoAndroidReferenceMetadata, out bool hasMonoAndroidReference)) {
-			return hasMonoAndroidReference;
-		}
-
-		// A catch-all, it's better to do more work than to miss something important.
-		return true;
-	}
-
-	public void AddJavaType (TypeDefinition type, List<TypeDefinition> types)
-	{
-		if (type == null)
-			throw new ArgumentNullException (nameof (type));
-		if (types == null)
-			throw new ArgumentNullException (nameof (types));
-
-		if (type.HasJavaPeer (cache)) {
-			// For subclasses of e.g. Android.App.Activity.
-			types.Add (type);
-		} else if (type.IsClass && !type.IsSubclassOf ("System.Exception", cache) && type.ImplementsInterface ("Android.Runtime.IJavaObject", cache)) {
-			string message = $"XA4212: Type `{type.FullName}` implements `Android.Runtime.IJavaObject` but does not inherit `Java.Lang.Object` or `Java.Lang.Throwable`. This is not supported.";
-
-			if (ErrorOnCustomJavaObject) {
-				log.LogError (message);
-			} else {
-				log.LogWarning (message);
-			}
-			return;
-		}
-
-		if (!type.HasNestedTypes) {
-			return;
-		}
-
-		foreach (TypeDefinition nested in type.NestedTypes) {
-			AddJavaType (nested, types);
-		}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index 8f5a9ec54d6..08bb0541f52 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -47,7 +47,6 @@
     <!-- Include only the linker sources required for the build tasks (LinkAssembliesNoShrink and PostTrimmingPipeline) -->
     <!-- These include: AddKeepAlivesStep, AddKeepAlivesHelper, CheckForObsoletePreserveAttributeStep, StripEmbeddedLibrariesStep, PostTrimmingAddKeepAlivesStep, FixAbstractMethodsStep, FixLegacyResourceDesignerStep, LinkDesignerBase -->
     <Compile Remove="Linker\**" />
-    <Compile Include="Linker\MonoDroid.Tuner\FindJavaObjectsStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\AddKeepAlivesStep.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\AddKeepAlivesHelper.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\CheckForObsoletePreserveAttributeStep.cs" />
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 6075d981d88..6bd5e77a749 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1377,10 +1377,8 @@ because xbuild doesn't support framework reference assemblies.
     Inputs="@(ResolvedAssemblies);$(_AndroidBuildPropertiesCache)"
     Outputs="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)')">
   <LinkAssembliesNoShrink
-      ApplicationJavaClass="$(AndroidApplicationJavaClass)"
       CodeGenerationTarget="$(AndroidCodegenTarget)"
       Debug="$(AndroidIncludeDebugSymbols)"
-      ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
       PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
       ResolvedAssemblies="@(_AllResolvedAssemblies)"
       ResolvedUserAssemblies="@(ResolvedUserAssemblies)"
@@ -2869,7 +2867,7 @@ because xbuild doesn't support framework reference assemblies.
   </Target>
 
   <Target Name="_ValidateAndroidTypeMapImplementation"
-      BeforeTargets="_CheckForInvalidConfigurationAndPlatform;_GenerateJavaStubs;_PrepareLinking;Build;Publish">
+      BeforeTargets="_CheckForInvalidConfigurationAndPlatform;_GenerateJavaStubs;Build;Publish">
     <AndroidError Code="XA4267"
         ResourceName="XA4267"
         Condition=" '$(AndroidTypeMapImplementation)' == 'llvm-ir' " />

From c210e3a9ec43e858a0431a482d83cf6a20452eb3 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:08:40 +0200
Subject: [PATCH 45/58] Document trimmable JNI interoperability

Describe generated Java wrappers, managed TypeMaps, JNI registration, peer lifetime, and CoreCLR/NativeAOT interop. Link the guide from the documentation index.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/README.md                       |   1 +
 .../guides/internals/JavaJNI_Interop.md       | 923 +++---------------
 2 files changed, 163 insertions(+), 761 deletions(-)

diff --git a/Documentation/README.md b/Documentation/README.md
index 826dff3e082..14e2a93b9fa 100644
--- a/Documentation/README.md
+++ b/Documentation/README.md
@@ -23,6 +23,7 @@
   * [`.axml` CodeBehind Support](docs-mobile/features/layout-code-behind/index.md)
   * [MSBuild Best Practices](guides/MSBuildBestPractices.md)
   * [D8 and R8 Integration](guides/D8andR8.md)
+  * [Java and managed interoperability](guides/internals/JavaJNI_Interop.md)
   * [Profiling Startup](guides/profiling.md)
 
 
diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 2d6e8c82d72..7d06fa1f544 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,766 +1,167 @@
-<!--toc:start-->
-- [Introduction](#introduction)
-- [Java <-> Managed interoperability overview](#java-managed-interoperability-overview)
-  - [Java Callable Wrappers (JCW)](#java-callable-wrappers-jcw)
-- [Registration](#registration)
-  - [Dynamic registration](#dynamic-registration)
-    - [Dynamic Java Callable Wrappers registration code](#dynamic-java-callable-wrappers-registration-code)
-    - [Dynamic Registration call sequence](#dynamic-registration-call-sequence)
-  - [Marshal methods](#marshal-methods)
-    - [Marshal Methods Java Callable Wrappers registration code](#marshal-methods-java-callable-wrappers-registration-code)
-    - [Marshal methods C# source code](#marshal-methods-c-source-code)
-    - [JNI requirements](#jni-requirements)
-    - [LLVM IR code generation](#llvm-ir-code-generation)
-    - [Assembly rewriting](#assembly-rewriting)
-      - [Wrappers for methods with non-blittable types](#wrappers-for-methods-with-non-blittable-types)
-      - [UnmanagedCallersOnly attribute](#unmanagedcallersonly-attribute)
-    - [Marshal Methods Registration call sequence](#marshal-methods-registration-call-sequence)
-<!--toc:end-->
-
-# Introduction
-
-At the core of `.NET for Android` is its ability to interoperate with
-the Java/Kotlin APIs implemented in the Android system.  To make it
-work, it is necessary to "bridge" the two separate worlds of Java VM
-(`ART` in the Android OS) and the Managed VM (`MonoVM`).  Application
-developers expect to be able to call native Android APIs and receive
-calls (or react to events) from the Android side using code written in
-one of the .NET managed languages.  To make it work, `.NET for Android`
-employs a number of techniques, both at build and at run time, which
-are described in the sections below.
-
-This guide is meant to explain the technical implementation in a way
-that is sufficient to understand the system without having to read the
-actual source code.
-
-# Java <-> Managed interoperability overview
-
-Java VM and Managed VM are two entirely separate entities which
-co-exist in the same process/application.  Despite sharing the same
-process resources, they don't "naturally" communicate with each other.
-There is no direct way to call Java/Kotlin from .NET a'la the
-`p/invoke` mechanism which allows calling native code APIs.  Nor there
-exists a way for Java/Kotlin code to invoke managed methods.  To make
-it possible, `.NET for Android` takes advantage of the Java's [JNI](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html)
-(`Java Native Interface`), a mechanism that allows native code
-(.NET managed code being "native" in this context) to register
-implementations of Java methods, written outside the Java VM and in
-languages other than Java/Kotlin (for instance in `C`, `C++` or
-`Rust`).
-
-Such methods need to be appropriately declared in the Java code, for
-instance:
-
-```java
-class MainActivity
-  extends androidx.appcompat.app.AppCompatActivity
-{
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-
-  private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Each native method is declared using the `native` keyword, and
-whenever it is invoked from other Java code, the Java VM will use the
-JNI to invoke the target method.
-
-Native methods can be registered either dynamically (by calling the
-[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
-JNI function) or "statically", by providing a native shared library
-which exports a symbol with appropriate name which points to the
-native function implementing the Java method.
-
-Both ways of registration are described in detail in the following
-sections.
-
-## Java Callable Wrappers (JCW)
-
-`.NET for Android` wraps the entire Android API by generating
-appropriate C# code which mirrors the Java/Kotlin code (classes,
-interfaces, methods, properties etc).  Each generated class that
-corresponds to a Java/Kotlin type, is derived from the
-`Java.Lang.Object` class (implemented in the `Mono.Android` assembly),
-which marks it as a "Java interoperable type", meaning that it can
-implement or override virtual Java methods.  To make registration and
-invoking of such methods possible, it is necessary to generate a Java
-class which mirrors the Managed one and provides an entry point to
-the Java <-> Managed transition.  The Java classes are generated
-during application (as well as `.NET for Android`) build and we call
-them **Java Callable Wrappers** (or **JCW** for short).  For instance,
-the following managed class:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  public override Android.Views.View? OnCreateView (Android.Views.View? parent, string name, Android.Content.Context context, Android.Util.IAttributeSet attrs)
-  {
-    return base.OnCreateView (parent, name, context, attrs);
-  }
-
-  protected override void OnCreate (Bundle savedInstanceState)
-  {
-     base.OnCreate(savedInstanceState);
-     DoSomething (savedInstanceState);
-  }
-
-  void DoSomething (Bundle bundle)
-  {
-     // do something with the bundle
-  }
-}
-```
-
-overrides two Java virtual methods found in the `AppCompatActivity`
-type: `OnCreateView` and `OnCreate`.  The `DoSomething` method does
-not correspond to any method found in the base Java type, and thus it
-won't be included in the JCW.
-
-The Java Callable Wrapper generated for the above class would look as
-follows (a few generated methods not relevant to the discussion have
-been omitted for brevity):
+# Java and managed interoperability (trimmable TypeMap)
+
+This guide describes the **current** .NET for Android application interop
+path for CoreCLR and NativeAOT. `AndroidTypeMapImplementation=trimmable` is the
+only supported application TypeMap implementation. The Java VM (ART) and the
+managed runtime communicate through JNI; the build supplies generated Java
+callable wrappers (JCWs) and managed TypeMap assemblies, while handwritten
+Java and managed runtime code connects those generated pieces. This is not a
+description of the former MonoVM/native LLVM TypeMap or assembly-rewriting
+pipeline.
+
+## What is generated
+
+| Piece | Purpose and source |
+| --- | --- |
+| Bound managed API types | Managed callable wrappers for Android/Java APIs use `JniPeerMembers` to invoke Java methods. These are distinct from the app's Java callable wrappers; see [`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs) for an invocation. |
+| JCW `.java` files | Java classes for managed Java peers, with constructors and `n_*` native callbacks for Java-to-managed calls. [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) produces them from the scanned peer model. |
+| TypeMap DLLs | `_{AssemblyName}.TypeMap.dll` files hold mappings, proxy types, and native registration methods; `_Microsoft.Android.TypeMaps.dll` is the root that connects them. [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and [`RootTypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/RootTypeMapAssemblyGenerator.cs) emit these managed assemblies. |
+| Registration and manifest | The task generates `ApplicationRegistration.java` from the scanned peers (not from a Java template); it also writes the ACW map (`acw-map.txt`) and merged `AndroidManifest.xml`. |
+
+The [scanner](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
+reads assembly metadata to discover Java peers and their Java-visible
+constructors and methods. The
+[`GenerateTrimmableTypeMap` task](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
+drives the scan, validates it, emits the managed and Java outputs, and removes
+stale JCW sources. The
+[shared MSBuild targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
+run `_GenerateTrimmableTypeMap` after `CoreCompile`; their output lives under
+`obj/.../typemap/` (not in handwritten source). Inspect
+`typemap/typemap-assemblies.txt` and `typemap/java-files.txt` to see what
+that build actually generated. The
+[TypeMap build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
+documents target ordering, output stamps, and incremental regeneration.
+
+The root TypeMap assembly anchors the per-assembly TypeMaps and initializes
+the lookup dictionaries. Mapping attributes in those per-assembly DLLs
+associate Java names, managed types, and generated proxy types. ACW proxies
+implement `IAndroidCallableWrapper` for native registration; other proxies
+do not need that interface. These are **managed metadata**, not a lookup
+table in a native binary. The runtime
+[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+uses the mappings to resolve Java objects and managed peer types.
+
+## Managed calls Java
+
+A bound C# method uses its `JniPeerMembers` and a JNI member signature to
+call Java through Java.Interop. For example,
+`Android.App.Activity.ReportFullyDrawn()` invokes
+`_members.InstanceMethods.InvokeVirtualVoidMethod(...)` with
+`"reportFullyDrawn.()V"` and the current peer. Static calls use the
+corresponding `StaticMethods` APIs. Arguments and return values cross JNI
+with the appropriate Java object references and value conversions. This
+direction does **not** call a JCW's `n_*` callback: the bound managed API
+is the caller, and the Java implementation is the callee.
+
+When a JNI object arrives in managed code,
+[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
+resolves its Java type to a managed target/proxy using the generated map;
+[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
+reuses or constructs a managed peer for its JNI reference. Conversely, the
+type manager resolves managed Java-peer types to JNI type signatures when
+needed. The map is about **type and peer resolution**; it does not replace
+normal Java.Interop method invocation.
+
+## Java calls managed code
+
+The JCW is a real Java class generated for a managed peer. Its Java-visible
+methods forward to `native n_*` methods, and its constructors use generated
+`nctor_*` callbacks. The generator normally emits a per-class static
+initializer like:
 
 ```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-  {
-    return n_onCreateView (p0, p1, p2, p3);
-  }
-  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-  private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Understanding the connection between Managed methods and their Java
-counterparts is required in order to understand the registration
-mechanisms described in sections found later in this document.  The
-[Dynamic registration](#dynamic-registration) section will expand on
-this example in order to explain the details of how the Managed type
-and its methods are registered with the Java VM.
-
-# Registration
-
-Both mechanisms of method registration rely on generation of [Java
-Callable Wrappers](#java-callable-wrappers-jcw), with [Dynamic
-registration](#dynamic-registration) requiring more code to be
-generated so that the registration can be performed at the runtime.
-
-JCW are generated only for types that derive from
-the `Java.Lang.Object` type.  Finding such types is the task of the
-Java.Interop's [`JavaTypeScanner`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs),
-which uses `Mono.Cecil` to read all the assemblies referenced by the
-application and its libraries.  The returned list of assemblies is
-then used by a variety of tasks, JCW being only one
-of them.
-
-After all types are found,
-[`JavaCallableWrapperGenerator`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
-is invoked in order to analyze each method in each type, looking for
-those which override a virtual Java method and, thus, need to be
-included in the wrapper class code. The generator optionally (if
-[marshal methods](#marshal-methods) are enabled) passes each method to
-an implementation of the
-[`Java.Interop.Tools.JavaCallableWrappers.JavaCallableMethodClassifier`](../../external/Java.Interop/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs)
-abstract class (which is
-[`MarshalMethodsClassifier`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs)
-in our case), to check whether the given method can be registered
-statically.
-
-`JavaCallableWrapperGenerator` looks for methods decorated with the
-`[Register]` attribute, which most frequently is created by invoking
-its constructor with three parameters:
-
-  1. Java method name
-  2. JNI method signature
-  3. "Connector" method name
-
-The "connector" is a static method which creates a delegate that
-subsequently allows calling of the native callback method:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Connector backing field
-  static Delegate? cb_onCreate_Landroid_os_Bundle_;
-
-  // Connector method
-  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
-  {
-    if (cb_onCreate_Landroid_os_Bundle_ == null)
-      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
-    return cb_onCreate_Landroid_os_Bundle_;
-  }
-
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-The above code is actually generated in the `Android.App.Activity`
-class while .NET for Android is built, from which our example
-`MainActivity` eventually derives.
-
-What happens with the above code depends on the registration mechanism
-and is described in the sections below.
-
-## Dynamic registration
-
-This registration mechanism has been used by `.NET for Android` since
-the beginning and it will remain in use for the foreseeable future
-when the application is built in the `Debug` configuration or when
-[Marshal Methods](#marshal-methods) are turned off.
-
-### Dynamic Java Callable Wrappers registration code
-
-Building on the C# example shown in the [Java Callable
-Wrappers](#java-callable-wrappers-jcw) section, the following Java
-code is generated (only the parts relevant to registration are shown):
-
-```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-/** @hide */
-        public static final String __md_methods;
-        static {
-                __md_methods = 
-                        "n_onCreateView:(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;:GetOnCreateView_Landroid_view_View_Ljava_lang_String_Landroid_content_Context_Landroid_util_AttributeSet_Handler\n" +
-                        "n_onCreate:(Landroid/os/Bundle;)V:GetOnCreate_Landroid_os_Bundle_Handler\n" +
-                        "";
-                mono.android.Runtime.register ("HelloAndroid.MainActivity, HelloAndroid", MainActivity.class, __md_methods);
-        }
-
-        public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-        {
-                return n_onCreateView (p0, p1, p2, p3);
-        }
-
-        private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-        public void onCreate (android.os.Bundle p0)
-        {
-                n_onCreate (p0);
-        }
-
-        private native void n_onCreate (android.os.Bundle p0);
-}
-```
-
-Code fragment which takes part in registration is the class's static
-constructor.  For each method registered for the type (that is,
-implemented or overridden in the managed code), the JCW generator
-outputs a single string which contains full information about the type
-and method to register.  Each such registration string is terminated
-with the newline character and the entire sequence ends with an empty
-string.  Together, all the lines are concatenated and placed in the
-`__md_methods` static variable.  The `mono.android.Runtime.register`
-method (see below for more details) is then invoked to register all
-the methods.
-
-### Dynamic Registration call sequence
-
-All the "native" methods declared in the generated Java type are
-registered when the type is constructed or accessed for the first
-time.  This is when the Java VM invokes the type's static constructor,
-kicking off a sequence of calls that eventually ends with all the type
-methods registered with JNI:
-
-  1. `mono.android.Runtime.register` is itself a native method,
-     declared in the
-     [`Runtime`](../../src/java-runtime/java/mono/android/Runtime.java)
-     class of .NET for Android's Java runtime code, and implemented in
-     the native .NET for Android
-     [runtime](../../src/monodroid/jni/monodroid-glue.cc) (the
-     `MonodroidRuntime::Java_mono_android_Runtime_register` method).
-	 Purpose of this method is to prepare a call into the
-     .NET for Android managed runtime code, the
-     [`Android.Runtime.JNIEnv::RegisterJniNatives`](../../src/Mono.Android/Android.Runtime/JNIEnv.cs)
-     method.
-  2. `Android.Runtime.JNIEnv::RegisterJniNatives` is passed name of
-     the managed type for which to register Java methods and uses .NET
-     reflection to load that type, followed by a call to cache the
-     type (via `RegisterType` method in the
-     [`TypeManager`](../../src/Mono.Android/Java.Interop/TypeManager.cs)
-     class) to end with a call to the
-     `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
-     method.
-  3. `Android.Runtime.AndroidTypeManager::RegisterNativeMembers`
-     eventually calls the
-     `Java.Interop.JniEnvironment.Types::RegisterNatives` method which
-	 first generates a delegate to the native callback method, using
-     `System.Reflection.Emit` (via the
-     [`Android.Runtime.JNINativeWrapper::CreateDelegate`](../../src/Mono.Android/Android.Runtime/JNINativeWrapper.cs)
-     method) and, eventually, invokes Java JNI's `RegisterNatives`
-     function, finally registering the native methods for a managed
-     type.
-  
-The `System.Reflection.Emit` sequence mentioned in 3. above is among
-the most costly operations, repeated for each registered method.
-
-Some more information about Java type registration can be found
-[here](https://github.com/dotnet/android/wiki/Blueprint#java-type-registration).
-
-## Marshal methods
-
-The goal of marshal methods is to completely bypass the [dynamic
-registration sequence](#dynamic-registration-call-sequence), replacing
-it with native code generated and compiled during application build,
-thus saving on the startup time of the application.
-
-Marshal methods registration mechanism takes advantage of the JNI
-ability to look up implementations of `native` Java methods in actual
-native (shared) libraries.  Such symbols must have names that follow a
-set of rules, so that JNI is able to properly locate them (details are
-explained in the [JNI Requirements](#jni-requirements) section below).
-
-To achieve that, the marshal methods mechanism uses a number of
-classes which [generate native](#llvm-ir-code-generation) code and 
-[modify assemblies](#assembly-rewriting) that contain the registered
-methods.
-
-Current implementation of the marshal methods classifier recognizes
-the "standard" method registration pattern, using the example of the
-`OnCreate` method shown in [Registration](#registration) above.
-
-The standard pattern consists of:
-
-  * the "connector" method, `GetOnCreate_Landroid_os_Bundle_Handler`
-    above
-  * the delegate backing field, `cb_onCreate_Landroid_os_Bundle_`
-    above
-  * the native callback method, `n_OnCreate_Landroid_os_Bundle_` above
-  * and the virtual target method which dispatches the call to the
-    actual object, `OnCreate` above.
-
-Whenever the classifier's `ShouldBeDynamicallyRegistered` method is
-called, it is passed not only the method's declaring type, but also
-the `Register` attribute instance which it then uses to check whether
-the method being registered conforms to the "standard" registration
-pattern shown above.  The connector, native callback methods as well
-as the backing field must be private and static in order for the
-registered method to be considered as a candidate for static
-registration.
-
-Registered methods which don't follow the "standard" pattern will be
-registered dynamically.
-
-### Marshal Methods Java Callable Wrappers registration code
-
-Building on the C# example show in the [Java Callable
-Wrappers](#java-callable-wrappers-jcw) section, the following Java
-code is generated (only the parts relevant to registration are shown):
-
-```java
-public class MainActivity
-        extends androidx.appcompat.app.AppCompatActivity
-{
-  public android.view.View onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3)
-  {
-    return n_onCreateView (p0, p1, p2, p3);
-  }
-
-  private native android.view.View n_onCreateView (android.view.View p0, java.lang.String p1, android.content.Context p2, android.util.AttributeSet p3);
-
-  public void onCreate (android.os.Bundle p0)
-  {
-    n_onCreate (p0);
-  }
-
-  private native void n_onCreate (android.os.Bundle p0);
+static {
+    mono.android.Runtime.registerNatives (MyActivity.class);
 }
 ```
 
-Note that, compared to the code generated for the [dynamic
-registration](#dynamic-java-callable-wrappers-registration-code)
-mechanism, there is no static constructor while the rest 
-of the code remains exactly the same.
-
-### Marshal methods C# source code
-
-The marshal methods sections below will all refer to this code
-fragment:
-
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Connector backing field
-  static Delegate? cb_onCreate_Landroid_os_Bundle_;
-
-  // Connector method
-  static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
-  {
-    if (cb_onCreate_Landroid_os_Bundle_ == null)
-      cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnCreate_Landroid_os_Bundle_);
-    return cb_onCreate_Landroid_os_Bundle_;
-  }
-
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-### JNI requirements
-
-JNI
-[specifies](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names)
-a number of rules which govern how the native symbol name is
-constructed, so that a mapping of object-oriented Java code (with its
-package names/namespaces, class names and overloadable methods) into the essentially
-"flat" procedural "namespace" of the lowest common denominator C code.
-
-The precise rules are outlined in the URL above, and their short
-version is as follows:
-
-  * Each symbol starts with the `Java_` prefix
-  * Next follows the mangled (see below) **fully qualified class
-    name**
-  * Next the `_` character serves as a separator before
-  * A mangled **method** name, which is optionally followed by
-  * Double underscore `__` and the mangled method argument signature
-
-"Mangling" is a way of encoding certain characters that are not
-directly representable both in the source code and in the native
-symbol name.  The JNI specification allows for direct use of ASCII
-letters (capital and lowercase) and digits, while all the other
-characters are either represented by placeholders or encoded as 16-bit
-hexadecimal Unicode character code (table copied from the JNI
-specification for easier reference):
-
-| Escape sequence | Denotes                                  |
-|-----------------|------------------------------------------|
-| _0XXXX          | a Unicode character XXXX, all lower case |
-| _1              | The `_` character                        |
-| _2              | The `;` character in signatures          |
-| _3              | The `[` character in signatures          |
-| _               | The `.` or `/` characters                |
-
-Generation of JNI symbol names is performed by the
-[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
-class while generating the native function source code.
-
-JNI supports two forms of the native symbol name, as signalled in the
-bullet list above - a short and a long one.  The former is looked up
-first by the Java VM, followed by the latter.  The latter needs to be
-used only for overloaded methods, which is what our generator does.
-
-### LLVM IR code generation
-
-[`MarshalMethodsNativeAssemblyGenerator`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs)
-uses the LLVM IR generator infrastructure to output both data and
-executable code for all the marshal methods wrappers.  It is not
-necessary to understand the generated code unless one needs to modify
-it, so this document only shows the equivalent C++ code which can
-serve as a guide to understanding how the marshal method runtime
-invocation works:
-
-```C++
-using get_function_pointer_fn = void(*)(uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr);
-
-static get_function_pointer_fn get_function_pointer;
-
-void xamarin_app_init (get_function_pointer_fn fn) noexcept
-{
-  get_function_pointer = fn;
-}
-
-using android_app_activity_on_create_bundle_fn = void (*) (JNIEnv *env, jclass klass, jobject savedInstanceState);
-static android_app_activity_on_create_bundle_fn android_app_activity_on_create_bundle = nullptr;
-
-extern "C" JNIEXPORT void
-JNICALL Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2 (JNIEnv *env, jclass klass, jobject savedInstanceState) noexcept
-{
-  if (android_app_activity_on_create_bundle == nullptr) {
-    get_function_pointer (
-      16, // mono image index
-      0,  // class index
-      0x0600055B, // method token
-      reinterpret_cast<void*&>(android_app_activity_on_create_bundle) // target pointer
-    );
-  }
-
-  android_app_activity_on_create_bundle (env, klass, savedInstanceState);
-}
-```
-
-The `xamarin_app_init` function is output only once and is called by
-the `.NET for Android` runtime twice during application startup - once
-to pass `get_function_pointer_fn` which does **not** use any locks (as
-we know that until a certain point during startup we are in a single
-lock, so no data access races can happen) and the other time just
-before handing control over to the MonoVM, to pass pointer to
-`get_function_pointer_fn` which **does** employ locking (since during
-runtime it may very well happen that our generated Java native
-functions will be called from different threads simultaneously).
-
-The `Java_helloandroid_MainActivity_n_1onCreate__Landroid_os_Bundle_2`
-function is a template which is repeated for each Java native
-function, with each function having its own set of arguments and its
-own callback backing field (`android_app_activity_on_create_bundle`
-here).
-
-The `get_function_pointer` function takes as parameters indexes into a
-couple of tables, one for `MonoImage*` pointers and the other for
-`MonoClass*` pointers - both of which are generated by the
-`MarshalMethodsNativeAssemblyGenerator` class at application build
-time and allow for very fast lookup during run time.  Target methods
-are retrieved by their token value, within the specified `MonoImage*`
-(essentially a pointer to managed assembly image in memory) and class.
-
-The method identified in such manner, **must** be decorated in the
-managed code with the
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute (see [below](#unmanagedcallersonly-attribute) for more
-details) so that it can be invoked directly, as if it was a native
-method itself, with minimal managed marshaling overhead.
-
-### Assembly rewriting
-
-Please refer to the [C# code fragment](#marshal-methods-c-source-code)
-above in order to understand this section.
-
-Managed assemblies (including `Mono.Android.dll`) which contain Java
-types need to be usable in two contexts: with the "traditional"
-dynamic registration and with marshal methods.  Both of these
-mechanisms, however, have different requirements.  We cannot assume
-that any assembly (either from .NET for Android or a third party nuget)
-will have "marshal methods friendly" code and thus we need to make
-sure that the code meets our requirements.
-
-We do it by reading each relevant assembly and modifying it by
-altering the definition of the native callbacks and removing the
-code that's no longer used by marshal methods.  This task is performed
-by the
-[`MarshalMethodsAssemblyRewriter`](../../src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs)
-invoked during application build after all the assemblies are linked
-but **before** type maps are generated (as rewriting **will** alter
-the method and potentially type tokens)
-
-The exact modifications we apply are:
-
-  * Removal of the **connector backing field**
-  * Removal of the **connector method**
-  * Generation of a **native callback wrapper** method, which catches
-    and propagates unhandled exceptions thrown by the native callback
-    or the target method.  This method is decorated with the
-    `[UnmanagedCallersOnly]` attribute and called directly from the
-    native code.
-  * Optionally, generate code in the **native callback wrapper** to handle
-    [non-blittable types](#wrappers-for-methods-with-non-blittable-types).
-
-All the modifications are performed with `Mono.Cecil`.
-
-After modifications, the assembly contains equivalent of the following
-C# code for each marshal method:
-
-```csharp
-public class MainActivity : AppCompatActivity
-{
-  // Native callback
-  static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    var __this = global::Java.Lang.Object.GetObject<Android.App.Activity> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-    var savedInstanceState = global::Java.Lang.Object.GetObject<Android.OS.Bundle> (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
-    __this.OnCreate (savedInstanceState);
-  }
-
-  // Native callback exception wrapper
-  [UnmanagedCallersOnly]
-  static void n_OnCreate_Landroid_os_Bundle__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
-  {
-    try {
-      n_OnCreate_Landroid_os_Bundle_ (jnienv, native__this, native_savedInstanceState)
-    } catch (Exception ex) {
-      Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
-    }
-  }
-
-  // Target method
-  [Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]
-  protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState)
-  {
-    const string __id = "onCreate.(Landroid/os/Bundle;)V";
-    try {
-      JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-      __args [0] = new JniArgumentValue ((savedInstanceState == null) ? IntPtr.Zero : ((global::Java.Lang.Object) savedInstanceState).Handle);
-      _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args);
-    } finally {
-      global::System.GC.KeepAlive (savedInstanceState);
-    }
-  }
-}
-```
-
-#### Wrappers for methods with non-blittable types
-
-The
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute requires that all the argument types as well as the method
-return type are
-[blittable](https://docs.microsoft.com/en-us/dotnet/framework/interop/blittable-and-non-blittable-types).
-
-Among these types is one that's commonly used by the managed classes
-implementing Java methods: `bool`.  Currently this is the **only**
-non-blittable type we've encountered in bindings, so at this point it
-is the only one supported by the assembly rewriter.
-
-Whenever we encounter a method with a non-blittable type, we must
-generate a wrapper for it, so that we can decorate it with the
-`[UnmanagedCallersOnly]` attribute.  This is easier and less error
-prone than modifying the native callback method's IL stream to
-implement the necessary conversion.
-
-An example of such method is
-`Android.Views.View.IOnTouchListener::OnTouch`:
-
-```csharp
-static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
-  bool __ret = __this.OnTouch (v, e);
-  return __ret;
-}
-```
-
-As it returns a `bool` value, it needs a wrapper to cast the return
-value properly. Each wrapper method retains the native callback method
-name, but appends the `_mm_wrapper` suffix to it:
-
-```csharp
-static bool n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnTouchListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  var e = global::Java.Lang.Object.GetObject<Android.Views.MotionEvent> (native_e, JniHandleOwnership.DoNotTransfer);
-  bool __ret = __this.OnTouch (v, e);
-  return __ret;
-}
-
-[UnmanagedCallersOnly]
-static byte n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent__mm_wrapper (IntPtr jnienv, IntPtr native__this, IntPtr native_v, IntPtr native_e)
-{
-  try {
-    return n_OnTouch_Landroid_view_View_Landroid_view_MotionEvent_(jnienv, native__this, native_v, native_e) ? 1 : 0;
-  } catch (Exception ex) {
-    Android.Runtime.AndroidEnvironmentInternal.UnhandledException (ex);
-    return default;
-  }
-}
-```
-
-The wrapper's return statement uses the ternary operator to "cast" the
-boolean value to `1` (for `true`) or `0` (for `false`) because the
-value of `bool` across the managed runtime can take a range of values:
-
-  * `0` for `false`
-  * `-1` or `1` for `true`
-  * `!= 0` for true
-
-Since the `bool` type in C# can be 1, 2 or 4 bytes long, we need to
-cast it to some type of a known and static size.  The managed type
-`byte` was chosen as it corresponds to the Java/JNI `jboolean` type,
-defined as an unsigned 8-bit type.
-
-Whenever an **argument** value needs to be converted between `byte` and
-`bool`, we generate code that is equivalent of the `argument != 0`
-comparison, for instance for the
-`Android.Views.View.IOnFocusChangeListener::OnFocusChange` method:
-
-```csharp
-[UnmanagedCallersOnly]
-static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, byte hasFocus)
-{
-  n_OnFocusChange_Landroid_view_View_Z (jnienv, native__this, native_v, hasFocus != 0);
-}
-
-static void n_OnFocusChange_Landroid_view_View_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_v, bool hasFocus)
-{
-  var __this = global::Java.Lang.Object.GetObject<Android.Views.View.IOnFocusChangeListener> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-  var v = global::Java.Lang.Object.GetObject<Android.Views.View> (native_v, JniHandleOwnership.DoNotTransfer);
-  __this.OnFocusChange (v, hasFocus);
-}
-```
-
-#### UnmanagedCallersOnly attribute
-
-Each marshal methods native callback method is decorated with the
-[`[UnmanagedCallersOnly]`](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.unmanagedcallersonlyattribute?view=net-6.0)
-attribute, in order for us to be able to invoke the callback directly
-from native code with minimal overhead compared to traditional
-managed-from-native method calls (`mono_runtime_invoke`)
-
-### Marshal Methods Registration call sequence
-
-The sequence described in the [dynamic
-registration sequence](#dynamic-registration-call-sequence) section
-above is completely removed for the marshal methods.  What remains
-common for both dynamic and marshal methods registration, is the
-resolution of the native function target done by the Java VM runtime.
-In both cases the method declared in a Java class as `native` is
-looked up by the Java VM when first JIT-ing the code.  The difference
-lies in the way this lookup is performed.
-
-Dynamic registration uses the
-[`RegisterNatives`](https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#RegisterNatives)
-JNI function at the runtime, which stores a pointer to the registered
-method inside the structure which describes a Java class in the Java
-VM.
-
-Marshal methods, however, don't register anything with the JNI,
-instead they rely on the symbol lookup mechanism of the Java VM.
-Whenever a call to `native` Java method is JIT-ed and it is not
-registered previously using the `RegisterNatives` JNI function, Java
-VM will proceed to look for symbols in the process runtime image (e.g.
-using `dlopen` + `dlsym` calls on Unix) and, having found a matching
-symbol, use pointer to it as the target of the `native` Java method
-call.
+This is a representative *generated* shape, not a source file to edit.
+Application and instrumentation wrappers defer registration through a
+generated guarded `__md_registerNatives()` method where static initialization
+would be too early. The `registerNatives` declaration itself is **handwritten**
+in [`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java).
+
+At startup,
+[`JNIEnvInit`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs)
+installs the trimmable type and value managers and calls
+`TrimmableTypeMap.RegisterNativeMethods()`. That binds
+`mono/android/Runtime.registerNatives` to a managed callback using JNI
+`RegisterNatives`. When a generated JCW requests registration for its
+class, `TrimmableTypeMap.OnRegisterNatives` looks up that Java class in the
+generated map and asks its generated `IAndroidCallableWrapper` registration
+code to bind the class's `n_*` methods. ART can then call those registered
+methods, which transition through generated managed JNI-ABI entrypoints to
+the managed implementation.
+
+The [generator model](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
+records method name, JNI signature, and callback target for each native
+registration. For exported or directly callable managed methods,
+[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
+emits an `UnmanagedCallersOnly` entrypoint that converts JNI arguments, calls
+the managed method, converts its result, and handles exceptions. Other
+callbacks use the generated registration's corresponding marshal target.
+Do not confuse these **generated managed** entrypoints with the handwritten
+Java declarations or the old native registration table.
+
+## Startup and peer lifetime
+
+CoreCLR's [native host](../../../src/native/clr/host/host.cc) captures the
+Java VM at `JNI_OnLoad`, starts the managed runtime from
+`Runtime.initInternal`, and enters `JNIEnvInit.Initialize`. The native
+`Runtime.register` entrypoint remains a compatibility stub; TypeMap-based
+native registration is handled on the managed side.
+
+NativeAOT instead enters
+[`JavaInteropRuntime.JNI_OnLoad` / `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs),
+constructs a
+[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
+and calls `JNIEnvInit.InitializeNativeAotRuntime`. Both runtime paths
+register the same `TrimmableTypeMap` JNI callback, but NativeAOT cannot
+depend on CoreCLR's reflection-based fallback for missing mappings.
+[`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
+provides the generated proxy's AOT-safe peer creation hook.
+
+A managed `Java.Lang.Object` and its Java object are peers, not one object
+shared by two garbage collectors. Generated JCWs implement the Java-side
+[`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java)
+reference hooks; the runtime's
+[`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs)
+and `TrimmableTypeMapValueManager` register, find, replace, and finalize
+managed peers while respecting JNI reference ownership. Disposing a managed
+peer or letting collection retire a pair can remove the association; keeping
+a raw JNI handle after that does not keep the old managed instance alive.
+
+## Trimming, AOT, and diagnosing failures
+
+The [CoreCLR targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
+feed the generated TypeMap assemblies to ILLink as trimmable inputs. With
+`PublishTrimmed=true`, they regenerate JCWs into `typemap/linked-java/` from
+the **linked** assemblies, so compiled Java matches the surviving managed
+callbacks. Check `typemap/linked-java-files.txt` rather than only the
+pre-trim `java-files.txt` in such a build. The
+[NativeAOT targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
+feed TypeMaps to ILC and use its output plus the ACW map for Java shrinker
+configuration. Both pipelines depend on reachable managed types and their
+generated registrations; a method or type missing after trimming is not
+fixed by restoring a historical native TypeMap path.
+
+When investigating:
+
+1. Check the build's generated TypeMap DLL list, JCW list, `acw-map.txt`,
+   and compiled Java sources (post-trim `linked-java/` if applicable).
+   Compare the actual Java class/name/signature with the generated native
+   registration and its managed target.
+2. Check `adb logcat` for a Java `UnsatisfiedLinkError`, JNI registration
+   failure, or managed exception during activation; distinguish a missing
+   callback from a missing managed peer mapping. Inspect the runtime's
+   `TrimmableTypeMap` and generated proxy paths for the latter.
+3. For invalid or prematurely disposed JNI object references, use
+   [Debugging JNI Object Reference Crashes](debug-jni-objrefs.md). For build
+   errors about unsupported `AndroidTypeMapImplementation` values, see
+   [the build property](../../docs-mobile/building-apps/build-properties.md);
+   duplicate Java-visible constructor signatures are reported as
+   [XA4259](../../docs-mobile/messages/xa4259.md).
+
+The [trimmable TypeMap build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
+cover generation, trimming, NativeAOT and CoreCLR packaging, and incremental
+Java output. Start there when changing generated interop behavior.

From 72823ec9a05601ad60aad685cfc0a680bd56be1b Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:25:04 +0200
Subject: [PATCH 46/58] Expand trimmable JNI interop guide with generated code
 paths

Explain the former registration concepts using current TypeMap and JCW examples, managed UTF-8 JNI registration, ABI marshalling, startup, peer lifecycle, and trimming.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../guides/internals/JavaJNI_Interop.md       | 607 +++++++++++++-----
 1 file changed, 461 insertions(+), 146 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 7d06fa1f544..542a9c09078 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,167 +1,482 @@
-# Java and managed interoperability (trimmable TypeMap)
+# Java and managed interoperability with the trimmable TypeMap
 
-This guide describes the **current** .NET for Android application interop
-path for CoreCLR and NativeAOT. `AndroidTypeMapImplementation=trimmable` is the
-only supported application TypeMap implementation. The Java VM (ART) and the
-managed runtime communicate through JNI; the build supplies generated Java
-callable wrappers (JCWs) and managed TypeMap assemblies, while handwritten
-Java and managed runtime code connects those generated pieces. This is not a
-description of the former MonoVM/native LLVM TypeMap or assembly-rewriting
-pipeline.
+This is an internal guide to the interop path used by **CoreCLR and NativeAOT
+Android applications**. The Java VM (ART) and the managed runtime are separate
+environments in one process. JNI is the boundary in both directions: bound C#
+types call Java methods through Java.Interop, and Java calls managed methods
+through generated Java callable wrappers (JCWs) with registered JNI entrypoints.
 
-## What is generated
+`AndroidTypeMapImplementation=trimmable` is the only supported application
+TypeMap implementation. Earlier versions of this guide described a choice
+between reflection/delegate-based "dynamic" registration and native
+LLVM-generated marshal methods. Neither describes this path. Here, the build
+generates **managed** TypeMap assemblies (including proxy and marshal code)
+and Java sources; the managed runtime registers their native callbacks with
+ART. There is no application-level native TypeMap lookup table, generated
+`Java_...` symbol for each callback, or marshal-method callback rewriting.
 
-| Piece | Purpose and source |
+| Earlier guide | Trimmable TypeMap path |
 | --- | --- |
-| Bound managed API types | Managed callable wrappers for Android/Java APIs use `JniPeerMembers` to invoke Java methods. These are distinct from the app's Java callable wrappers; see [`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs) for an invocation. |
-| JCW `.java` files | Java classes for managed Java peers, with constructors and `n_*` native callbacks for Java-to-managed calls. [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) produces them from the scanned peer model. |
-| TypeMap DLLs | `_{AssemblyName}.TypeMap.dll` files hold mappings, proxy types, and native registration methods; `_Microsoft.Android.TypeMaps.dll` is the root that connects them. [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and [`RootTypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/RootTypeMapAssemblyGenerator.cs) emit these managed assemblies. |
-| Registration and manifest | The task generates `ApplicationRegistration.java` from the scanned peers (not from a Java template); it also writes the ACW map (`acw-map.txt`) and merged `AndroidManifest.xml`. |
-
-The [scanner](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
-reads assembly metadata to discover Java peers and their Java-visible
-constructors and methods. The
-[`GenerateTrimmableTypeMap` task](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
-drives the scan, validates it, emits the managed and Java outputs, and removes
-stale JCW sources. The
-[shared MSBuild targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
-run `_GenerateTrimmableTypeMap` after `CoreCompile`; their output lives under
-`obj/.../typemap/` (not in handwritten source). Inspect
-`typemap/typemap-assemblies.txt` and `typemap/java-files.txt` to see what
-that build actually generated. The
-[TypeMap build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
-documents target ordering, output stamps, and incremental regeneration.
-
-The root TypeMap assembly anchors the per-assembly TypeMaps and initializes
-the lookup dictionaries. Mapping attributes in those per-assembly DLLs
-associate Java names, managed types, and generated proxy types. ACW proxies
-implement `IAndroidCallableWrapper` for native registration; other proxies
-do not need that interface. These are **managed metadata**, not a lookup
-table in a native binary. The runtime
-[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-uses the mappings to resolve Java objects and managed peer types.
+| JCW static initializer built `__md_methods` and called `Runtime.register` with an assembly-qualified type name. | A generated JCW calls `Runtime.registerNatives(Class)`; the generated managed proxy supplies the registrations for that Java class. |
+| "Dynamic" registration used connector delegates and reflection/`Reflection.Emit` at runtime. | The scanner reads connector metadata to locate existing callbacks, but generated `UnmanagedCallersOnly` forwarders register their function pointers without making per-method delegates. |
+| "Marshal methods" relied on JNI `Java_...` native exports, native LLVM code, and a callback assembly rewriter. | The TypeMap emitter writes managed proxy/entrypoint IL; `RegisterNatives` binds method name/signature pairs to those entrypoints. |
+| JNI symbol mangling selected the native implementation; `_mm_wrapper` adapted booleans and exceptions. | The generated registration table uses NUL-terminated UTF-8 names/signatures; generated managed entrypoints perform JNI ABI conversion and exception handoff. |
 
-## Managed calls Java
+## Terms and a running example
 
-A bound C# method uses its `JniPeerMembers` and a JNI member signature to
-call Java through Java.Interop. For example,
-`Android.App.Activity.ReportFullyDrawn()` invokes
-`_members.InstanceMethods.InvokeVirtualVoidMethod(...)` with
-`"reportFullyDrawn.()V"` and the current peer. Static calls use the
-corresponding `StaticMethods` APIs. Arguments and return values cross JNI
-with the appropriate Java object references and value conversions. This
-direction does **not** call a JCW's `n_*` callback: the bound managed API
-is the caller, and the Java implementation is the callee.
+| Term | Meaning |
+| --- | --- |
+| Bound managed type (MCW) | A C# binding for an existing Java class, such as `Android.App.Activity`. Its `JniPeerMembers` invokes Java methods. |
+| Java callable wrapper (JCW, or ACW) | A *generated Java class* for a managed subclass or Java-visible implementation. Java overrides call `native n_*` methods, which lead back to managed code. |
+| TypeMap assembly | A *generated managed DLL* containing Java-name/managed-type associations, proxy types, and (for JCWs) registration and JNI entrypoint code. |
+| Java peer / managed peer | Two objects representing one interop instance, with separate runtimes and garbage collectors. JNI references and peer bookkeeping link their lifetimes. |
 
-When a JNI object arrives in managed code,
-[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
-resolves its Java type to a managed target/proxy using the generated map;
-[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
-reuses or constructs a managed peer for its JNI reference. Conversely, the
-type manager resolves managed Java-peer types to JNI type signatures when
-needed. The map is about **type and peer resolution**; it does not replace
-normal Java.Interop method invocation.
+For example, an application can subclass a bound `Activity`:
+
+```csharp
+using Android.App;
+using Android.OS;
 
-## Java calls managed code
+namespace MyApp
+{
+	[Activity (Name = "my.app.MainActivity", MainLauncher = true)]
+	public class MainActivity : Activity
+	{
+		protected override void OnCreate (Bundle? savedInstanceState)
+		{
+			base.OnCreate (savedInstanceState);
+			// Application work here.
+		}
+	}
+}
+```
+
+The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI
+signature `(Landroid/os/Bundle;)V`. The app override need not repeat
+`[Register]`: the scanner follows the registered base method through the
+override. The [scanner test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs)
+include both an explicitly registered `MainActivity` and an unannotated
+`UserActivity` override.
 
-The JCW is a real Java class generated for a managed peer. Its Java-visible
-methods forward to `native n_*` methods, and its constructors use generated
-`nctor_*` callbacks. The generator normally emits a per-class static
-initializer like:
+The corresponding JCW is roughly the following Java. This excerpt omits
+constructor and peer-reference code; its class name, registration call,
+override, and native callback name match the
+[JCW generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs):
 
 ```java
-static {
-    mono.android.Runtime.registerNatives (MyActivity.class);
+package my.app;
+
+public class MainActivity extends android.app.Activity
+        implements mono.android.IGCUserPeer
+{
+    static {
+        mono.android.Runtime.registerNatives (MainActivity.class);
+    }
+
+    @Override
+    public void onCreate (android.os.Bundle p0)
+    {
+        n_OnCreate_Landroid_os_Bundle_ (p0);
+    }
+
+    public native void n_OnCreate_Landroid_os_Bundle_ (android.os.Bundle p0);
 }
 ```
 
-This is a representative *generated* shape, not a source file to edit.
-Application and instrumentation wrappers defer registration through a
-generated guarded `__md_registerNatives()` method where static initialization
-would be too early. The `registerNatives` declaration itself is **handwritten**
-in [`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java).
-
-At startup,
-[`JNIEnvInit`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs)
-installs the trimmable type and value managers and calls
-`TrimmableTypeMap.RegisterNativeMethods()`. That binds
-`mono/android/Runtime.registerNatives` to a managed callback using JNI
-`RegisterNatives`. When a generated JCW requests registration for its
-class, `TrimmableTypeMap.OnRegisterNatives` looks up that Java class in the
-generated map and asks its generated `IAndroidCallableWrapper` registration
-code to bind the class's `n_*` methods. ART can then call those registered
-methods, which transition through generated managed JNI-ABI entrypoints to
-the managed implementation.
-
-The [generator model](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
-records method name, JNI signature, and callback target for each native
-registration. For exported or directly callable managed methods,
-[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
-emits an `UnmanagedCallersOnly` entrypoint that converts JNI arguments, calls
-the managed method, converts its result, and handles exceptions. Other
-callbacks use the generated registration's corresponding marshal target.
-Do not confuse these **generated managed** entrypoints with the handwritten
-Java declarations or the old native registration table.
-
-## Startup and peer lifetime
-
-CoreCLR's [native host](../../../src/native/clr/host/host.cc) captures the
-Java VM at `JNI_OnLoad`, starts the managed runtime from
-`Runtime.initInternal`, and enters `JNIEnvInit.Initialize`. The native
-`Runtime.register` entrypoint remains a compatibility stub; TypeMap-based
-native registration is handled on the managed side.
-
-NativeAOT instead enters
-[`JavaInteropRuntime.JNI_OnLoad` / `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs),
-constructs a
-[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
-and calls `JNIEnvInit.InitializeNativeAotRuntime`. Both runtime paths
-register the same `TrimmableTypeMap` JNI callback, but NativeAOT cannot
-depend on CoreCLR's reflection-based fallback for missing mappings.
+The Java name is `my/app/MainActivity`, not the assembly-qualified C# type
+name. The method descriptor means one `android.os.Bundle` argument and a
+`void` return; the `L...;` denotes an object reference. The generated
+callback name is derived from binding metadata. `OnCreate` can call
+`base.OnCreate` back into Java: that is a **new managed-to-Java invocation**,
+not a second JCW registration.
+
+## Build-time representation
+
+[`GenerateTrimmableTypeMap`](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
+invokes the
+[`JavaPeerScanner`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
+on the application, references, and SDK/framework inputs. The scanner reads
+managed assembly metadata, including Java type names, `[Register]` methods,
+overrides of registered base/interface methods, constructors, `[Export]`
+members, and manifest components. The
+[`TrimmableTypeMapGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs)
+validates the resulting model and feeds both the Java and managed emitters.
+The app's generated JCWs do not come from the old
+`JavaCallableWrapperGenerator` / `MarshalMethodsClassifier` pipeline.
+
+The main outputs are:
+
+| Output | Role |
+| --- | --- |
+| `typemap/java/**/*.java` | Generated JCWs; [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) emits class declarations, constructors, overrides, native declarations, registration, and `IGCUserPeer` hooks. |
+| `typemap/_*.TypeMap.dll` | Per-input-assembly managed mapping attributes, proxy types, and JNI registration methods emitted by [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs). |
+| `typemap/_Microsoft.Android.TypeMaps.dll` | Root assembly anchoring the per-assembly TypeMaps; its generated `TypeMapLoader.Initialize()` wires the mapping dictionaries ([`RootTypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/RootTypeMapAssemblyGenerator.cs)). |
+| `typemap/typemap-assemblies.txt`, `java-files.txt`, `acw-map.txt` | Lists of actual generated assemblies/Java sources and Java-to-managed class mappings for the build. |
+| `android/src/net/dot/android/ApplicationRegistration.java`, merged `AndroidManifest.xml` | Generated application/instrumentation registration and manifest output. The former is built from scan results, **not** copied from a handwritten template. |
+
+Each per-assembly TypeMap contains assembly-level mapping attributes: a key
+such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the
+managed target type. The root references the per-assembly maps via
+`TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**,
+not `.cs` files; the C# in the sections below is an explanatory translation
+of emitted code, not a file that a developer should edit. See
+[`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs),
+[`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs),
+and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
+
+For the example Activity, think of a mapping like this **conceptual C#**:
+
+```csharp
+// Assembly metadata, emitted as IL rather than source:
+[assembly: TypeMapAttribute ("my/app/MainActivity",
+			     typeof (MainActivityProxy), typeof (MyApp.MainActivity))]
+
+// The emitted ACW proxy derives from JavaPeerProxy<T> and implements
+// IAndroidCallableWrapper. Proxy names are chosen by the emitter.
+```
+
+There is no source-level `TypeMap` attribute for application code to write.
+The real emitted `TypeMapAttribute` takes the Java key and proxy reference;
+its trimmable three-argument form also takes the target reference. An
+unconditional mapping has just the key and proxy reference, whereas the
+target reference on a conditional mapping lets the trimming pipeline
+discard entries for unused managed types. ACW proxies implement
+`IAndroidCallableWrapper` to register callbacks; other proxies need not.
 [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
-provides the generated proxy's AOT-safe peer creation hook.
+provides peer creation without `Activator.CreateInstance`.
+
+The
+[shared TypeMap targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
+run `_GenerateTrimmableTypeMap` after `CoreCompile`, compile the generated Java,
+and feed TypeMap DLLs to later steps. They track generated files and remove
+stale JCWs when the managed model changes. The target's stamp and output lists
+matter on incremental builds: a stale compiled Java class can otherwise
+outlive its managed callback.
+
+CoreCLR's [runtime-specific targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
+give the TypeMap DLLs to ILLink as trimmable inputs, with
+`_Microsoft.Android.TypeMaps` as the entry assembly. For
+`PublishTrimmed=true`, a **second scan of linked assemblies** regenerates
+JCWs in `typemap/linked-java/` and records `linked-java-files.txt`; the
+pre-trim Java set is not necessarily the packaged set. NativeAOT's
+[targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
+feed the generated DLLs to ILC and use its graph plus the ACW map when
+producing Java shrinker configuration. Both modes need reachable managed
+mapping/proxy/entrypoint code; they do not resurrect the native LLVM TypeMap.
+
+## Managed code calls Java
+
+Android bindings are managed wrappers for *existing* Java APIs. For example,
+[`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs)
+uses its bound member descriptor `"reportFullyDrawn.()V"` and calls
+`_members.InstanceMethods.InvokeVirtualVoidMethod (...)` on `this`. The
+essential C# shape (simplified) is:
+
+```csharp
+const string id = "reportFullyDrawn.()V";
+_members.InstanceMethods.InvokeVirtualVoidMethod (id, this, null);
+```
+
+Java.Interop resolves the class and method, invokes JNI with the peer's
+reference, and converts values/references according to the binding. Other
+bound methods use `JniArgumentValue` arrays and the appropriate virtual,
+nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a
+per-call method dispatch table: it is involved when Java classes and managed
+peers must be mapped or created, not in place of this invocation.
+
+When JNI returns an object or Java passes one into managed code,
+[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
+uses the Java name and generated mappings to select a managed target and
+proxy. [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
+looks for an existing managed peer or constructs one from the JNI handle.
+In the reverse direction, the type manager can obtain a JNI type signature
+for a managed peer type. Do not confuse a bound `Activity` MCW with the
+`MainActivity` JCW that implements Java-to-managed overrides.
+
+## Java code calls managed code
+
+### JCW declarations and per-class registration
+
+The generated Java `onCreate` calls its native
+`n_OnCreate_Landroid_os_Bundle_`; constructors similarly declare generated
+`nctor_*` native callbacks, and instantiate/activate the managed peer when
+appropriate. The class's static block calls
+`mono.android.Runtime.registerNatives (MainActivity.class)` when the class
+is first initialized. This is **per Java class**. Application and
+instrumentation JCWs instead use a guarded `__md_registerNatives()` helper
+called from their generated wrappers: registration in their static
+initializer can be too early in startup. The declaration of
+`registerNatives(Class)` in
+[`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java)
+is handwritten Java; individual JCWs and their registration calls are
+generated.
+
+There is no concatenated `__md_methods` string and no
+`Runtime.register("managed.Type, Assembly", ...)` registration in this path.
+The old JNI native-symbol mangling rules (`Java_package_Class_method...`)
+matter for symbol-lookup-based JNI code, but generated app JCW callbacks
+here are associated with their Java declarations through
+[`RegisterNatives`](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#registernatives):
+the Java method **name** and **signature** must match; no `Java_...` export
+is required for each method.
+
+### Runtime startup and registration handshake
 
-A managed `Java.Lang.Object` and its Java object are peers, not one object
-shared by two garbage collectors. Generated JCWs implement the Java-side
+On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures
+the VM at `JNI_OnLoad`, initializes the managed runtime from
+`Runtime.initInternal`, and enters
+[`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs).
+That installs `TrimmableTypeMapTypeManager` and
+`TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls
+`TrimmableTypeMap.RegisterNativeMethods()`. The old native
+`Runtime.register` entrypoint remains a compatibility stub, **not** the
+mechanism that registers every JCW.
+
+NativeAOT has its own entry:
+[`JavaInteropRuntime.JNI_OnLoad` and `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs)
+initialize the native host and a
+[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
+then call `JNIEnvInit.InitializeNativeAotRuntime()`. That path also registers
+the `TrimmableTypeMap` callback. NativeAOT cannot rely on CoreCLR's optional
+reflection-based peer construction path when a generated mapping is absent.
+Its generated `ApplicationRegistration.registerApplications()` calls
+`Runtime.registerNatives` for deferred startup types; the
+[`NativeAotRuntimeProvider`](../../../src/Xamarin.Android.Build.Tasks/Resources/NativeAotRuntimeProvider.java)
+invokes it after `JavaInteropRuntime.init(...)`.
+
+The first native binding is for `mono.android.Runtime.registerNatives`
+itself. [`TrimmableTypeMap.RegisterNativeMethods()`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+uses actual C# UTF-8 string literals for its JNI name and signature:
+
+```csharp
+fixed (byte* name = "registerNatives"u8,
+	     sig = "(Ljava/lang/Class;)V"u8) {
+	var method = new JniNativeMethod (name, sig, onRegisterNatives);
+	JniEnvironment.Types.RegisterNatives (runtimeClass.PeerReference, [method]);
+}
+```
+
+When a JCW's static block (or deferred helper) calls this Java native
+method, `TrimmableTypeMap.OnRegisterNatives` obtains the class's JNI
+name, finds its mapping/proxy, and calls the proxy's
+`IAndroidCallableWrapper.RegisterNatives(JniType)`. This registers the
+class's `n_*` and `nctor_*` methods with ART. The handwritten
+[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+does the lookup and handoff; the *per-class* method table is in a
+**generated managed TypeMap proxy**. The CoreCLR host does not supply a
+table of exported native functions for these app methods.
+
+### Generated registration in C# terms, including UTF-8
+
+The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
+emits sealed `JavaPeerProxy<T>` types for peers that need proxies. A JCW proxy also
+implements `IAndroidCallableWrapper`. For each native method it emits a
+`JniNativeMethod` containing a **pointer to a name**, a **pointer to a JNI
+signature**, and a **callable entrypoint pointer**. Its `RegisterNatives`
+method stack-allocates the entries and passes a `ReadOnlySpan<JniNativeMethod>`
+to `JniEnvironment.Types.RegisterNatives`. In **conceptual C#** (field and
+callback identifiers are illustrative, and the emitter writes IL):
+
+```csharp
+public unsafe void RegisterNatives (JniType jniType)
+{
+	JniNativeMethod* entries = stackalloc JniNativeMethod [1];
+	delegate* unmanaged<IntPtr, IntPtr, IntPtr, void> callback = &OnCreateEntry;
+	entries [0] = new JniNativeMethod (
+		&MethodNameUtf8, &MethodSignatureUtf8, (IntPtr) callback);
+	JniEnvironment.Types.RegisterNatives (
+		jniType.PeerReference,
+		new ReadOnlySpan<JniNativeMethod> (entries, 1));
+}
+```
+
+The [`PEAssemblyBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/PEAssemblyBuilder.cs)
+emits the actual name/signature fields as **NUL-terminated UTF-8 bytes in
+RVA data**. It can reuse identical signature data. A representative
+registration pair for the Activity example is
+`n_OnCreate_Landroid_os_Bundle_` and `(Landroid/os/Bundle;)V`; these
+identify the *native* Java declaration, not the C# method's
+`GetOnCreate...Handler` connector. There is no runtime decoding of
+`__md_methods` or per-callback `Java_...` export lookup. The handwritten
+`registerNatives` binding above likewise supplies `byte*` name/signature
+data, via C# `u8` literals.
+
+These name/signature bytes are not Java `String` argument marshalling. JNI's
+`GetStringUTFChars`/`NewStringUTF` APIs use
+[modified UTF-8](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/types.html#modified-utf-8-strings);
+the emitter stores the registration identifiers/descriptors as UTF-8
+with explicit NUL terminators (the ASCII names/signatures above have
+the same bytes in either encoding). For example, the CoreCLR
+[class-name lookup](../../../src/native/clr/host/host-shared.cc)
+obtains a Java class name via `GetStringUTFChars`, then converts its dots to
+slashes for a TypeMap key. Separately,
+[`JniRemappingLookup`](../../../src/Mono.Android/Microsoft.Android.Runtime/JniRemappingLookup.cs)
+encodes method names/signatures as UTF-8 with an explicit trailing NUL
+for native remapping lookup. Neither path is a substitute for marshalling
+Java `String` values across JNI.
+
+### From JNI ABI to a C# method
+
+JNI passes a `JNIEnv*`, the instance (`jobject`) or class (`jclass`), then
+the declared arguments. Java object handles appear as pointer-sized
+parameters; the generated managed entrypoints have JNI-ABI-compatible
+signatures and are marked `UnmanagedCallersOnly`. For the example callback,
+the ABI parameters correspond to `IntPtr env`, `IntPtr self`, and
+`IntPtr savedInstanceState`. This does **not** mean the app override accepts
+`IntPtr`: its bound callback/proxy converts the `Bundle` reference and
+dispatches the virtual C# `OnCreate(Bundle?)`.
+
+The scanner reads `[Register ("onCreate",
+"(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]`
+on the bound method (or its base). The third string is **connector metadata**,
+not the Java name of the native callback. For a normal registered binding,
+the scanner uses it to find the callback's declaring type and name (such as
+`n_OnCreate_Landroid_os_Bundle_`) and, when available, its *real* CLR
+signature. The
+[`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
+emits an `UnmanagedCallersOnly` forwarder to that existing callback, which
+then calls the virtual managed method. The old path made a delegate using
+`GetOnCreate...Handler` and `JNINativeWrapper.CreateDelegate`; the
+trimmable path derives callback metadata from the connector without
+creating a delegate per registration.
+
+`[Export]` (and methods classified as directly callable) take a different
+branch. The
+[`ModelBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
+marks them for a generated direct dispatcher. The
+[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
+emits the JNI entrypoint and argument conversions, calls the managed target,
+converts the return value, and copies back applicable array outputs; it
+does not invoke a connector callback. For example, a Java-visible C#
+method can be written as:
+
+```csharp
+[Java.Interop.Export ("handleClick")]
+public bool HandleClick (Android.Views.View view, int action)
+{
+	return action != 0;
+}
+```
+
+This is the shape exercised by the
+[export fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
+The Java wrapper has a `native` declaration with its calculated JNI
+signature; the generated managed dispatcher, not the developer's C#
+method directly, is the unmanaged entrypoint.
+
+JNI signatures are **not** CLR method signatures. JNI `Z` is an
+eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and
+`Landroid/os/Bundle;` a Java object reference. The emitted entrypoint
+uses JNI ABI types (a `byte` for a boolean); conversions such as
+`jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C#
+`bool`. For normal registered callbacks the generator uses the
+captured original callback signature where available: older bindings
+may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`.
+It must not assume that the callback signature is identical to the
+Java descriptor; see the scanner's
+[callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
+and [test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
+No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
+
+Both generated forwarders and direct dispatchers use a marshal-method
+frame: `BeginMarshalMethod`, a `try` around the managed call, exception
+handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in
+`finally`. An arbitrary managed exception is not simply allowed to
+escape across an unmanaged JNI boundary. Compare
+[`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
+with the
+[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
+
+The call sequence for a Java `onCreate(Bundle)` is therefore:
+
+1. ART enters the generated `MainActivity.onCreate`.
+2. That method calls its registered `n_OnCreate_Landroid_os_Bundle_`.
+3. JNI invokes the generated `UnmanagedCallersOnly` entrypoint for the
+   registered name/signature. For a bound override, it forwards to the
+   connector-derived bound callback; for a direct export it marshals and
+   invokes the target itself.
+4. Peer lookup/activation and argument conversion supply the managed
+   `MainActivity` and `Bundle`; virtual dispatch runs the app override.
+   A call to `base.OnCreate` then goes **managed-to-Java** through
+   `JniPeerMembers`.
+
+## Peer activation and lifetime
+
+A Java-side constructor and a managed-side constructor do not allocate
+one shared object. Generated JCW constructors call `super(...)` and,
+when the actual Java class matches the wrapper, a generated
+`nctor_*` callback to activate the matching managed peer. This class
+check matters when a JCW is further subclassed. For some startup
+types registration is deferred as described above. The generator
+produces the appropriate constructor shape from its scan; compare
+[`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs)
+and its [constructor tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs).
+
+On the managed side,
+[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
+uses generated mapping attributes to resolve a Java class and target
+type. Its [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
+can create the managed object from a handle without late-bound
+`Activator.CreateInstance`; activation also accounts for an existing
+replaceable peer. [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
+resolves names/types, while
+[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
+checks for registered peers and handles construction/ownership.
+
+Every generated JCW implements the Java
 [`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java)
-reference hooks; the runtime's
+hooks `monodroidAddReference` and `monodroidClearReferences`. Managed
 [`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs)
-and `TrimmableTypeMapValueManager` register, find, replace, and finalize
-managed peers while respecting JNI reference ownership. Disposing a managed
-peer or letting collection retire a pair can remove the association; keeping
-a raw JNI handle after that does not keep the old managed instance alive.
-
-## Trimming, AOT, and diagnosing failures
-
-The [CoreCLR targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
-feed the generated TypeMap assemblies to ILLink as trimmable inputs. With
-`PublishTrimmed=true`, they regenerate JCWs into `typemap/linked-java/` from
-the **linked** assemblies, so compiled Java matches the surviving managed
-callbacks. Check `typemap/linked-java-files.txt` rather than only the
-pre-trim `java-files.txt` in such a build. The
-[NativeAOT targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
-feed TypeMaps to ILC and use its output plus the ACW map for Java shrinker
-configuration. Both pipelines depend on reachable managed types and their
-generated registrations; a method or type missing after trimming is not
-fixed by restoring a historical native TypeMap path.
-
-When investigating:
-
-1. Check the build's generated TypeMap DLL list, JCW list, `acw-map.txt`,
-   and compiled Java sources (post-trim `linked-java/` if applicable).
-   Compare the actual Java class/name/signature with the generated native
-   registration and its managed target.
-2. Check `adb logcat` for a Java `UnsatisfiedLinkError`, JNI registration
-   failure, or managed exception during activation; distinguish a missing
-   callback from a missing managed peer mapping. Inspect the runtime's
-   `TrimmableTypeMap` and generated proxy paths for the latter.
-3. For invalid or prematurely disposed JNI object references, use
-   [Debugging JNI Object Reference Crashes](debug-jni-objrefs.md). For build
-   errors about unsupported `AndroidTypeMapImplementation` values, see
+tracks add/peek/remove/finalize operations, and the GC bridge coordinates
+the two collectors. Local and global JNI references have different
+lifetimes: a managed wrapper may need a global reference to keep its
+peer accessible after a JNI call returns. `JniHandleOwnership` records
+whether an incoming reference is transferred. Calling `Dispose()` can
+remove the association; a raw `IntPtr` retained afterward is not a
+safe substitute for a live managed peer. For invalid reference
+diagnostics, see
+[Debugging JNI Object Reference Crashes](debug-jni-objrefs.md).
+
+## Diagnosing a broken interop path
+
+Start at the boundary where the failure occurs; these files distinguish
+build output, registration, and peer activation:
+
+1. **Missing or wrong Java class:** inspect the merged manifest,
+   `typemap/java/` (or CoreCLR's `typemap/linked-java/` after
+   trimming), `java-files.txt` / `linked-java-files.txt`, and
+   `acw-map.txt`. Confirm the expected Java name and base/override
+   signatures. A stale `.class` is not proof that a corresponding
+   TypeMap entry survived.
+2. **Unbound native method / `UnsatisfiedLinkError`:** compare the
+   generated JCW's `native` method **name and JNI descriptor** with
+   its generated proxy registration. Check whether
+   `mono.android.Runtime.registerNatives` ran for the class (or its
+   deferred helper did), and inspect `adb logcat` for the registration
+   exception. Do not search for a missing `Java_...` export in this
+   pipeline.
+3. **Wrong managed type or activation failure:** check
+   `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps`
+   assembly, `TrimmableTypeMap` lookup, proxy construction, and
+   `JavaMarshalRegisteredPeers`. Verify whether a Java callback came
+   from a managed-created peer or needs activation from a Java-created
+   peer. On NativeAOT a missing generated mapping cannot be rescued
+   by CoreCLR-only reflection.
+4. **Release/trim-only failure:** inspect the *linked* managed
+   assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and
+   shrinker rules. The pre-trim generated Java is not necessarily
+   packaged Java. The
+   [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
+   explains target stamps and stale-file handling.
+5. **JNI reference or marshal failure:** use `adb logcat` and
+   [the JNI reference guide](debug-jni-objrefs.md) for ownership and
+   collection problems. For unsupported TypeMap settings see
    [the build property](../../docs-mobile/building-apps/build-properties.md);
-   duplicate Java-visible constructor signatures are reported as
+   duplicate Java-visible constructor signatures produce
    [XA4259](../../docs-mobile/messages/xa4259.md).
 
-The [trimmable TypeMap build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
-cover generation, trimming, NativeAOT and CoreCLR packaging, and incremental
-Java output. Start there when changing generated interop behavior.
+The [TypeMap generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs),
+[JCW tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs),
+and [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
+exercise these paths. Compare their expected names/signatures against
+the generated DLL and Java files before changing runtime registration.

From 7b6e8c40398383456014910c45ce3f92d630bb48 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:29:37 +0200
Subject: [PATCH 47/58] Let editors wrap JNI interop guide prose

Keep Markdown paragraphs on one source line while preserving list, table, heading, and fenced code structure.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../guides/internals/JavaJNI_Interop.md       | 385 +++---------------
 1 file changed, 56 insertions(+), 329 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 542a9c09078..10d9b25ef4d 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -1,19 +1,8 @@
 # Java and managed interoperability with the trimmable TypeMap
 
-This is an internal guide to the interop path used by **CoreCLR and NativeAOT
-Android applications**. The Java VM (ART) and the managed runtime are separate
-environments in one process. JNI is the boundary in both directions: bound C#
-types call Java methods through Java.Interop, and Java calls managed methods
-through generated Java callable wrappers (JCWs) with registered JNI entrypoints.
-
-`AndroidTypeMapImplementation=trimmable` is the only supported application
-TypeMap implementation. Earlier versions of this guide described a choice
-between reflection/delegate-based "dynamic" registration and native
-LLVM-generated marshal methods. Neither describes this path. Here, the build
-generates **managed** TypeMap assemblies (including proxy and marshal code)
-and Java sources; the managed runtime registers their native callbacks with
-ART. There is no application-level native TypeMap lookup table, generated
-`Java_...` symbol for each callback, or marshal-method callback rewriting.
+This is an internal guide to the interop path used by **CoreCLR and NativeAOT Android applications**. The Java VM (ART) and the managed runtime are separate environments in one process. JNI is the boundary in both directions: bound C# types call Java methods through Java.Interop, and Java calls managed methods through generated Java callable wrappers (JCWs) with registered JNI entrypoints.
+
+`AndroidTypeMapImplementation=trimmable` is the only supported application TypeMap implementation. Earlier versions of this guide described a choice between reflection/delegate-based "dynamic" registration and native LLVM-generated marshal methods. Neither describes this path. Here, the build generates **managed** TypeMap assemblies (including proxy and marshal code) and Java sources; the managed runtime registers their native callbacks with ART. There is no application-level native TypeMap lookup table, generated `Java_...` symbol for each callback, or marshal-method callback rewriting.
 
 | Earlier guide | Trimmable TypeMap path |
 | --- | --- |
@@ -51,17 +40,9 @@ namespace MyApp
 }
 ```
 
-The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI
-signature `(Landroid/os/Bundle;)V`. The app override need not repeat
-`[Register]`: the scanner follows the registered base method through the
-override. The [scanner test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs)
-include both an explicitly registered `MainActivity` and an unannotated
-`UserActivity` override.
+The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI signature `(Landroid/os/Bundle;)V`. The app override need not repeat `[Register]`: the scanner follows the registered base method through the override. The [scanner test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs) include both an explicitly registered `MainActivity` and an unannotated `UserActivity` override.
 
-The corresponding JCW is roughly the following Java. This excerpt omits
-constructor and peer-reference code; its class name, registration call,
-override, and native callback name match the
-[JCW generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs):
+The corresponding JCW is roughly the following Java. This excerpt omits constructor and peer-reference code; its class name, registration call, override, and native callback name match the [JCW generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs):
 
 ```java
 package my.app;
@@ -83,26 +64,11 @@ public class MainActivity extends android.app.Activity
 }
 ```
 
-The Java name is `my/app/MainActivity`, not the assembly-qualified C# type
-name. The method descriptor means one `android.os.Bundle` argument and a
-`void` return; the `L...;` denotes an object reference. The generated
-callback name is derived from binding metadata. `OnCreate` can call
-`base.OnCreate` back into Java: that is a **new managed-to-Java invocation**,
-not a second JCW registration.
+The Java name is `my/app/MainActivity`, not the assembly-qualified C# type name. The method descriptor means one `android.os.Bundle` argument and a `void` return; the `L...;` denotes an object reference. The generated callback name is derived from binding metadata. `OnCreate` can call `base.OnCreate` back into Java: that is a **new managed-to-Java invocation**, not a second JCW registration.
 
 ## Build-time representation
 
-[`GenerateTrimmableTypeMap`](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs)
-invokes the
-[`JavaPeerScanner`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
-on the application, references, and SDK/framework inputs. The scanner reads
-managed assembly metadata, including Java type names, `[Register]` methods,
-overrides of registered base/interface methods, constructors, `[Export]`
-members, and manifest components. The
-[`TrimmableTypeMapGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs)
-validates the resulting model and feeds both the Java and managed emitters.
-The app's generated JCWs do not come from the old
-`JavaCallableWrapperGenerator` / `MarshalMethodsClassifier` pipeline.
+[`GenerateTrimmableTypeMap`](../../../src/Microsoft.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs) invokes the [`JavaPeerScanner`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs) on the application, references, and SDK/framework inputs. The scanner reads managed assembly metadata, including Java type names, `[Register]` methods, overrides of registered base/interface methods, constructors, `[Export]` members, and manifest components. The [`TrimmableTypeMapGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs) validates the resulting model and feeds both the Java and managed emitters. The app's generated JCWs do not come from the old `JavaCallableWrapperGenerator` / `MarshalMethodsClassifier` pipeline.
 
 The main outputs are:
 
@@ -114,15 +80,7 @@ The main outputs are:
 | `typemap/typemap-assemblies.txt`, `java-files.txt`, `acw-map.txt` | Lists of actual generated assemblies/Java sources and Java-to-managed class mappings for the build. |
 | `android/src/net/dot/android/ApplicationRegistration.java`, merged `AndroidManifest.xml` | Generated application/instrumentation registration and manifest output. The former is built from scan results, **not** copied from a handwritten template. |
 
-Each per-assembly TypeMap contains assembly-level mapping attributes: a key
-such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the
-managed target type. The root references the per-assembly maps via
-`TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**,
-not `.cs` files; the C# in the sections below is an explanatory translation
-of emitted code, not a file that a developer should edit. See
-[`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs),
-[`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs),
-and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
+Each per-assembly TypeMap contains assembly-level mapping attributes: a key such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the managed target type. The root references the per-assembly maps via `TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**, not `.cs` files; the C# in the sections below is an explanatory translation of emitted code, not a file that a developer should edit. See [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
 
 For the example Activity, think of a mapping like this **conceptual C#**:
 
@@ -135,118 +93,40 @@ For the example Activity, think of a mapping like this **conceptual C#**:
 // IAndroidCallableWrapper. Proxy names are chosen by the emitter.
 ```
 
-There is no source-level `TypeMap` attribute for application code to write.
-The real emitted `TypeMapAttribute` takes the Java key and proxy reference;
-its trimmable three-argument form also takes the target reference. An
-unconditional mapping has just the key and proxy reference, whereas the
-target reference on a conditional mapping lets the trimming pipeline
-discard entries for unused managed types. ACW proxies implement
-`IAndroidCallableWrapper` to register callbacks; other proxies need not.
-[`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
-provides peer creation without `Activator.CreateInstance`.
-
-The
-[shared TypeMap targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets)
-run `_GenerateTrimmableTypeMap` after `CoreCompile`, compile the generated Java,
-and feed TypeMap DLLs to later steps. They track generated files and remove
-stale JCWs when the managed model changes. The target's stamp and output lists
-matter on incremental builds: a stale compiled Java class can otherwise
-outlive its managed callback.
-
-CoreCLR's [runtime-specific targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets)
-give the TypeMap DLLs to ILLink as trimmable inputs, with
-`_Microsoft.Android.TypeMaps` as the entry assembly. For
-`PublishTrimmed=true`, a **second scan of linked assemblies** regenerates
-JCWs in `typemap/linked-java/` and records `linked-java-files.txt`; the
-pre-trim Java set is not necessarily the packaged set. NativeAOT's
-[targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets)
-feed the generated DLLs to ILC and use its graph plus the ACW map when
-producing Java shrinker configuration. Both modes need reachable managed
-mapping/proxy/entrypoint code; they do not resurrect the native LLVM TypeMap.
+There is no source-level `TypeMap` attribute for application code to write. The real emitted `TypeMapAttribute` takes the Java key and proxy reference; its trimmable three-argument form also takes the target reference. An unconditional mapping has just the key and proxy reference, whereas the target reference on a conditional mapping lets the trimming pipeline discard entries for unused managed types. ACW proxies implement `IAndroidCallableWrapper` to register callbacks; other proxies need not. [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs) provides peer creation without `Activator.CreateInstance`.
+
+The [shared TypeMap targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets) run `_GenerateTrimmableTypeMap` after `CoreCompile`, compile the generated Java, and feed TypeMap DLLs to later steps. They track generated files and remove stale JCWs when the managed model changes. The target's stamp and output lists matter on incremental builds: a stale compiled Java class can otherwise outlive its managed callback.
+
+CoreCLR's [runtime-specific targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets) give the TypeMap DLLs to ILLink as trimmable inputs, with `_Microsoft.Android.TypeMaps` as the entry assembly. For `PublishTrimmed=true`, a **second scan of linked assemblies** regenerates JCWs in `typemap/linked-java/` and records `linked-java-files.txt`; the pre-trim Java set is not necessarily the packaged set. NativeAOT's [targets](../../../src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.NativeAOT.targets) feed the generated DLLs to ILC and use its graph plus the ACW map when producing Java shrinker configuration. Both modes need reachable managed mapping/proxy/entrypoint code; they do not resurrect the native LLVM TypeMap.
 
 ## Managed code calls Java
 
-Android bindings are managed wrappers for *existing* Java APIs. For example,
-[`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs)
-uses its bound member descriptor `"reportFullyDrawn.()V"` and calls
-`_members.InstanceMethods.InvokeVirtualVoidMethod (...)` on `this`. The
-essential C# shape (simplified) is:
+Android bindings are managed wrappers for *existing* Java APIs. For example, [`Activity.ReportFullyDrawn()`](../../../src/Mono.Android/Android.App/Activity.cs) uses its bound member descriptor `"reportFullyDrawn.()V"` and calls `_members.InstanceMethods.InvokeVirtualVoidMethod (...)` on `this`. The essential C# shape (simplified) is:
 
 ```csharp
 const string id = "reportFullyDrawn.()V";
 _members.InstanceMethods.InvokeVirtualVoidMethod (id, this, null);
 ```
 
-Java.Interop resolves the class and method, invokes JNI with the peer's
-reference, and converts values/references according to the binding. Other
-bound methods use `JniArgumentValue` arrays and the appropriate virtual,
-nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a
-per-call method dispatch table: it is involved when Java classes and managed
-peers must be mapped or created, not in place of this invocation.
-
-When JNI returns an object or Java passes one into managed code,
-[`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
-uses the Java name and generated mappings to select a managed target and
-proxy. [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
-looks for an existing managed peer or constructs one from the JNI handle.
-In the reverse direction, the type manager can obtain a JNI type signature
-for a managed peer type. Do not confuse a bound `Activity` MCW with the
-`MainActivity` JCW that implements Java-to-managed overrides.
+Java.Interop resolves the class and method, invokes JNI with the peer's reference, and converts values/references according to the binding. Other bound methods use `JniArgumentValue` arrays and the appropriate virtual, nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a per-call method dispatch table: it is involved when Java classes and managed peers must be mapped or created, not in place of this invocation.
+
+When JNI returns an object or Java passes one into managed code, [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs) uses the Java name and generated mappings to select a managed target and proxy. [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs) looks for an existing managed peer or constructs one from the JNI handle. In the reverse direction, the type manager can obtain a JNI type signature for a managed peer type. Do not confuse a bound `Activity` MCW with the `MainActivity` JCW that implements Java-to-managed overrides.
 
 ## Java code calls managed code
 
 ### JCW declarations and per-class registration
 
-The generated Java `onCreate` calls its native
-`n_OnCreate_Landroid_os_Bundle_`; constructors similarly declare generated
-`nctor_*` native callbacks, and instantiate/activate the managed peer when
-appropriate. The class's static block calls
-`mono.android.Runtime.registerNatives (MainActivity.class)` when the class
-is first initialized. This is **per Java class**. Application and
-instrumentation JCWs instead use a guarded `__md_registerNatives()` helper
-called from their generated wrappers: registration in their static
-initializer can be too early in startup. The declaration of
-`registerNatives(Class)` in
-[`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java)
-is handwritten Java; individual JCWs and their registration calls are
-generated.
-
-There is no concatenated `__md_methods` string and no
-`Runtime.register("managed.Type, Assembly", ...)` registration in this path.
-The old JNI native-symbol mangling rules (`Java_package_Class_method...`)
-matter for symbol-lookup-based JNI code, but generated app JCW callbacks
-here are associated with their Java declarations through
-[`RegisterNatives`](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#registernatives):
-the Java method **name** and **signature** must match; no `Java_...` export
-is required for each method.
+The generated Java `onCreate` calls its native `n_OnCreate_Landroid_os_Bundle_`; constructors similarly declare generated `nctor_*` native callbacks, and instantiate/activate the managed peer when appropriate. The class's static block calls `mono.android.Runtime.registerNatives (MainActivity.class)` when the class is first initialized. This is **per Java class**. Application and instrumentation JCWs instead use a guarded `__md_registerNatives()` helper called from their generated wrappers: registration in their static initializer can be too early in startup. The declaration of `registerNatives(Class)` in [`mono.android.Runtime`](../../../src/java-runtime/java/mono/android/Runtime.java) is handwritten Java; individual JCWs and their registration calls are generated.
+
+There is no concatenated `__md_methods` string and no `Runtime.register("managed.Type, Assembly", ...)` registration in this path. The old JNI native-symbol mangling rules (`Java_package_Class_method...`) matter for symbol-lookup-based JNI code, but generated app JCW callbacks here are associated with their Java declarations through [`RegisterNatives`](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#registernatives): the Java method **name** and **signature** must match; no `Java_...` export is required for each method.
 
 ### Runtime startup and registration handshake
 
-On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures
-the VM at `JNI_OnLoad`, initializes the managed runtime from
-`Runtime.initInternal`, and enters
-[`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs).
-That installs `TrimmableTypeMapTypeManager` and
-`TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls
-`TrimmableTypeMap.RegisterNativeMethods()`. The old native
-`Runtime.register` entrypoint remains a compatibility stub, **not** the
-mechanism that registers every JCW.
-
-NativeAOT has its own entry:
-[`JavaInteropRuntime.JNI_OnLoad` and `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs)
-initialize the native host and a
-[`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs),
-then call `JNIEnvInit.InitializeNativeAotRuntime()`. That path also registers
-the `TrimmableTypeMap` callback. NativeAOT cannot rely on CoreCLR's optional
-reflection-based peer construction path when a generated mapping is absent.
-Its generated `ApplicationRegistration.registerApplications()` calls
-`Runtime.registerNatives` for deferred startup types; the
-[`NativeAotRuntimeProvider`](../../../src/Xamarin.Android.Build.Tasks/Resources/NativeAotRuntimeProvider.java)
-invokes it after `JavaInteropRuntime.init(...)`.
-
-The first native binding is for `mono.android.Runtime.registerNatives`
-itself. [`TrimmableTypeMap.RegisterNativeMethods()`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-uses actual C# UTF-8 string literals for its JNI name and signature:
+On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures the VM at `JNI_OnLoad`, initializes the managed runtime from `Runtime.initInternal`, and enters [`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs). That installs `TrimmableTypeMapTypeManager` and `TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls `TrimmableTypeMap.RegisterNativeMethods()`. The old native `Runtime.register` entrypoint remains a compatibility stub, **not** the mechanism that registers every JCW.
+
+NativeAOT has its own entry: [`JavaInteropRuntime.JNI_OnLoad` and `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs) initialize the native host and a [`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs), then call `JNIEnvInit.InitializeNativeAotRuntime()`. That path also registers the `TrimmableTypeMap` callback. NativeAOT cannot rely on CoreCLR's optional reflection-based peer construction path when a generated mapping is absent. Its generated `ApplicationRegistration.registerApplications()` calls `Runtime.registerNatives` for deferred startup types; the [`NativeAotRuntimeProvider`](../../../src/Xamarin.Android.Build.Tasks/Resources/NativeAotRuntimeProvider.java) invokes it after `JavaInteropRuntime.init(...)`.
+
+The first native binding is for `mono.android.Runtime.registerNatives` itself. [`TrimmableTypeMap.RegisterNativeMethods()`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs) uses actual C# UTF-8 string literals for its JNI name and signature:
 
 ```csharp
 fixed (byte* name = "registerNatives"u8,
@@ -256,26 +136,11 @@ fixed (byte* name = "registerNatives"u8,
 }
 ```
 
-When a JCW's static block (or deferred helper) calls this Java native
-method, `TrimmableTypeMap.OnRegisterNatives` obtains the class's JNI
-name, finds its mapping/proxy, and calls the proxy's
-`IAndroidCallableWrapper.RegisterNatives(JniType)`. This registers the
-class's `n_*` and `nctor_*` methods with ART. The handwritten
-[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-does the lookup and handoff; the *per-class* method table is in a
-**generated managed TypeMap proxy**. The CoreCLR host does not supply a
-table of exported native functions for these app methods.
+When a JCW's static block (or deferred helper) calls this Java native method, `TrimmableTypeMap.OnRegisterNatives` obtains the class's JNI name, finds its mapping/proxy, and calls the proxy's `IAndroidCallableWrapper.RegisterNatives(JniType)`. This registers the class's `n_*` and `nctor_*` methods with ART. The handwritten [`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs) does the lookup and handoff; the *per-class* method table is in a **generated managed TypeMap proxy**. The CoreCLR host does not supply a table of exported native functions for these app methods.
 
 ### Generated registration in C# terms, including UTF-8
 
-The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
-emits sealed `JavaPeerProxy<T>` types for peers that need proxies. A JCW proxy also
-implements `IAndroidCallableWrapper`. For each native method it emits a
-`JniNativeMethod` containing a **pointer to a name**, a **pointer to a JNI
-signature**, and a **callable entrypoint pointer**. Its `RegisterNatives`
-method stack-allocates the entries and passes a `ReadOnlySpan<JniNativeMethod>`
-to `JniEnvironment.Types.RegisterNatives`. In **conceptual C#** (field and
-callback identifiers are illustrative, and the emitter writes IL):
+The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) emits sealed `JavaPeerProxy<T>` types for peers that need proxies. A JCW proxy also implements `IAndroidCallableWrapper`. For each native method it emits a `JniNativeMethod` containing a **pointer to a name**, a **pointer to a JNI signature**, and a **callable entrypoint pointer**. Its `RegisterNatives` method stack-allocates the entries and passes a `ReadOnlySpan<JniNativeMethod>` to `JniEnvironment.Types.RegisterNatives`. In **conceptual C#** (field and callback identifiers are illustrative, and the emitter writes IL):
 
 ```csharp
 public unsafe void RegisterNatives (JniType jniType)
@@ -290,65 +155,17 @@ public unsafe void RegisterNatives (JniType jniType)
 }
 ```
 
-The [`PEAssemblyBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/PEAssemblyBuilder.cs)
-emits the actual name/signature fields as **NUL-terminated UTF-8 bytes in
-RVA data**. It can reuse identical signature data. A representative
-registration pair for the Activity example is
-`n_OnCreate_Landroid_os_Bundle_` and `(Landroid/os/Bundle;)V`; these
-identify the *native* Java declaration, not the C# method's
-`GetOnCreate...Handler` connector. There is no runtime decoding of
-`__md_methods` or per-callback `Java_...` export lookup. The handwritten
-`registerNatives` binding above likewise supplies `byte*` name/signature
-data, via C# `u8` literals.
-
-These name/signature bytes are not Java `String` argument marshalling. JNI's
-`GetStringUTFChars`/`NewStringUTF` APIs use
-[modified UTF-8](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/types.html#modified-utf-8-strings);
-the emitter stores the registration identifiers/descriptors as UTF-8
-with explicit NUL terminators (the ASCII names/signatures above have
-the same bytes in either encoding). For example, the CoreCLR
-[class-name lookup](../../../src/native/clr/host/host-shared.cc)
-obtains a Java class name via `GetStringUTFChars`, then converts its dots to
-slashes for a TypeMap key. Separately,
-[`JniRemappingLookup`](../../../src/Mono.Android/Microsoft.Android.Runtime/JniRemappingLookup.cs)
-encodes method names/signatures as UTF-8 with an explicit trailing NUL
-for native remapping lookup. Neither path is a substitute for marshalling
-Java `String` values across JNI.
+The [`PEAssemblyBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/PEAssemblyBuilder.cs) emits the actual name/signature fields as **NUL-terminated UTF-8 bytes in RVA data**. It can reuse identical signature data. A representative registration pair for the Activity example is `n_OnCreate_Landroid_os_Bundle_` and `(Landroid/os/Bundle;)V`; these identify the *native* Java declaration, not the C# method's `GetOnCreate...Handler` connector. There is no runtime decoding of `__md_methods` or per-callback `Java_...` export lookup. The handwritten `registerNatives` binding above likewise supplies `byte*` name/signature data, via C# `u8` literals.
+
+These name/signature bytes are not Java `String` argument marshalling. JNI's `GetStringUTFChars`/`NewStringUTF` APIs use [modified UTF-8](https://docs.oracle.com/en/java/javase/17/docs/specs/jni/types.html#modified-utf-8-strings); the emitter stores the registration identifiers/descriptors as UTF-8 with explicit NUL terminators (the ASCII names/signatures above have the same bytes in either encoding). For example, the CoreCLR [class-name lookup](../../../src/native/clr/host/host-shared.cc) obtains a Java class name via `GetStringUTFChars`, then converts its dots to slashes for a TypeMap key. Separately, [`JniRemappingLookup`](../../../src/Mono.Android/Microsoft.Android.Runtime/JniRemappingLookup.cs) encodes method names/signatures as UTF-8 with an explicit trailing NUL for native remapping lookup. Neither path is a substitute for marshalling Java `String` values across JNI.
 
 ### From JNI ABI to a C# method
 
-JNI passes a `JNIEnv*`, the instance (`jobject`) or class (`jclass`), then
-the declared arguments. Java object handles appear as pointer-sized
-parameters; the generated managed entrypoints have JNI-ABI-compatible
-signatures and are marked `UnmanagedCallersOnly`. For the example callback,
-the ABI parameters correspond to `IntPtr env`, `IntPtr self`, and
-`IntPtr savedInstanceState`. This does **not** mean the app override accepts
-`IntPtr`: its bound callback/proxy converts the `Bundle` reference and
-dispatches the virtual C# `OnCreate(Bundle?)`.
-
-The scanner reads `[Register ("onCreate",
-"(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]`
-on the bound method (or its base). The third string is **connector metadata**,
-not the Java name of the native callback. For a normal registered binding,
-the scanner uses it to find the callback's declaring type and name (such as
-`n_OnCreate_Landroid_os_Bundle_`) and, when available, its *real* CLR
-signature. The
-[`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
-emits an `UnmanagedCallersOnly` forwarder to that existing callback, which
-then calls the virtual managed method. The old path made a delegate using
-`GetOnCreate...Handler` and `JNINativeWrapper.CreateDelegate`; the
-trimmable path derives callback metadata from the connector without
-creating a delegate per registration.
-
-`[Export]` (and methods classified as directly callable) take a different
-branch. The
-[`ModelBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs)
-marks them for a generated direct dispatcher. The
-[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs)
-emits the JNI entrypoint and argument conversions, calls the managed target,
-converts the return value, and copies back applicable array outputs; it
-does not invoke a connector callback. For example, a Java-visible C#
-method can be written as:
+JNI passes a `JNIEnv*`, the instance (`jobject`) or class (`jclass`), then the declared arguments. Java object handles appear as pointer-sized parameters; the generated managed entrypoints have JNI-ABI-compatible signatures and are marked `UnmanagedCallersOnly`. For the example callback, the ABI parameters correspond to `IntPtr env`, `IntPtr self`, and `IntPtr savedInstanceState`. This does **not** mean the app override accepts `IntPtr`: its bound callback/proxy converts the `Bundle` reference and dispatches the virtual C# `OnCreate(Bundle?)`.
+
+The scanner reads `[Register ("onCreate", "(Landroid/os/Bundle;)V", "GetOnCreate_Landroid_os_Bundle_Handler")]` on the bound method (or its base). The third string is **connector metadata**, not the Java name of the native callback. For a normal registered binding, the scanner uses it to find the callback's declaring type and name (such as `n_OnCreate_Landroid_os_Bundle_`) and, when available, its *real* CLR signature. The [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) emits an `UnmanagedCallersOnly` forwarder to that existing callback, which then calls the virtual managed method. The old path made a delegate using `GetOnCreate...Handler` and `JNINativeWrapper.CreateDelegate`; the trimmable path derives callback metadata from the connector without creating a delegate per registration.
+
+`[Export]` (and methods classified as directly callable) take a different branch. The [`ModelBuilder`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs) marks them for a generated direct dispatcher. The [`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs) emits the JNI entrypoint and argument conversions, calls the managed target, converts the return value, and copies back applicable array outputs; it does not invoke a connector callback. For example, a Java-visible C# method can be written as:
 
 ```csharp
 [Java.Interop.Export ("handleClick")]
@@ -358,125 +175,35 @@ public bool HandleClick (Android.Views.View view, int action)
 }
 ```
 
-This is the shape exercised by the
-[export fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
-The Java wrapper has a `native` declaration with its calculated JNI
-signature; the generated managed dispatcher, not the developer's C#
-method directly, is the unmanaged entrypoint.
-
-JNI signatures are **not** CLR method signatures. JNI `Z` is an
-eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and
-`Landroid/os/Bundle;` a Java object reference. The emitted entrypoint
-uses JNI ABI types (a `byte` for a boolean); conversions such as
-`jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C#
-`bool`. For normal registered callbacks the generator uses the
-captured original callback signature where available: older bindings
-may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`.
-It must not assume that the callback signature is identical to the
-Java descriptor; see the scanner's
-[callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs)
-and [test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs).
-No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
-
-Both generated forwarders and direct dispatchers use a marshal-method
-frame: `BeginMarshalMethod`, a `try` around the managed call, exception
-handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in
-`finally`. An arbitrary managed exception is not simply allowed to
-escape across an unmanaged JNI boundary. Compare
-[`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs)
-with the
-[`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
+This is the shape exercised by the [export fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs). The Java wrapper has a `native` declaration with its calculated JNI signature; the generated managed dispatcher, not the developer's C# method directly, is the unmanaged entrypoint.
+
+JNI signatures are **not** CLR method signatures. JNI `Z` is an eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and `Landroid/os/Bundle;` a Java object reference. The emitted entrypoint uses JNI ABI types (a `byte` for a boolean); conversions such as `jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C# `bool`. For normal registered callbacks the generator uses the captured original callback signature where available: older bindings may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`. It must not assume that the callback signature is identical to the Java descriptor; see the scanner's [callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs) and [test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs). No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
+
+Both generated forwarders and direct dispatchers use a marshal-method frame: `BeginMarshalMethod`, a `try` around the managed call, exception handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in `finally`. An arbitrary managed exception is not simply allowed to escape across an unmanaged JNI boundary. Compare [`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) with the [`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
 
 The call sequence for a Java `onCreate(Bundle)` is therefore:
 
 1. ART enters the generated `MainActivity.onCreate`.
 2. That method calls its registered `n_OnCreate_Landroid_os_Bundle_`.
-3. JNI invokes the generated `UnmanagedCallersOnly` entrypoint for the
-   registered name/signature. For a bound override, it forwards to the
-   connector-derived bound callback; for a direct export it marshals and
-   invokes the target itself.
-4. Peer lookup/activation and argument conversion supply the managed
-   `MainActivity` and `Bundle`; virtual dispatch runs the app override.
-   A call to `base.OnCreate` then goes **managed-to-Java** through
-   `JniPeerMembers`.
+3. JNI invokes the generated `UnmanagedCallersOnly` entrypoint for the registered name/signature. For a bound override, it forwards to the connector-derived bound callback; for a direct export it marshals and invokes the target itself.
+4. Peer lookup/activation and argument conversion supply the managed `MainActivity` and `Bundle`; virtual dispatch runs the app override. A call to `base.OnCreate` then goes **managed-to-Java** through `JniPeerMembers`.
 
 ## Peer activation and lifetime
 
-A Java-side constructor and a managed-side constructor do not allocate
-one shared object. Generated JCW constructors call `super(...)` and,
-when the actual Java class matches the wrapper, a generated
-`nctor_*` callback to activate the matching managed peer. This class
-check matters when a JCW is further subclassed. For some startup
-types registration is deferred as described above. The generator
-produces the appropriate constructor shape from its scan; compare
-[`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs)
-and its [constructor tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs).
-
-On the managed side,
-[`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs)
-uses generated mapping attributes to resolve a Java class and target
-type. Its [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs)
-can create the managed object from a handle without late-bound
-`Activator.CreateInstance`; activation also accounts for an existing
-replaceable peer. [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs)
-resolves names/types, while
-[`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs)
-checks for registered peers and handles construction/ownership.
-
-Every generated JCW implements the Java
-[`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java)
-hooks `monodroidAddReference` and `monodroidClearReferences`. Managed
-[`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs)
-tracks add/peek/remove/finalize operations, and the GC bridge coordinates
-the two collectors. Local and global JNI references have different
-lifetimes: a managed wrapper may need a global reference to keep its
-peer accessible after a JNI call returns. `JniHandleOwnership` records
-whether an incoming reference is transferred. Calling `Dispose()` can
-remove the association; a raw `IntPtr` retained afterward is not a
-safe substitute for a live managed peer. For invalid reference
-diagnostics, see
-[Debugging JNI Object Reference Crashes](debug-jni-objrefs.md).
+A Java-side constructor and a managed-side constructor do not allocate one shared object. Generated JCW constructors call `super(...)` and, when the actual Java class matches the wrapper, a generated `nctor_*` callback to activate the matching managed peer. This class check matters when a JCW is further subclassed. For some startup types registration is deferred as described above. The generator produces the appropriate constructor shape from its scan; compare [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) and its [constructor tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs).
+
+On the managed side, [`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs) uses generated mapping attributes to resolve a Java class and target type. Its [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs) can create the managed object from a handle without late-bound `Activator.CreateInstance`; activation also accounts for an existing replaceable peer. [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs) resolves names/types, while [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs) checks for registered peers and handles construction/ownership.
+
+Every generated JCW implements the Java [`IGCUserPeer`](../../../src/java-runtime/java/mono/android/IGCUserPeer.java) hooks `monodroidAddReference` and `monodroidClearReferences`. Managed [`JavaMarshalRegisteredPeers`](../../../src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs) tracks add/peek/remove/finalize operations, and the GC bridge coordinates the two collectors. Local and global JNI references have different lifetimes: a managed wrapper may need a global reference to keep its peer accessible after a JNI call returns. `JniHandleOwnership` records whether an incoming reference is transferred. Calling `Dispose()` can remove the association; a raw `IntPtr` retained afterward is not a safe substitute for a live managed peer. For invalid reference diagnostics, see [Debugging JNI Object Reference Crashes](debug-jni-objrefs.md).
 
 ## Diagnosing a broken interop path
 
-Start at the boundary where the failure occurs; these files distinguish
-build output, registration, and peer activation:
-
-1. **Missing or wrong Java class:** inspect the merged manifest,
-   `typemap/java/` (or CoreCLR's `typemap/linked-java/` after
-   trimming), `java-files.txt` / `linked-java-files.txt`, and
-   `acw-map.txt`. Confirm the expected Java name and base/override
-   signatures. A stale `.class` is not proof that a corresponding
-   TypeMap entry survived.
-2. **Unbound native method / `UnsatisfiedLinkError`:** compare the
-   generated JCW's `native` method **name and JNI descriptor** with
-   its generated proxy registration. Check whether
-   `mono.android.Runtime.registerNatives` ran for the class (or its
-   deferred helper did), and inspect `adb logcat` for the registration
-   exception. Do not search for a missing `Java_...` export in this
-   pipeline.
-3. **Wrong managed type or activation failure:** check
-   `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps`
-   assembly, `TrimmableTypeMap` lookup, proxy construction, and
-   `JavaMarshalRegisteredPeers`. Verify whether a Java callback came
-   from a managed-created peer or needs activation from a Java-created
-   peer. On NativeAOT a missing generated mapping cannot be rescued
-   by CoreCLR-only reflection.
-4. **Release/trim-only failure:** inspect the *linked* managed
-   assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and
-   shrinker rules. The pre-trim generated Java is not necessarily
-   packaged Java. The
-   [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md)
-   explains target stamps and stale-file handling.
-5. **JNI reference or marshal failure:** use `adb logcat` and
-   [the JNI reference guide](debug-jni-objrefs.md) for ownership and
-   collection problems. For unsupported TypeMap settings see
-   [the build property](../../docs-mobile/building-apps/build-properties.md);
-   duplicate Java-visible constructor signatures produce
-   [XA4259](../../docs-mobile/messages/xa4259.md).
-
-The [TypeMap generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs),
-[JCW tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs),
-and [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs)
-exercise these paths. Compare their expected names/signatures against
-the generated DLL and Java files before changing runtime registration.
+Start at the boundary where the failure occurs; these files distinguish build output, registration, and peer activation:
+
+1. **Missing or wrong Java class:** inspect the merged manifest, `typemap/java/` (or CoreCLR's `typemap/linked-java/` after trimming), `java-files.txt` / `linked-java-files.txt`, and `acw-map.txt`. Confirm the expected Java name and base/override signatures. A stale `.class` is not proof that a corresponding TypeMap entry survived.
+2. **Unbound native method / `UnsatisfiedLinkError`:** compare the generated JCW's `native` method **name and JNI descriptor** with its generated proxy registration. Check whether `mono.android.Runtime.registerNatives` ran for the class (or its deferred helper did), and inspect `adb logcat` for the registration exception. Do not search for a missing `Java_...` export in this pipeline.
+3. **Wrong managed type or activation failure:** check `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps` assembly, `TrimmableTypeMap` lookup, proxy construction, and `JavaMarshalRegisteredPeers`. Verify whether a Java callback came from a managed-created peer or needs activation from a Java-created peer. On NativeAOT a missing generated mapping cannot be rescued by CoreCLR-only reflection.
+4. **Release/trim-only failure:** inspect the *linked* managed assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and shrinker rules. The pre-trim generated Java is not necessarily packaged Java. The [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md) explains target stamps and stale-file handling.
+5. **JNI reference or marshal failure:** use `adb logcat` and [the JNI reference guide](debug-jni-objrefs.md) for ownership and collection problems. For unsupported TypeMap settings see [the build property](../../docs-mobile/building-apps/build-properties.md); duplicate Java-visible constructor signatures produce [XA4259](../../docs-mobile/messages/xa4259.md).
+
+The [TypeMap generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs), [JCW tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs), and [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs) exercise these paths. Compare their expected names/signatures against the generated DLL and Java files before changing runtime registration.

From 857ae8977ef77f3fecd24823ba4678e52c7c1e35 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 23 Sep 2026 09:49:39 +0200
Subject: [PATCH 48/58] Document unsupported explicit Java type registration

Clarify the trimmable TypeMap behavior after the parent runtime review fix.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 10d9b25ef4d..0984361b13d 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -200,6 +200,8 @@ Every generated JCW implements the Java [`IGCUserPeer`](../../../src/java-runtim
 
 Start at the boundary where the failure occurs; these files distinguish build output, registration, and peer activation:
 
+[`Java.Interop.TypeManager.RegisterType`](../../../src/Mono.Android/Java.Interop/TypeManager.cs) is not a fallback for a missing generated mapping: it throws `NotSupportedException` with the trimmable TypeMap. Give the peer a discoverable Java name (`[Register]` for a peer type, or the component `Name` attribute used above) so the scanner can generate the mapping instead.
+
 1. **Missing or wrong Java class:** inspect the merged manifest, `typemap/java/` (or CoreCLR's `typemap/linked-java/` after trimming), `java-files.txt` / `linked-java-files.txt`, and `acw-map.txt`. Confirm the expected Java name and base/override signatures. A stale `.class` is not proof that a corresponding TypeMap entry survived.
 2. **Unbound native method / `UnsatisfiedLinkError`:** compare the generated JCW's `native` method **name and JNI descriptor** with its generated proxy registration. Check whether `mono.android.Runtime.registerNatives` ran for the class (or its deferred helper did), and inspect `adb logcat` for the registration exception. Do not search for a missing `Java_...` export in this pipeline.
 3. **Wrong managed type or activation failure:** check `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps` assembly, `TrimmableTypeMap` lookup, proxy construction, and `JavaMarshalRegisteredPeers`. Verify whether a Java callback came from a managed-created peer or needs activation from a Java-created peer. On NativeAOT a missing generated mapping cannot be rescued by CoreCLR-only reflection.

From 751696dcef912262f8e6b13b808038165ba50594 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 24 Sep 2026 14:28:07 +0200
Subject: [PATCH 49/58] Document app-generated platform JCWs

Clarify that trimmable app builds generate platform wrappers rather than using a prebuilt reference-pack jar, alongside the selected runtime support jar.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 0984361b13d..25601fccb2c 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -80,6 +80,8 @@ The main outputs are:
 | `typemap/typemap-assemblies.txt`, `java-files.txt`, `acw-map.txt` | Lists of actual generated assemblies/Java sources and Java-to-managed class mappings for the build. |
 | `android/src/net/dot/android/ApplicationRegistration.java`, merged `AndroidManifest.xml` | Generated application/instrumentation registration and manifest output. The former is built from scan results, **not** copied from a handwritten template. |
 
+The app build also generates needed **platform JCWs** from framework inputs alongside user JCWs: for example, the [build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs) check for `typemap/java/android/app/ActivityTracker.java` and its `Runtime.registerNatives` call. The [reference pack](../../../build-tools/create-packs/Microsoft.Android.Ref.proj) no longer ships prebuilt `mono.android.jar` or `mono.android.dex`. The handwritten Java runtime support instead comes from `java_runtime_trimmable.jar`, selected by [`_CollectRuntimeJarFilenames`](../../../src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets); this is not a jar of pre-generated platform JCWs. `ApplicationRegistration.java` is generated separately during the app build.
+
 Each per-assembly TypeMap contains assembly-level mapping attributes: a key such as `my/app/MainActivity`, a proxy type, and, for a trimmable mapping, the managed target type. The root references the per-assembly maps via `TypeMapAssemblyTargetAttribute<T>`. The emitter writes **IL and metadata**, not `.cs` files; the C# in the sections below is an explanatory translation of emitted code, not a file that a developer should edit. See [`TypeMapAssemblyGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs), [`TypeMapAssemblyEmitter.EmitTypeMapAttribute`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs), and the [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md).
 
 For the example Activity, think of a mapping like this **conceptual C#**:

From 6d470c9c6bafc04f6d448c0a1235c0787a822f29 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 08:41:45 +0200
Subject: [PATCH 50/58] Point JNI interop guide at current generator sources

Preserve the post-test-removal link corrections when replaying the guide on main.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index 25601fccb2c..cedc870673c 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -40,9 +40,9 @@ namespace MyApp
 }
 ```
 
-The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI signature `(Landroid/os/Bundle;)V`. The app override need not repeat `[Register]`: the scanner follows the registered base method through the override. The [scanner test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs) include both an explicitly registered `MainActivity` and an unannotated `UserActivity` override.
+The binding for `Activity.OnCreate` carries the Java name `onCreate` and JNI signature `(Landroid/os/Bundle;)V`. The app override need not repeat `[Register]`: the [scanner](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs) follows the registered base method through the override.
 
-The corresponding JCW is roughly the following Java. This excerpt omits constructor and peer-reference code; its class name, registration call, override, and native callback name match the [JCW generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs):
+The corresponding JCW is roughly the following Java. This excerpt omits constructor and peer-reference code; its class name, registration call, override, and native callback follow the [JCW generator](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs):
 
 ```java
 package my.app;
@@ -177,9 +177,9 @@ public bool HandleClick (Android.Views.View view, int action)
 }
 ```
 
-This is the shape exercised by the [export fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs). The Java wrapper has a `native` declaration with its calculated JNI signature; the generated managed dispatcher, not the developer's C# method directly, is the unmanaged entrypoint.
+The [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs) exercise generated `[Export]` methods. The Java wrapper has a `native` declaration with its calculated JNI signature; the generated managed dispatcher, not the developer's C# method directly, is the unmanaged entrypoint.
 
-JNI signatures are **not** CLR method signatures. JNI `Z` is an eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and `Landroid/os/Bundle;` a Java object reference. The emitted entrypoint uses JNI ABI types (a `byte` for a boolean); conversions such as `jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C# `bool`. For normal registered callbacks the generator uses the captured original callback signature where available: older bindings may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`. It must not assume that the callback signature is identical to the Java descriptor; see the scanner's [callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs) and [test fixtures](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs). No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
+JNI signatures are **not** CLR method signatures. JNI `Z` is an eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and `Landroid/os/Bundle;` a Java object reference. The emitted entrypoint uses JNI ABI types (a `byte` for a boolean); conversions such as `jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C# `bool`. For normal registered callbacks the generator uses the captured original callback signature where available: older bindings may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`. It must not assume that the callback signature is identical to the Java descriptor; see the scanner's [callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs). No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
 
 Both generated forwarders and direct dispatchers use a marshal-method frame: `BeginMarshalMethod`, a `try` around the managed call, exception handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in `finally`. An arbitrary managed exception is not simply allowed to escape across an unmanaged JNI boundary. Compare [`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) with the [`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
 
@@ -192,7 +192,7 @@ The call sequence for a Java `onCreate(Bundle)` is therefore:
 
 ## Peer activation and lifetime
 
-A Java-side constructor and a managed-side constructor do not allocate one shared object. Generated JCW constructors call `super(...)` and, when the actual Java class matches the wrapper, a generated `nctor_*` callback to activate the matching managed peer. This class check matters when a JCW is further subclassed. For some startup types registration is deferred as described above. The generator produces the appropriate constructor shape from its scan; compare [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) and its [constructor tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs).
+A Java-side constructor and a managed-side constructor do not allocate one shared object. Generated JCW constructors call `super(...)` and, when the actual Java class matches the wrapper, a generated `nctor_*` callback to activate the matching managed peer. This class check matters when a JCW is further subclassed. For some startup types registration is deferred as described above. The [`JcwJavaSourceGenerator`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) emits the appropriate constructor shape from its scan.
 
 On the managed side, [`TrimmableTypeMap`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMap.cs) uses generated mapping attributes to resolve a Java class and target type. Its [`JavaPeerProxy`](../../../src/Mono.Android/Java.Interop/JavaPeerProxy.cs) can create the managed object from a handle without late-bound `Activator.CreateInstance`; activation also accounts for an existing replaceable peer. [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs) resolves names/types, while [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs) checks for registered peers and handles construction/ownership.
 
@@ -210,4 +210,4 @@ Start at the boundary where the failure occurs; these files distinguish build ou
 4. **Release/trim-only failure:** inspect the *linked* managed assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and shrinker rules. The pre-trim generated Java is not necessarily packaged Java. The [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md) explains target stamps and stale-file handling.
 5. **JNI reference or marshal failure:** use `adb logcat` and [the JNI reference guide](debug-jni-objrefs.md) for ownership and collection problems. For unsupported TypeMap settings see [the build property](../../docs-mobile/building-apps/build-properties.md); duplicate Java-visible constructor signatures produce [XA4259](../../docs-mobile/messages/xa4259.md).
 
-The [TypeMap generator tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs), [JCW tests](../../../tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs), and [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs) exercise these paths. Compare their expected names/signatures against the generated DLL and Java files before changing runtime registration.
+The [TypeMap generator](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyGenerator.cs) and [JCW generator](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs) implement these paths; the [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs) cover generated files and packaging. Compare the emitted names/signatures against the generated DLL and Java files before changing runtime registration.

From 222dccfac3ff46c91105d7cc478f88256b49bd38 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 09:08:25 +0200
Subject: [PATCH 51/58] Clarify JNI virtual dispatch and managed registration

Explain that virtual Java dispatch may round-trip into a generated JCW callback and point JNI troubleshooting at managed IAndroidCallableWrapper registrations.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index cedc870673c..b7aca6ef5e4 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -110,7 +110,7 @@ const string id = "reportFullyDrawn.()V";
 _members.InstanceMethods.InvokeVirtualVoidMethod (id, this, null);
 ```
 
-Java.Interop resolves the class and method, invokes JNI with the peer's reference, and converts values/references according to the binding. Other bound methods use `JniArgumentValue` arrays and the appropriate virtual, nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a per-call method dispatch table: it is involved when Java classes and managed peers must be mapped or created, not in place of this invocation.
+Java.Interop resolves the class and method, invokes JNI with the peer's reference, and converts values/references according to the binding. This call enters Java, not a JCW callback directly; Java virtual dispatch can subsequently reach a managed subclass's generated JCW override and call its registered `n_*` method back into managed code. The two directions can therefore form a managed-to-Java-to-managed round trip. Other bound methods use `JniArgumentValue` arrays and the appropriate virtual, nonvirtual, or static `JniPeerMembers` invocation. The TypeMap is not a per-call method dispatch table: it is involved when Java classes and managed peers must be mapped or created, not in place of this invocation.
 
 When JNI returns an object or Java passes one into managed code, [`TrimmableTypeMapTypeManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs) uses the Java name and generated mappings to select a managed target and proxy. [`TrimmableTypeMapValueManager`](../../../src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapValueManager.cs) looks for an existing managed peer or constructs one from the JNI handle. In the reverse direction, the type manager can obtain a JNI type signature for a managed peer type. Do not confuse a bound `Activity` MCW with the `MainActivity` JCW that implements Java-to-managed overrides.
 
@@ -205,7 +205,7 @@ Start at the boundary where the failure occurs; these files distinguish build ou
 [`Java.Interop.TypeManager.RegisterType`](../../../src/Mono.Android/Java.Interop/TypeManager.cs) is not a fallback for a missing generated mapping: it throws `NotSupportedException` with the trimmable TypeMap. Give the peer a discoverable Java name (`[Register]` for a peer type, or the component `Name` attribute used above) so the scanner can generate the mapping instead.
 
 1. **Missing or wrong Java class:** inspect the merged manifest, `typemap/java/` (or CoreCLR's `typemap/linked-java/` after trimming), `java-files.txt` / `linked-java-files.txt`, and `acw-map.txt`. Confirm the expected Java name and base/override signatures. A stale `.class` is not proof that a corresponding TypeMap entry survived.
-2. **Unbound native method / `UnsatisfiedLinkError`:** compare the generated JCW's `native` method **name and JNI descriptor** with its generated proxy registration. Check whether `mono.android.Runtime.registerNatives` ran for the class (or its deferred helper did), and inspect `adb logcat` for the registration exception. Do not search for a missing `Java_...` export in this pipeline.
+2. **Unbound native method / `UnsatisfiedLinkError`:** compare the generated JCW's `native` method **name and JNI descriptor** with the generated managed `IAndroidCallableWrapper.RegisterNatives` entry for that class. Check whether `mono.android.Runtime.registerNatives` ran for the class (or its deferred helper did), and inspect `adb logcat` for the registration exception. Do not search for a missing `Java_...` export in this pipeline.
 3. **Wrong managed type or activation failure:** check `typemap-assemblies.txt`, the root `_Microsoft.Android.TypeMaps` assembly, `TrimmableTypeMap` lookup, proxy construction, and `JavaMarshalRegisteredPeers`. Verify whether a Java callback came from a managed-created peer or needs activation from a Java-created peer. On NativeAOT a missing generated mapping cannot be rescued by CoreCLR-only reflection.
 4. **Release/trim-only failure:** inspect the *linked* managed assemblies and CoreCLR post-trim JCWs, or NativeAOT ILC inputs and shrinker rules. The pre-trim generated Java is not necessarily packaged Java. The [build-pipeline guide](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/README.md) explains target stamps and stale-file handling.
 5. **JNI reference or marshal failure:** use `adb logcat` and [the JNI reference guide](debug-jni-objrefs.md) for ownership and collection problems. For unsupported TypeMap settings see [the build property](../../docs-mobile/building-apps/build-properties.md); duplicate Java-visible constructor signatures produce [XA4259](../../docs-mobile/messages/xa4259.md).

From c39061b34c95d55fadd04f321542305678b0ccc3 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 09:12:10 +0200
Subject: [PATCH 52/58] Remove orphaned native linking generator test

The native runtime linking generator was removed by the LLVM IR rewrite; its standalone test cannot compile after the parent gained it. Keep the remaining JNI and application config coverage.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ...enerateNativeRuntimeLinkingSourcesTests.cs | 91 -------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeRuntimeLinkingSourcesTests.cs

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeRuntimeLinkingSourcesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeRuntimeLinkingSourcesTests.cs
deleted file mode 100644
index 4400508e8c7..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateNativeRuntimeLinkingSourcesTests.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Mono.Cecil;
-using NUnit.Framework;
-using Xamarin.Android.Tasks;
-
-namespace Xamarin.Android.Build.Tests;
-
-[TestFixture]
-public class GenerateNativeRuntimeLinkingSourcesTests : BaseTest
-{
-	[TestCase ("linked")]
-	[TestCase ("R2R")]
-	public void NativeLinkingIgnoresDuplicateNonFrameworkAssemblies (string finalDirectory)
-	{
-		var path = Path.Combine (Root, "temp", TestName);
-		Directory.CreateDirectory (path);
-		try {
-			var arm64Framework = CreateAssembly (Path.Combine (path, "android-arm64", finalDirectory),
-				"Framework", "arm64-v8a", "SystemNative_Arm64", framework: true);
-			var x64Framework = CreateAssembly (Path.Combine (path, "android-x64", finalDirectory),
-				"Framework", "x86_64", "SystemNative_X64", framework: true);
-			var resolvedAssemblies = new List<ITaskItem> { arm64Framework, x64Framework };
-			foreach (var name in new [] { "_Microsoft.Android.TypeMaps", "_Java.Interop.TypeMap" }) {
-				resolvedAssemblies.Add (CreateAssembly (Path.Combine (path, "android-arm64", finalDirectory),
-					name, "arm64-v8a", "SystemNative_FinalTypeMap", framework: false));
-				resolvedAssemblies.Add (CreateAssembly (Path.Combine (path, "android-x64", finalDirectory),
-					name, "x86_64", "SystemNative_FinalTypeMap", framework: false));
-				var preTrim = CreateAssembly (Path.Combine (path, "typemap"), name, "arm64-v8a",
-					"SystemNative_PreTrimTypeMap", framework: false);
-				preTrim.SetMetadata ("_AndroidPreTrimTypeMapCandidate", "true");
-				resolvedAssemblies.Add (preTrim);
-			}
-			var userAssembly = CreateAssembly (Path.Combine (path, "user"), "User", "arm64-v8a",
-				"SystemNative_User", framework: false);
-			userAssembly.RemoveMetadata ("FrameworkAssembly");
-			resolvedAssemblies.Add (userAssembly);
-			resolvedAssemblies.Add (userAssembly);
-			var errors = new List<BuildErrorEventArgs> ();
-			var task = new GenerateNativeRuntimeLinkingSources {
-				BuildEngine = new MockBuildEngine (TestContext.Out, errors),
-				EnvironmentOutputDirectory = path,
-				ResolvedAssemblies = resolvedAssemblies.ToArray (),
-				SupportedAbis = ["arm64-v8a", "x86_64"],
-			};
-
-			Assert.IsTrue (task.Execute (), "Native linking must ignore pre-trim and final typemap duplicates before ABI indexing.");
-			Assert.IsEmpty (errors);
-			var arm64 = File.ReadAllText (Path.Combine (path, "pinvoke_preserve.arm64-v8a.ll"));
-			var x64 = File.ReadAllText (Path.Combine (path, "pinvoke_preserve.x86_64.ll"));
-			StringAssert.Contains ("@SystemNative_Arm64", arm64);
-			StringAssert.DoesNotContain ("@SystemNative_X64", arm64);
-			StringAssert.Contains ("@SystemNative_X64", x64);
-			StringAssert.DoesNotContain ("@SystemNative_Arm64", x64);
-			foreach (var output in new [] { arm64, x64 }) {
-				StringAssert.DoesNotContain ("@SystemNative_FinalTypeMap", output);
-				StringAssert.DoesNotContain ("@SystemNative_PreTrimTypeMap", output);
-				StringAssert.DoesNotContain ("@SystemNative_User", output);
-			}
-			foreach (var abi in task.SupportedAbis)
-				Assert.IsFalse (File.Exists (Path.Combine (path, $"marshal_methods.{abi}.ll")), "Legacy marshal-method stubs must not be generated.");
-		} finally {
-			Directory.Delete (path, recursive: true);
-		}
-	}
-
-	static TaskItem CreateAssembly (string directory, string name, string abi, string entryPoint, bool framework)
-	{
-		Directory.CreateDirectory (directory);
-		var path = Path.Combine (directory, $"{name}.dll");
-		using var assembly = AssemblyDefinition.CreateAssembly (
-			new AssemblyNameDefinition (name, new Version (1, 0)), name, ModuleKind.Dll);
-		var module = assembly.MainModule;
-		var nativeModule = new ModuleReference ("System.Native");
-		module.ModuleReferences.Add (nativeModule);
-		var type = new TypeDefinition ("Example", "NativeMethods", TypeAttributes.Public, module.TypeSystem.Object);
-		type.Methods.Add (new MethodDefinition ("Invoke", MethodAttributes.Public | MethodAttributes.Static | MethodAttributes.PInvokeImpl,
-			module.TypeSystem.Void) {
-			PInvokeInfo = new PInvokeInfo (PInvokeAttributes.CallConvCdecl, entryPoint, nativeModule),
-		});
-		module.Types.Add (type);
-		assembly.Write (path);
-		var item = new TaskItem (path);
-		item.SetMetadata ("Abi", abi);
-		item.SetMetadata ("FrameworkAssembly", framework.ToString ());
-		return item;
-	}
-}

From 0f50ebf53fe1c18d0a0d29eaf93d948ce14c10f4 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 11:51:08 +0200
Subject: [PATCH 53/58] Guard nullable JNI remapping method signatures

Handle missing and empty signatures explicitly before accessing their final character, so the build tasks compile with nullable warnings as errors while retaining exact, parameter-only, and wildcard ordering.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Utilities/JniRemappingAssemblyGenerator.cs           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
index da311461c7a..30e96a8a531 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
@@ -199,8 +199,13 @@ static List<MethodType> SortMethods (List<JniRemappingMethodReplacement> input)
 			return result;
 		}
 
-		static int SignatureSpecificity (string? signature) =>
-			string.IsNullOrEmpty (signature) ? 2 : signature [signature.Length - 1] == ')' ? 1 : 0;
+		static int SignatureSpecificity (string? signature)
+		{
+			if (signature == null || signature.Length == 0) {
+				return 2;
+			}
+			return signature [signature.Length - 1] == ')' ? 1 : 0;
+		}
 
 		static List<FieldType> SortFields (List<JniRemappingFieldReplacement> input)
 		{

From 9a1e0400545b6adbb63a35ad9481143c56883fec Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 12:02:35 +0200
Subject: [PATCH 54/58] Root Android runtime tests before NativeAOT ILC

The NativeAOT build skips ILLink, so adding the test assemblies only before ILLink leaves ILC without their NUnit fixtures. Root them before WriteIlcRspFileForCompilation as well.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Mono.Android-Tests/Mono.Android.NET-Tests.csproj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index 722deb4563d..9859174d2c4 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -95,7 +95,7 @@
 
   <!-- NUnit discovers these tests by reflection even when the type map default is set late. -->
   <Target Name="_AndroidRootRuntimeTests"
-      BeforeTargets="PrepareForILLink;_RunILLink">
+      BeforeTargets="PrepareForILLink;_RunILLink;WriteIlcRspFileForCompilation">
     <ItemGroup>
       <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="All" />
       <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="All" />

From 9893d8dd5a0c70d11d09361659cc6df501283add Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 13:23:31 +0200
Subject: [PATCH 55/58] Correct JNI registration and callback-frame
 documentation

Clarify that Runtime.register was removed and distinguish normal callback forwarders from direct export and constructor transition frames.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/guides/internals/JavaJNI_Interop.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/guides/internals/JavaJNI_Interop.md b/Documentation/guides/internals/JavaJNI_Interop.md
index b7aca6ef5e4..7df5f171209 100644
--- a/Documentation/guides/internals/JavaJNI_Interop.md
+++ b/Documentation/guides/internals/JavaJNI_Interop.md
@@ -124,7 +124,7 @@ There is no concatenated `__md_methods` string and no `Runtime.register("managed
 
 ### Runtime startup and registration handshake
 
-On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures the VM at `JNI_OnLoad`, initializes the managed runtime from `Runtime.initInternal`, and enters [`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs). That installs `TrimmableTypeMapTypeManager` and `TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls `TrimmableTypeMap.RegisterNativeMethods()`. The old native `Runtime.register` entrypoint remains a compatibility stub, **not** the mechanism that registers every JCW.
+On CoreCLR, the [native host](../../../src/native/clr/host/host.cc) captures the VM at `JNI_OnLoad`, initializes the managed runtime from `Runtime.initInternal`, and enters [`JNIEnvInit.Initialize`](../../../src/Mono.Android/Android.Runtime/JNIEnvInit.cs). That installs `TrimmableTypeMapTypeManager` and `TrimmableTypeMapValueManager` in `AndroidRuntime`, then calls `TrimmableTypeMap.RegisterNativeMethods()`. The old Java `Runtime.register` declaration and its native entrypoint have been removed; each JCW now uses its generated managed `IAndroidCallableWrapper.RegisterNatives` implementation.
 
 NativeAOT has its own entry: [`JavaInteropRuntime.JNI_OnLoad` and `init`](../../../src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs) initialize the native host and a [`JreRuntime`](../../../src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs), then call `JNIEnvInit.InitializeNativeAotRuntime()`. That path also registers the `TrimmableTypeMap` callback. NativeAOT cannot rely on CoreCLR's optional reflection-based peer construction path when a generated mapping is absent. Its generated `ApplicationRegistration.registerApplications()` calls `Runtime.registerNatives` for deferred startup types; the [`NativeAotRuntimeProvider`](../../../src/Xamarin.Android.Build.Tasks/Resources/NativeAotRuntimeProvider.java) invokes it after `JavaInteropRuntime.init(...)`.
 
@@ -181,7 +181,7 @@ The [application build tests](../../../src/Xamarin.Android.Build.Tasks/Tests/Xam
 
 JNI signatures are **not** CLR method signatures. JNI `Z` is an eight-bit `jboolean`, `C` a 16-bit `jchar`, `I` a 32-bit `jint`, and `Landroid/os/Bundle;` a Java object reference. The emitted entrypoint uses JNI ABI types (a `byte` for a boolean); conversions such as `jniValue != 0` and `managedResult ? (byte) 1 : (byte) 0` bridge C# `bool`. For normal registered callbacks the generator uses the captured original callback signature where available: older bindings may declare `bool`/`char` while newer ones can use `sbyte`/`ushort`. It must not assume that the callback signature is identical to the Java descriptor; see the scanner's [callback signature handling](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs). No assembly rewriter is needed to insert separate `_mm_wrapper` methods.
 
-Both generated forwarders and direct dispatchers use a marshal-method frame: `BeginMarshalMethod`, a `try` around the managed call, exception handoff to `OnUserUnhandledException`, and `EndMarshalMethod` in `finally`. An arbitrary managed exception is not simply allowed to escape across an unmanaged JNI boundary. Compare [`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) with the [`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs).
+The generated entrypoint handles exceptions differently depending on the callback. A normal `[Register]` forwarder waits for GC bridge processing, calls the bound `n_*` callback in a `try`, and sends caught exceptions to `AndroidEnvironmentInternal.UnhandledException`; [`EmitUcoForwarderBody`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs) does **not** create a `BeginMarshalMethod`/`EndMarshalMethod` frame. Modern bound callbacks can establish that JNI transition inside [`JniMarshal.SafeInvoke`](../../../external/Java.Interop/src/Java.Interop/Java.Interop/JniMarshal.SafeInvoke.cs) or [`JniMarshalTyped`](../../../src/Mono.Android/Java.Interop/JniMarshalTyped.cs). Generated direct `[Export]` dispatchers and constructor entrypoints instead call `BeginMarshalMethod`, pass caught exceptions to `JniRuntime.OnUserUnhandledException`, and call `EndMarshalMethod` in `finally`; see [`ExportMethodDispatchEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ExportMethodDispatchEmitter.cs) and the generated constructor body in [`TypeMapAssemblyEmitter`](../../../src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/TypeMapAssemblyEmitter.cs). Inspect the callback kind to find the owner of JNI transition and exception handling.
 
 The call sequence for a Java `onCreate(Bundle)` is therefore:
 

From 24ea425b965b86d95a321839d953e6ea96d43c2d Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 21:15:13 +0200
Subject: [PATCH 56/58] Drop JVM-only Java.Interop test runs

Retain the main branch test-library trimmer root while rooting NUnit assemblies at ILLink and NativeAOT input collection time.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../skills/tests/references/test-catalog.md   |   3 +-
 .../automation/azure-pipelines-internal.yaml  |  12 -
 .../automation/azure-pipelines-public.yaml    |  14 -
 build-tools/automation/azure-pipelines.yaml   |  11 -
 .../stage-java-interop-tests.yaml             | 131 ---
 .../Java.Interop-Tests.csproj                 |   7 -
 .../CallVirtualFromConstructorBase.cs         |  55 --
 .../CallVirtualFromConstructorDerived.cs      | 101 ---
 .../InvokeVirtualFromConstructorTests.cs      | 156 ----
 .../Java.Interop/JavaManagedGCBridgeTests.cs  |  69 --
 .../Java.Interop/JavaObjectArrayTest.cs       |  36 -
 .../Java.Interop/JavaObjectTest.cs            |  13 +-
 .../JavaPeerableExtensionsTests.cs            |   4 -
 .../Java.Interop/JavaVMFixture.cs             |  32 -
 .../Java.Interop/JniInstanceMethodIDTest.cs   |  41 -
 .../Java.Interop/JniPeerMembersTests.cs       | 170 ----
 .../JniRuntime.JniTypeManagerTests.cs         | 116 ---
 .../JniRuntime.JniValueManagerTests.cs        | 149 ----
 .../JniRuntimeJniValueManagerContract.cs      | 535 ------------
 .../Java.Interop/JniRuntimeTest.cs            |  53 --
 .../Java.Interop/JniTypeManagerTests.cs       |  12 -
 .../JniValueMarshalerAttributeTests.cs        |  53 +-
 .../JniValueMarshalerContractTests.cs         | 770 ------------------
 .../Java.Interop/MethodBindingTests.cs        |  79 --
 .../Java.Interop/TestTypeTests.cs             |   1 -
 .../jni/test/AnotherJavaInterfaceImpl.java    |  13 -
 .../test/CallVirtualFromConstructorBase.java  |  38 -
 .../CallVirtualFromConstructorDerived.java    |  47 --
 .../dot/jni/test/CrossReferenceBridge.java    |  32 -
 .../net/dot/jni/test/RenameClassBase1.java    |  39 -
 .../net/dot/jni/test/RenameClassBase2.java    |  45 -
 .../net/dot/jni/test/RenameClassDerived.java  |  45 -
 .../Xamarin.Android.JcwGen-Tests.csproj       |  11 +-
 .../Java.Interop-Tests.NET.csproj             |  18 -
 .../Mono.Android.NET-Tests.csproj             |  16 +-
 .../Mono.Android-Tests/Remaps.xml             |   9 -
 .../TestInstrumentation.cs                    |   3 -
 37 files changed, 74 insertions(+), 2865 deletions(-)
 delete mode 100644 build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java
 delete mode 100644 external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java

diff --git a/.github/skills/tests/references/test-catalog.md b/.github/skills/tests/references/test-catalog.md
index b06734e5171..d285a8a6dbc 100644
--- a/.github/skills/tests/references/test-catalog.md
+++ b/.github/skills/tests/references/test-catalog.md
@@ -145,8 +145,7 @@ Device: **Yes**
 
 The `Mono.Android.NET-Tests.csproj` dynamically excludes categories based on runtime:
 - **CoreCLR runtime**: Excludes `CoreCLRIgnore`, `NTLM`
-- **NativeAOT runtime**: Excludes `NativeAOTIgnore`, `SSL`, `NTLM`; excludes `Export` only when the trimmable typemap is off
-- **Trimmable typemap**: Excludes `NativeTypeMap`, `TrimmableTypeMapUnsupported`
+- **NativeAOT runtime**: Excludes `NativeAOTIgnore`, `SSL`, `NTLM`
 
 Other categories: `SSL`, `InetAccess`, `JavaList`, `RuntimeConfig`, `Intune`, `NTLM`
 
diff --git a/build-tools/automation/azure-pipelines-internal.yaml b/build-tools/automation/azure-pipelines-internal.yaml
index 6f82b742a19..ecb7330fa23 100644
--- a/build-tools/automation/azure-pipelines-internal.yaml
+++ b/build-tools/automation/azure-pipelines-internal.yaml
@@ -820,18 +820,6 @@ extends:
           parameters:
             condition: true
 
-    # Java.Interop Tests Stage
-    - template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
-      parameters:
-        windowsPool:
-          name: $(NetCoreInternalPoolName)
-          image: $(WindowsPoolImageNetCoreInternal)
-          os: windows
-        macPool:
-          name: Azure Pipelines
-          vmImage: $(HostedMacImage)
-          os: macOS
-
     # MAUI Tests Stage
     - stage: maui_tests
       displayName: MAUI Tests
diff --git a/build-tools/automation/azure-pipelines-public.yaml b/build-tools/automation/azure-pipelines-public.yaml
index 472a887718f..551e4c27fb1 100644
--- a/build-tools/automation/azure-pipelines-public.yaml
+++ b/build-tools/automation/azure-pipelines-public.yaml
@@ -432,20 +432,6 @@ stages:
       parameters:
         condition: true
 
-# Java.Interop Tests Stage
-- template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
-  parameters:
-    windowsPool:
-      name: $(NetCorePublicPoolName)
-      demands:
-      - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
-      os: windows
-    macPool:
-      name: AcesShared
-      demands:
-      - ImageOverride -equals ACES_VM_SharedPool_Tahoe
-      os: macOS
-
 # Android Tools Tests Stage
 - template: /build-tools/automation/yaml-templates/stage-xamarin-android-tools-tests.yaml@self
   parameters:
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 14ff7856d3b..14bec27e024 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -106,17 +106,6 @@ extends:
       parameters:
         usesCleanImages: ${{ parameters.macTestAgentsUseCleanImages }}
 
-    - template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
-      parameters:
-        # The internal Xamarin.Android pipeline uses 1ES Pipeline Templates, which
-        # require Windows jobs to run on a 1ES-hosted pool. macOS is fine on the
-        # hosted Azure Pipelines pool as long as `os: macOS` is set (which is now
-        # the template default).
-        windowsPool:
-          name: MAUI-1ESPT
-          image: $(WindowsPoolImage1ESPT)
-          os: windows
-
     - template: /build-tools/automation/yaml-templates/stage-xamarin-android-tools-tests.yaml@self
       parameters:
         use1ESTemplate: true
diff --git a/build-tools/automation/yaml-templates/stage-java-interop-tests.yaml b/build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
deleted file mode 100644
index 92aff51cf19..00000000000
--- a/build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-# Java.Interop tests stage
-#
-# Mirrors the two jobs from
-# external/Java.Interop/build-tools/automation/azure-pipelines.yaml
-# (windows_dotnet_build, mac_dotnet_build) so that the Java.Interop
-# build + tests continue to run as part of dotnet/android CI now that
-# Java.Interop has been merged in-tree.
-#
-# Referenced from both:
-#   - build-tools/automation/azure-pipelines.yaml         (official / 1ES)
-#   - build-tools/automation/azure-pipelines-public.yaml  (public PR validation)
-
-parameters:
-- name: stageName
-  type: string
-  default: java_interop_tests
-- name: dependsOn
-  type: object
-  default: []
-- name: condition
-  type: string
-  default: succeeded()
-- name: windowsPool
-  type: object
-  # NOTE: This default is a Microsoft-hosted Azure Pipelines pool, which is NOT
-  # allowed by 1ES Pipeline Templates in Official mode. Callers that extend the
-  # 1ES Official template (e.g. build-tools/automation/azure-pipelines.yaml) must
-  # override this with a 1ES-hosted pool like `MAUI-1ESPT`.
-  default:
-    name: Azure Pipelines
-    vmImage: $(HostedWinImage)
-    os: windows
-- name: macPool
-  type: object
-  default:
-    name: Azure Pipelines
-    vmImage: $(HostedMacImage)
-    os: macOS
-
-stages:
-- stage: ${{ parameters.stageName }}
-  displayName: Java.Interop Tests
-  dependsOn: ${{ parameters.dependsOn }}
-  condition: ${{ parameters.condition }}
-  variables:
-    # Variables consumed by external/Java.Interop/build-tools/automation/templates/*.yaml.
-    # Defined at stage scope so they don't conflict with dotnet/android-wide
-    # variables (e.g. DotNetTargetFramework=net11.0).
-    DotNetCoreVersion: $(DotNetSdkVersion).x
-    DotNetTargetFramework: $(DotNetStableTargetFramework)
-    NetCoreTargetFrameworkPathSuffix: -$(DotNetStableTargetFramework)
-    Build.Configuration: Release
-    RunningOnCI: true
-    # Cap the JDK that external/Java.Interop's Prepare.targets picks when it
-    # calls the JdkInfo bootstrap task. Recent hosted agent images ship Java 25
-    # as the default JDK, and Gradle 8.12 (used by java-source-utils and the
-    # Bytecode-Tests kotlin-gradle project) crashes with "Unsupported class
-    # file major version 69" on it. JdkInfo reads JI_MAX_JDK from the env.
-    JI_MAX_JDK: 21
-  jobs:
-
-  # Check - "Xamarin.Android (Java.Interop Tests Windows - .NET)"
-  - job: java_interop_windows_dotnet_build
-    displayName: Windows - .NET
-    pool: ${{ parameters.windowsPool }}
-    timeoutInMinutes: 60
-    workspace:
-      clean: all
-    steps:
-    - checkout: self
-      submodules: recursive
-      clean: true
-
-    - template: /external/Java.Interop/build-tools/automation/templates/install-dependencies.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-build.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-tests.yaml@self
-      parameters:
-        runNativeDotnetTests: true
-        nativeAotRid: win-x64
-        platformName: .NET - Windows
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-dirty-tree.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-issue.yaml@self
-
-  # Check - "Xamarin.Android (Java.Interop Tests Mac - .NET)"
-  - job: java_interop_mac_dotnet_build
-    displayName: Mac - .NET
-    pool: ${{ parameters.macPool }}
-    timeoutInMinutes: 20
-    workspace:
-      clean: all
-    steps:
-    - checkout: self
-      submodules: recursive
-      clean: true
-
-    - bash: |
-        set -e
-        if ! command -v cmake >/dev/null 2>&1 ; then
-          brew install cmake
-        fi
-      displayName: Ensure cmake is installed
-
-    # The hosted macOS pool architecture can change between Intel (osx-x64) and
-    # Apple Silicon (osx-arm64), so detect it at runtime and publish/run the
-    # NativeAOT sample for the matching RID. Otherwise the produced .dylib fails
-    # to dlopen with an "incompatible architecture" error.
-    - bash: |
-        if [ "$(Agent.OSArchitecture)" = "ARM64" ]; then
-          echo "##vso[task.setvariable variable=NativeAOTRid]osx-arm64"
-        else
-          echo "##vso[task.setvariable variable=NativeAOTRid]osx-x64"
-        fi
-      displayName: Determine NativeAOT RID
-
-    - template: /external/Java.Interop/build-tools/automation/templates/install-dependencies.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-build.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/core-tests.yaml@self
-      parameters:
-        runNativeTests: true
-        nativeAotRid: $(NativeAOTRid)
-        platformName: .NET - MacOS
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-dirty-tree.yaml@self
-
-    - template: /external/Java.Interop/build-tools/automation/templates/fail-on-issue.yaml@self
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
index 7df4b7ff57c..5743ebeedf9 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
@@ -31,23 +31,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\AnotherJavaInterfaceImpl.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CrossReferenceBridge.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualBase.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived2.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\FieldRemapBase.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\FieldRemapDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\FieldRemapRenamedBase.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallVirtualFromConstructorBase.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallVirtualFromConstructorDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\GetThis.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\JavaInterface.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\MyJavaInterfaceImpl.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\ObjectHelper.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassBase1.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassBase2.java" />
-    <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassDerived.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\AndroidInterface.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\DesugarAndroidInterface$_CC.java" />
     <JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RegisterNativesTestType.java" />
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
deleted file mode 100644
index ce298734b93..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-
-using Java.Interop;
-namespace Java.InteropTests {
-
-	[JniTypeSignature (CallVirtualFromConstructorBase.JniTypeName, GenerateJavaPeer=false)]
-	public class CallVirtualFromConstructorBase : JavaObject {
-
-		internal    const   string          JniTypeName = "net/dot/jni/test/CallVirtualFromConstructorBase";
-		readonly    static  JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (CallVirtualFromConstructorBase));
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		public unsafe CallVirtualFromConstructorBase (int value)
-			: this (value, useNewObject: false)
-		{
-		}
-
-		public unsafe CallVirtualFromConstructorBase (int value, bool useNewObject)
-			: this (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			if (PeerReference.IsValid)
-				return;
-
-			const string __id = "(I)V";
-
-			if (useNewObject) {
-				var ctors   = JniPeerMembers.InstanceMethods.GetConstructorsForType (GetType ());
-				var init    = ctors.GetConstructor (__id);
-
-				JniArgumentValue* __args = stackalloc JniArgumentValue [1];
-				__args [0] = new JniArgumentValue (value);
-				var lref = JniEnvironment.Object.NewObject (ctors.JniPeerType.PeerReference, init, __args);
-				Construct (ref lref, JniObjectReferenceOptions.CopyAndDispose);
-				return;
-			}
-			var peer    = JniPeerMembers.InstanceMethods.StartGenericCreateInstance (__id, GetType (), value);
-			Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
-			JniPeerMembers.InstanceMethods.FinishGenericCreateInstance (__id, this, value);
-		}
-
-		public CallVirtualFromConstructorBase (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (ref reference, options)
-		{
-		}
-
-		public virtual void CalledFromConstructor (int value)
-		{
-			_members.InstanceMethods.InvokeGenericVirtualVoidMethod ("calledFromConstructor.(I)V", this, value);
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
deleted file mode 100644
index 739b85e08c9..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-#nullable enable
-
-using System;
-using System.Runtime.CompilerServices;
-
-using Java.Interop;
-
-namespace Java.InteropTests
-{
-	[JniTypeSignature (CallVirtualFromConstructorDerived.JniTypeName, GenerateJavaPeer=false)]
-	public class CallVirtualFromConstructorDerived : CallVirtualFromConstructorBase {
-		new internal    const   string          JniTypeName = "net/dot/jni/test/CallVirtualFromConstructorDerived";
-		static  readonly        JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (CallVirtualFromConstructorDerived));
-
-		[JniAddNativeMethodRegistrationAttribute]
-		static void RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
-		{
-			args.Registrations.Add (new JniNativeMethodRegistration ("calledFromConstructor", "(I)V", (CalledFromConstructorMarshalMethod)CalledFromConstructorHandler));
-		}
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		int calledValue;
-
-		public  bool    InvokedConstructor;
-
-		public CallVirtualFromConstructorDerived (int value)
-			: this (value, useNewObject: false)
-		{
-		}
-
-		public CallVirtualFromConstructorDerived (int value, bool useNewObject)
-			: base (value, useNewObject)
-		{
-			InvokedConstructor = true;
-
-			if (useNewObject && calledValue != 0) {
-				// calledValue was set on a *different* instance! So it's 0 here.
-				throw new ArgumentException (
-						string.Format ("value '{0}' doesn't match expected value '{1}'.", value, 0),
-						"value");
-			}
-			if (!useNewObject && value != calledValue)
-				throw new ArgumentException (
-						string.Format ("value '{0}' doesn't match expected value '{1}'.", value, calledValue),
-						"value");
-		}
-
-		public  bool    InvokedActivationConstructor;
-
-		public  static  CallVirtualFromConstructorDerived?  Intermediate_FromCalledFromConstructor;
-		public  static  CallVirtualFromConstructorDerived?  Intermediate_FromActivationConstructor;
-
-		public CallVirtualFromConstructorDerived (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (ref reference, options)
-		{
-			InvokedActivationConstructor    = true;
-
-			Intermediate_FromActivationConstructor  = this;
-		}
-
-		public bool Called;
-
-		public override void CalledFromConstructor (int value)
-		{
-			Called      = true;
-			calledValue = value;
-
-			Intermediate_FromCalledFromConstructor  = this;
-		}
-
-		public static unsafe CallVirtualFromConstructorDerived NewInstance (int value)
-		{
-			JniArgumentValue* args = stackalloc JniArgumentValue [1];
-			args [0]    = new JniArgumentValue (value);
-			var o       = _members.StaticMethods.InvokeObjectMethod ("newInstance.(I)Lnet/dot/jni/test/CallVirtualFromConstructorDerived;", args);
-			return JniEnvironment.Runtime.ValueManager.GetValue<CallVirtualFromConstructorDerived> (ref o, JniObjectReferenceOptions.CopyAndDispose)!;
-		}
-
-		delegate void CalledFromConstructorMarshalMethod (IntPtr jnienv, IntPtr n_self, int value);
-		static void CalledFromConstructorHandler (IntPtr jnienv, IntPtr n_self, int value)
-		{
-			var envp = new JniTransition (jnienv);
-			try {
-				var r_self  = new JniObjectReference (n_self);
-				var self    = JniEnvironment.Runtime.ValueManager.GetValue<CallVirtualFromConstructorDerived>(ref r_self, JniObjectReferenceOptions.Copy)!;
-				self.CalledFromConstructor (value);
-				self.DisposeUnlessReferenced ();
-			}
-			catch (Exception e) when (JniEnvironment.Runtime.ExceptionShouldTransitionToJni (e)) {
-				envp.SetPendingException (e);
-			}
-			finally {
-				envp.Dispose ();
-			}
-		}
-	}
-}
-
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
deleted file mode 100644
index 949f1902997..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
-#if !__ANDROID__
-	// We want stability around the CallVirtualFromConstructorDerived static fields
-	[NonParallelizable]
-#endif  // !__ANDROID__
-	public class InvokeVirtualFromConstructorTests : JavaVMFixture
-	{
-		[Test]
-		[Category ("NativeAOTIgnore")] // https://github.com/dotnet/android/issues/10950
-		public void CreateManagedInstanceFirst_WithAllocObject ()
-		{
-			CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor    = null;
-			CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor    = null;
-
-			using var t = new CallVirtualFromConstructorDerived (42);
-			Assert.IsTrue (
-					t.Called,
-					"CalledFromConstructor method override should have been called.");
-			Assert.IsFalse (
-					t.InvokedActivationConstructor,
-					"Activation Constructor should have been called, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.IsTrue (
-					t.InvokedConstructor,
-					"(int) constructor should have been called, via ManagedPeer.construct().");
-
-			var registered      = JniRuntime.CurrentRuntime.ValueManager.PeekValue (t.PeerReference);
-			var acIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor;
-			var cfIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor;
-
-			Assert.AreSame (t, registered,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"registered={RuntimeHelpers.GetHashCode (registered).ToString ("x")}");
-			Assert.IsNull (acIntermediate,
-					"Activation Constructor should not have been called, because of AllocObject semantics");
-			Assert.AreSame (t, cfIntermediate,
-					"Expected t and cfIntermediate to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor);
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor);
-		}
-
-		static void Dispose<T> (ref T peer)
-			where T : class, IJavaPeerable
-		{
-			if (peer == null)
-				return;
-
-			peer.Dispose ();
-			peer = null;
-		}
-
-		[Test]
-		[Category ("NativeAOTIgnore")] // https://github.com/dotnet/android/issues/10950
-		public void CreateManagedInstanceFirst_WithNewObject ()
-		{
-			CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor    = null;
-			CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor    = null;
-
-			using var t = new CallVirtualFromConstructorDerived (42, useNewObject: true);
-			Assert.IsFalse (
-					t.Called,
-					"CalledFromConstructor method override was called on a different instance.");
-			Assert.IsFalse (
-					t.InvokedActivationConstructor,
-					"Activation Constructor should not have been called, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.IsTrue (
-					t.InvokedConstructor,
-					"(int) constructor should have been called, via ManagedPeer.construct().");
-
-			var registered      = JniRuntime.CurrentRuntime.ValueManager.PeekValue (t.PeerReference);
-			var acIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor;
-			var cfIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor;
-
-			Assert.AreSame (t, registered,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"registered={RuntimeHelpers.GetHashCode (registered).ToString ("x")}");
-			Assert.IsNotNull (acIntermediate,
-					"Activation Constructor should have been called, because of NewObject");
-			Assert.IsTrue (
-					acIntermediate.Called,
-					"CalledFromConstructor method override should have been called on acIntermediate.");
-			Assert.IsTrue (
-					acIntermediate.InvokedActivationConstructor,
-					"Activation Constructor should have been called on intermediate instance, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.AreNotSame (t, acIntermediate,
-					"Expected t and registered to be different instances; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"acIntermediate={RuntimeHelpers.GetHashCode (acIntermediate).ToString ("x")}");
-			Assert.AreNotSame (t, cfIntermediate,
-					"Expected t and cfIntermediate to be different instances; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-			Assert.AreSame (acIntermediate, cfIntermediate,
-					"Expected acIntermediate and cfIntermediate to be the same instance; " +
-					$"acIntermediate={RuntimeHelpers.GetHashCode (acIntermediate).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor);
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor);
-		}
-
-		[Test]
-		[Category ("NativeAOTIgnore")] // https://github.com/dotnet/android/issues/10950
-		public void CreateJavaInstanceFirst ()
-		{
-			CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor    = null;
-			CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor    = null;
-
-			using var t = CallVirtualFromConstructorDerived.NewInstance (42);
-
-			Assert.IsTrue (
-					t.Called,
-					"CalledFromConstructor method override should have been called.");
-			Assert.IsTrue (
-					t.InvokedActivationConstructor,
-					"Activation Constructor should have been called, as calledFromConstructor() is invoked before ManagedPeer.construct().");
-			Assert.IsTrue (
-					t.InvokedConstructor,
-					"(int) constructor should have been called, via ManagedPeer.construct().");
-
-			var registered      = JniRuntime.CurrentRuntime.ValueManager.PeekValue (t.PeerReference);
-			var acIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor;
-			var cfIntermediate  = CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor;
-
-			Assert.AreSame (t, registered,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"registered={RuntimeHelpers.GetHashCode (registered).ToString ("x")}");
-			Assert.AreSame (t, acIntermediate,
-					"Expected t and registered to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"acIntermediate={RuntimeHelpers.GetHashCode (acIntermediate).ToString ("x")}");
-			Assert.AreSame (t, cfIntermediate,
-					"Expected t and cfIntermediate to be the same instance; " +
-					$"t={RuntimeHelpers.GetHashCode (t).ToString ("x")}, " +
-					$"cfIntermediate={RuntimeHelpers.GetHashCode (cfIntermediate).ToString ("x")}");
-
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromActivationConstructor);
-			Dispose (ref CallVirtualFromConstructorDerived.Intermediate_FromCalledFromConstructor);
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
deleted file mode 100644
index 79b64ef2fd5..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
-	public class JavaManagedGCBridgeTests : JavaVMFixture {
-
-#if !NO_GC_BRIDGE_SUPPORT
-		// https://github.com/mono/mono/blob/98d2314/mono/tests/sgen-bridge-xref.cs
-		[Test]
-		public void CrossReferences ()
-		{
-			using (var array = new JavaObjectArray<CrossReferenceBridge> (2)) {
-				WeakReference<CrossReferenceBridge> root = null, child = null;
-				var t = new Thread (() => SetupLinks (array, out root, out child));
-				t.Start ();
-				t.Join ();
-
-				JniEnvironment.Runtime.ValueManager.CollectPeers ();
-				CrossReferenceBridge a, b;
-				a = b = null;
-				Console.WriteLine ("try get A {0}", root.TryGetTarget (out a));
-				Console.WriteLine ("try get B {0}", child.TryGetTarget (out b));
-				Console.WriteLine ("a is null {0}", a == null);
-				Console.WriteLine ("b is null {0}", b == null);
-
-				Assert.IsNotNull (a);
-				Assert.IsNotNull (b);
-			}
-		}
-#endif  // !NO_GC_BRIDGE_SUPPORT
-
-		static void SetupLinks (JavaObjectArray<CrossReferenceBridge> array, out WeakReference<CrossReferenceBridge> root, out WeakReference<CrossReferenceBridge> child)
-		{
-			var a = new CrossReferenceBridge () {
-				id      = "bridge",
-			};
-			var b = new CrossReferenceBridge () {
-				id      = "child",
-			};
-			a.link.Add (b);
-
-			array [0] = a;
-			array [1] = b;
-
-			root    = new WeakReference<CrossReferenceBridge> (a, true);
-			child   = new WeakReference<CrossReferenceBridge> (b, true);
-		}
-	}
-
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	public class CrossReferenceBridge : JavaObject {
-		internal    const    string         JniTypeName = "net/dot/jni/test/CrossReferenceBridge";
-
-		public  string          id;
-		public  List<object>    link        = new List<object> ();
-
-		protected override void Dispose (bool disposing)
-		{
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
index e5d2bc2fa98..c352abdf3f5 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
@@ -165,40 +165,4 @@ public void ObjectArrayType ()
 		}
 	}
 
-	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
-	public class JavaObjectArray_object_ContractTest : JavaObjectArrayContractTest<object> {
-		static  readonly    object  a   = new object ();
-
-		protected override object CreateValueA () {return a;}
-		protected override object CreateValueB () {return 42;}
-
-		int grefStartCount;
-
-		[OneTimeSetUp]
-		public void BeginCheckGlobalRefCount ()
-		{
-			// So that the JavaProxyObject.TypeRef GREF isn't counted.
-			using (var o = new JavaObjectArray<object> (1))
-				o [0] = a;
-			grefStartCount  = JniEnvironment.Runtime.GlobalReferenceCount;
-		}
-
-		[OneTimeTearDown]
-		public void EndCheckGlobalRefCount ()
-		{
-			int gref    = JniEnvironment.Runtime.GlobalReferenceCount;
-			Assert.IsTrue (gref <= (grefStartCount),
-					string.Format ("JNI global references: grefStartCount={0}; gref={1}", grefStartCount, gref));
-			JniEnvironment.Runtime.ValueManager.CollectPeers ();
-		}
-
-		[Test]
-		public void ObjectArrayType ()
-		{
-			var c = CreateCollection (new object[0]);
-			Assert.AreEqual ("[Ljava/lang/Object;", ((IJavaPeerable) c).GetJniTypeName ());
-			Dispose (c);
-		}
-	}
 }
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
index 1d308fc945a..49bd8b16dd0 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
@@ -187,13 +187,7 @@ public void Ctor_Exceptions ()
 
 #if __ANDROID__
 			Assert.Throws<Java.Lang.ClassNotFoundException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
-#else   // !__ANDROID__
-			// Note: `JavaObjectWithNoJavaPeer` creation works on Android because tooling provides all
-			// typemap entries.  On desktop, we use the hardcoded dictionary in JavaVMFixture, which
-   			// deliberately *lacks* an  entry for `JavaObjectWithNoJavaPeer`.
-			Assert.Throws<NotSupportedException> (() => new JavaObjectWithNoJavaPeer ());
-			Assert.Throws<JavaException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
-#endif  // !__ANDROID__
+#endif  // __ANDROID__
 		}
 
 		[Test]
@@ -224,11 +218,6 @@ public void DisposeAccessesThis ()
 		}
 	}
 
-#if !__ANDROID__
-	class JavaObjectWithNoJavaPeer : JavaObject {
-	}
-#endif  // !__ANDROID__
-
 	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	class JavaObjectWithMissingJavaPeer : JavaObject {
 		internal    const   string  JniTypeName = "__this__/__type__/__had__/__better__/__not__/__Exist__";
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs
index 48e6580cd8c..367a8e050cd 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaPeerableExtensionsTests.cs
@@ -23,10 +23,6 @@ public void JavaAs_Exceptions ()
 		using var o = new JavaObject (ref r, JniObjectReferenceOptions.Copy);
 		// MyJavaInterfaceImpl doesn't provide an activation constructor
 		Assert.Throws<NotSupportedException>(() => o.JavaAs<MyJavaInterfaceImpl>());
-#if !__ANDROID__
-		// JavaObjectWithNoJavaPeer has no Java peer
-		Assert.Throws<ArgumentException>(() => v.JavaAs<JavaObjectWithNoJavaPeer>());
-#endif  // !__ANDROID__
 	}
 
 	[Test]
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
index 356468bb39a..801f7cc8dc7 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Threading;
 
 using Java.Interop;
 
@@ -48,12 +47,6 @@ enum ReplacementMethodStorage {
 			[TestType.JniTypeName]              = typeof (TestType),
 #endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 			[GenericHolder<int>.JniTypeName]    = typeof (GenericHolder<>),
-			[RenameClassBase.JniTypeName]       = typeof (RenameClassBase),
-			[RenameClassDerived.JniTypeName]    = typeof (RenameClassDerived),
-			[AnotherJavaInterfaceImpl.JniTypeName]          = typeof (AnotherJavaInterfaceImpl),
-			[CallVirtualFromConstructorBase.JniTypeName]    = typeof (CallVirtualFromConstructorBase),
-			[CallVirtualFromConstructorDerived.JniTypeName] = typeof (CallVirtualFromConstructorDerived),
-			[CrossReferenceBridge.JniTypeName]              = typeof (CrossReferenceBridge),
 			[GetThis.JniTypeName]                           = typeof (GetThis),
 			[IAndroidInterface.JniTypeName]                 = typeof (IAndroidInterface),
 			[IJavaInterface.JniTypeName]                    = typeof (IJavaInterface),
@@ -115,10 +108,8 @@ IEnumerable<string> CreateSimpleReferencesEnumerator (Type type)
 			}
 		}
 
-		public string? RequestedFallbackTypesForSimpleReference;
 		protected override IReadOnlyList<string>? GetStaticMethodFallbackTypesCore (string jniSimpleReference)
 		{
-			RequestedFallbackTypesForSimpleReference = jniSimpleReference;
 			Debug.WriteLine ($"# GetStaticMethodFallbackTypes (jniSimpleReference={jniSimpleReference})");
 
 			var slash       = jniSimpleReference.LastIndexOf ('/');
@@ -136,29 +127,12 @@ IEnumerable<string> CreateSimpleReferencesEnumerator (Type type)
 		}
 
 		Dictionary<string, string> ReplacmentTypes = new() {
-			["net/dot/jni/test/RenameClassBase1"] = "net/dot/jni/test/RenameClassBase2",
 			[FieldRemapBase.JniTypeName] = FieldRemapBase.RuntimeJniTypeName,
 			[FieldRemapBase.RuntimeJniTypeName] = FieldRemapBase.FinalJniTypeName,
 		};
 
-		string? trackedReplacementType;
-		int replacementTypeStringLookupCount;
-		int replacementTypeUtf8LookupCount;
-
-		public void TrackReplacementTypeLookups (string jniSimpleReference)
-		{
-			trackedReplacementType = jniSimpleReference;
-			replacementTypeStringLookupCount = 0;
-			replacementTypeUtf8LookupCount = 0;
-		}
-
-		public (int String, int Utf8) GetReplacementTypeLookupCounts ()
-			=> (replacementTypeStringLookupCount, replacementTypeUtf8LookupCount);
-
 		protected override string? GetReplacementTypeCore (string jniSimpleReference)
 		{
-			if (jniSimpleReference == trackedReplacementType)
-				Interlocked.Increment (ref replacementTypeStringLookupCount);
 			return ReplacmentTypes.TryGetValue (jniSimpleReference, out var value)
 				? value
 				: null;
@@ -166,8 +140,6 @@ public void TrackReplacementTypeLookups (string jniSimpleReference)
 
 		protected override void GetReplacementTypeInfoCore (string jniSimpleReference, out string? replacement, out IntPtr replacementUtf8)
 		{
-			if (jniSimpleReference == trackedReplacementType)
-				Interlocked.Increment (ref replacementTypeUtf8LookupCount);
 			replacement = null;
 			replacementUtf8 = ReplacmentTypes.TryGetValue (jniSimpleReference, out var value)
 				? GetUtf8Value (value)
@@ -181,10 +153,6 @@ protected override void GetReplacementTypeInfoCore (string jniSimpleReference, o
 			[("java/lang/Object",                       "remappedStaticAbs",                   "(I)I")]                    = ("java/lang/Math", "abs", null, null, false, ReplacementMethodStorage.Strings),
 			[("java/lang/Runtime",                      "remappedToGetRuntime",                null)]                      = (null, "getRuntime", null, null, false, ReplacementMethodStorage.Strings),
 
-			// NOTE: key must use *post-renamed* value, not pre-renamed value
-			// NOTE: SourceSignature lacking return type; "closer in spirit" to what `remapping-config.json` allows
-			[("net/dot/jni/test/RenameClassBase2",   "hashCode",                            "()")]                      = ("net/dot/jni/test/RenameClassBase2", "myNewHashCode", null, null, false, ReplacementMethodStorage.TypeUtf8 | ReplacementMethodStorage.MethodUtf8),
-
 			// Renamed parameter types: the target descriptor is pinned explicitly, which is what
 			// `target-method-signature` carries.
 			[("java/lang/StringBuilder",   "<init>",   "(Lnet/dot/jni/test/RenamedInt;)V")]     = (null, "<init>", "(I)V", null, false, ReplacementMethodStorage.Strings),
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
deleted file mode 100644
index bce118ca8e7..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests
-{
-	[TestFixture]
-	public class JniInstanceMethodIDTest : JavaVMFixture
-	{
-		// https://code.google.com/p/android/issues/detail?id=65710
-		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
-		public unsafe void CallNonvirtualVoidMethod_WithBaseMethodIDAndDerivedType ()
-		{
-			using (var b = new JniType ("net/dot/jni/test/CallNonvirtualBase"))
-			using (var d = new JniType ("net/dot/jni/test/CallNonvirtualDerived")) {
-				var m = b.GetInstanceMethod ("method", "()V");
-				var f = b.GetInstanceField ("methodInvoked", "Z");
-
-				var c = d.GetConstructor ("()V");
-				var g = d.GetInstanceField ("methodInvoked", "Z");
-				var o = d.NewObject (c, null);
-				try {
-					if (JavaVMFixture.CallNonvirtualVoidMethodSupportsDeclaringClassMismatch) {
-						JniEnvironment.InstanceMethods.CallNonvirtualVoidMethod (o, d.PeerReference, m);
-						Assert.IsFalse (JniEnvironment.InstanceFields.GetBooleanField (o, f));
-						Assert.IsTrue (JniEnvironment.InstanceFields.GetBooleanField (o, g));
-					} else {
-						JniEnvironment.InstanceMethods.CallNonvirtualVoidMethod (o, d.PeerReference, m);
-						Assert.IsTrue (JniEnvironment.InstanceFields.GetBooleanField (o, f));
-						Assert.IsFalse (JniEnvironment.InstanceFields.GetBooleanField (o, g));
-					}
-				} finally {
-					JniObjectReference.Dispose (ref o);
-				}
-			}
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
index 83490b0c6e5..ad1f4ffd85c 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
@@ -18,62 +18,6 @@ public void Ctor_CanReferenceNonexistentType ()
 			JniPeerMembers.Dispose (members);
 		}
 
-#if !ANDROID    // Android doesn't allow providing a custom TypeManager
-		[Test]
-		[NonParallelizable]
-		public void HandledReplacementTypeMissDoesNotUseStringFallback ()
-		{
-			var typeManager = JavaVMFixture.TypeManager;
-			Assert.IsNotNull (typeManager);
-			typeManager.TrackReplacementTypeLookups ("java/lang/Double");
-			try {
-				var members = new JniPeerMembers ("java/lang/Double", typeof (MyString));
-				JniPeerMembers.Dispose (members);
-
-				var counts = typeManager.GetReplacementTypeLookupCounts ();
-				Assert.AreEqual (1, counts.Utf8);
-				Assert.AreEqual (0, counts.String);
-			} finally {
-				typeManager.TrackReplacementTypeLookups ("");
-			}
-		}
-#endif  // !ANDROID
-
-		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
-		public void VirtualInvokeOnBaseInvokesMostDerivedJavaMethod ()
-		{
-			Assert.IsNull (GetInstanceMethods (MyString._members.InstanceMethods));
-			using (var s = new MyString ("hello!")) {
-				var registered = GetInstanceMethods (MyString._members.InstanceMethods);
-				Assert.AreEqual (1, registered.Count);  // for the constructor
-				Assert.AreEqual ("hello!", s.ToString ());
-				Assert.AreEqual (1, registered.Count);
-			}
-		}
-
-		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
-		public void ConcurrentFirstUsePublishesSingleInstanceMethodCache ()
-		{
-			var members = new JniPeerMembers (MyString.JniTypeName, typeof (MyString));
-			try {
-				var methods = members.InstanceMethods;
-				var constructors = new JniMethodInfo [16];
-
-				Assert.IsNull (GetInstanceMethods (methods));
-				Parallel.For (0, constructors.Length, i => constructors [i] = methods.GetConstructor ("()V"));
-
-				var registered = GetInstanceMethods (methods);
-				Assert.AreEqual (1, registered.Count);
-				foreach (var constructor in constructors)
-					Assert.AreSame (constructors [0], constructor);
-				Assert.AreSame (registered ["()V"], constructors [0]);
-			} finally {
-				JniPeerMembers.Dispose (members);
-			}
-		}
-
 		[Test]
 		public void PeerMemberCachesAreInitiallyNull ()
 		{
@@ -225,10 +169,6 @@ public void MethodLookupForNonexistentStaticMethodWillTryFallbacks ()
 				//   --- End of managed Java.Lang.NoSuchMethodError stack trace ---
 				// ```
 				Assert.IsTrue (e.Message.Contains ("doesNotExist", StringComparison.Ordinal));
-#if !ANDROID    // Android doesn't allow providing a custom TypeManager
-				Assert.AreEqual ("java/lang/Runtime",
-						JavaVMFixture.TypeManager.RequestedFallbackTypesForSimpleReference);
-#endif  // !ANDROID
 			}
 		}
 
@@ -505,16 +445,6 @@ public void ReplacementMethodUsesTargetSignature ()
 		}
 #endif  // !__ANDROID__
 
-		[Test]
-		[Category ("NativeAOTIgnore")]
-		[Category ("TrimmableTypeMapUnsupported")]
-		public void ReplacementTypeUsedForMethodLookup ()
-		{
-			using var o = new RenameClassDerived ();
-			int r = o.hashCode();
-			Assert.AreEqual (33, r);
-		}
-
 		[Test]
 		[Category ("NativeAOTIgnore")]
 		public void ReplaceInstanceMethodName ()
@@ -552,54 +482,6 @@ public void ReplaceInstanceMethodWithStaticMethod ()
 			o.remappedToStaticHashCode ();
 		}
 
-#if !__ANDROID__
-		// Note: this test looks up a static method from one class, then
-		// calls `JNIEnv::CallStaticObjectMethod()` passing in a jclass
-		// for a *different* class.
-		//
-		// This appears to work on Desktop JVM.
-		//
-		// On Android, this will ABORT the app:
-		//  JNI DETECTED ERROR IN APPLICATION: can't call static int com.xamarin.interop.DesugarAndroidInterface$_CC.getClassName() with class java.lang.Class<com.xamarin.interop.AndroidInterface>
-		//      in call to CallStaticObjectMethodA
-		//
-		// This *also* aborts on JDK-17 + macOS + arm64:
-		//  FATAL ERROR in native method: Wrong object class or methodID passed to JNI call
-		//  Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-		//  V  [libjvm.dylib+0x4f718c]  jniCheck::validate_call(JavaThread*, _jclass*, _jmethodID*, _jobject*)+0x98
-		//  V  [libjvm.dylib+0x506474]  checked_jni_CallStaticObjectMethodA+0x150
-		//  C  [native JNI wrapper]  java_interop_jnienv_call_static_object_method_a+0x48
-		//  C  0x000000010798a8d8
-		//  C  0x000000010798a540
-		//  C  0x000000010798fa94
-		//  C  [libcoreclr.dylib+0x2db774]  CallDescrWorkerInternal+0x84
-		//  C  [libcoreclr.dylib+0x150db4]  CallDescrWorkerWithHandler(CallDescrData*, int)+0x74
-		//  C  [libcoreclr.dylib+0x1f92d0]  RuntimeMethodHandle::InvokeMethod(Object*, void**, SignatureNative*, bool)+0x79c
-		//  C  0x0000000104020ce4
-		//  …
-		//
-		// *Fascinating* the differences that can appear between JVM implementations
-		[Test]
-		public unsafe void DoesTheJmethodNeedToMatchDeclaringType ()
-		{
-			if (Environment.GetEnvironmentVariable ("CPUTYPE") is string cpu && cpu == "arm64") {
-				Assert.Ignore ("nope!");
-			}
-			if (VM.JdkInfo.Version is Version v && v >= new Version (17, 0)) {
-				// JDK-17 now crashes on this test as well:
-				// FATAL ERROR in native method: Wrong object class or methodID passed to JNI call
-				Assert.Ignore ("nope!");
-			}
-			var iface   = new JniType ("net/dot/jni/test/AndroidInterface");
-			var desugar = new JniType ("net/dot/jni/test/DesugarAndroidInterface$_CC");
-			var m       = desugar.GetStaticMethod ("getClassName", "()Ljava/lang/String;");
-
-			var r = JniEnvironment.StaticMethods.CallStaticObjectMethod (iface.PeerReference, m, null);
-			var s = JniEnvironment.Strings.ToString (ref r, JniObjectReferenceOptions.CopyAndDispose);
-			Assert.AreEqual ("DesugarAndroidInterface$-CC", s);
-		}
-#endif  // !__ANDROID__
-
 		[Test]
 		public void DesugarInterfaceStaticMethod ()
 		{
@@ -613,27 +495,6 @@ abstract class JavaLangSystemTestObject : JavaObject {
 		internal const string JniTypeName = "java/lang/System";
 	}
 
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	class MyString : JavaObject {
-		internal    const   string      JniTypeName = "java/lang/String";
-
-		internal    static  readonly    JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (MyString));
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		public unsafe MyString (string value)
-			: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			const   string  id  = "(Ljava/lang/String;)V";
-			var peer = _members.InstanceMethods.StartGenericCreateInstance (id, GetType (), value);
-			Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
-			_members.InstanceMethods.FinishGenericCreateInstance (id, this, value);
-		}
-	}
-
-
 	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	class JavaLangRemappingTestObject : JavaObject {
 		internal    const    string         JniTypeName = "java/lang/Object";
@@ -730,37 +591,6 @@ public static unsafe void doesNotExist ()
 		}
 	}
 
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	class RenameClassBase : JavaObject {
-		internal    const       string          JniTypeName    = "net/dot/jni/test/RenameClassBase1";
-		static      readonly    JniPeerMembers  _members        = new JniPeerMembers (JniTypeName, typeof (RenameClassBase));
-
-		public      override    JniPeerMembers  JniPeerMembers  => _members;
-
-		public RenameClassBase ()
-		{
-		}
-
-		public virtual unsafe int hashCode ()
-		{
-			const string id = "hashCode.()I";
-			return _members.InstanceMethods.InvokeVirtualInt32Method (id, this, null);
-		}
-	}
-
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	class RenameClassDerived : RenameClassBase {
-		internal    new     const       string          JniTypeName    = "net/dot/jni/test/RenameClassDerived";
-		public RenameClassDerived ()
-		{
-		}
-
-		public override unsafe int hashCode ()
-		{
-			return base.hashCode ();
-		}
-	}
-
 	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	interface IAndroidInterface : IJavaPeerable {
 		internal            const       string          JniTypeName    = "net/dot/jni/test/AndroidInterface";
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
deleted file mode 100644
index f2dd684a8dd..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniTypeManagerTests.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[TestFixture]
-	public class JniRuntimeJniTypeManagerTests : JavaVMFixture {
-
-		[Test]
-		public void ReplacementMethodInfoToStringConvertsUtf8Pointers ()
-		{
-			var type = Marshal.StringToCoTaskMemUTF8 ("java/lang/Object");
-			var name = Marshal.StringToCoTaskMemUTF8 ("toString");
-			var signature = Marshal.StringToCoTaskMemUTF8 ("()Ljava/lang/String;");
-			try {
-				var info = new JniRuntime.ReplacementMethodInfo {
-					TargetJniTypeUtf8            = type,
-					TargetJniMethodNameUtf8      = name,
-					TargetJniMethodSignatureUtf8 = signature,
-				};
-
-				var value = info.ToString ();
-
-				Assert.That (value, Does.Contain ("TargetJniTypeUtf8 = \"java/lang/Object\""));
-				Assert.That (value, Does.Contain ("TargetJniMethodNameUtf8 = \"toString\""));
-				Assert.That (value, Does.Contain ("TargetJniMethodSignatureUtf8 = \"()Ljava/lang/String;\""));
-			} finally {
-				Marshal.ZeroFreeCoTaskMemUTF8 (type);
-				Marshal.ZeroFreeCoTaskMemUTF8 (name);
-				Marshal.ZeroFreeCoTaskMemUTF8 (signature);
-			}
-		}
-
-		[Test]
-		public void ReplacementTypeInfoSupportsStringAndUtf8Results ()
-		{
-			using var stringManager = new StringReplacementTypeManager ();
-			stringManager.GetReplacementTypeInfo ("java/lang/String", out var stringReplacement, out var stringReplacementUtf8);
-			Assert.AreEqual ("java/lang/Object", stringReplacement);
-			Assert.AreEqual (IntPtr.Zero, stringReplacementUtf8);
-			Assert.AreEqual (1, stringManager.LookupCount);
-
-			var utf8Value = Marshal.StringToCoTaskMemUTF8 ("java/lang/Object");
-			try {
-				using var utf8Manager = new Utf8ReplacementTypeManager (utf8Value);
-				utf8Manager.GetReplacementTypeInfo ("java/lang/Double", out var missingReplacement, out var missingReplacementUtf8);
-				Assert.IsNull (missingReplacement);
-				Assert.AreEqual (IntPtr.Zero, missingReplacementUtf8);
-				utf8Manager.GetReplacementTypeInfo ("java/lang/String", out var replacement, out var replacementUtf8);
-				Assert.IsNull (replacement);
-				Assert.AreEqual (utf8Value, replacementUtf8);
-				Assert.AreEqual ("java/lang/Object", utf8Manager.GetReplacementType ("java/lang/String"));
-			} finally {
-				Marshal.ZeroFreeCoTaskMemUTF8 (utf8Value);
-			}
-		}
-
-		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
-		[RequiresDynamicCode ("This test uses ReflectionJniTypeManager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("This test uses ReflectionJniTypeManager, which is reflection-based and not trimming-compatible.")]
-		public void GetInvokerType ()
-		{
-			using (var vm  = new MyTypeManager ()) {
-				// Concrete type; no invoker
-				Assert.IsNull (vm.GetInvokerType (typeof (JavaObject)));
-
-				// Not a bound abstract Java type; no invoker
-				Assert.IsNull (vm.GetInvokerType (typeof (System.ICloneable)));
-
-				// Bound abstract Java type; has an invoker
-				Assert.AreSame (typeof (IJavaInterfaceInvoker), vm.GetInvokerType (typeof (IJavaInterface)));
-			}
-		}
-
-		[RequiresDynamicCode ("MyTypeManager uses ReflectionJniTypeManager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("MyTypeManager uses ReflectionJniTypeManager, which is reflection-based and not trimming-compatible.")]
-		class MyTypeManager : JniRuntime.ReflectionJniTypeManager {
-			public MyTypeManager ()
-			{
-			}
-		}
-
-		class StringReplacementTypeManager : JniRuntime.JniTypeManager {
-
-			public int LookupCount { get; private set; }
-
-			protected override string GetReplacementTypeCore (string jniSimpleReference)
-			{
-				LookupCount++;
-				return jniSimpleReference == "java/lang/String" ? "java/lang/Object" : null;
-			}
-		}
-
-		class Utf8ReplacementTypeManager : JniRuntime.JniTypeManager {
-
-			readonly IntPtr replacement;
-
-			public Utf8ReplacementTypeManager (IntPtr replacement)
-			{
-				this.replacement = replacement;
-			}
-
-			protected override void GetReplacementTypeInfoCore (string jniSimpleReference, out string replacement, out IntPtr replacementUtf8)
-			{
-				replacement = jniSimpleReference == "java/lang/String" ? "ignored/string/value" : null;
-				replacementUtf8 = jniSimpleReference == "java/lang/String" ? this.replacement : IntPtr.Zero;
-			}
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
deleted file mode 100644
index a712105d7be..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Collections.Generic;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[TestFixture]
-	public class JniRuntimeJniValueManagerTests : JavaVMFixture {
-
-		[Test]
-		public void CreateValue ()
-		{
-			using (var vm  = new MyValueManager ())
-			using (var o = new JavaObject ()) {
-				vm.OnSetRuntime (JniRuntime.CurrentRuntime);
-
-				var r = o.PeerReference;
-				var x = (IJavaPeerable) vm.CreateValue (ref r, JniObjectReferenceOptions.Copy);
-				Assert.AreNotSame (o, x);
-				x.Dispose ();
-
-				x = vm.CreateValue<IJavaPeerable> (ref r, JniObjectReferenceOptions.Copy);
-				Assert.AreNotSame (o, x);
-				x.Dispose ();
-			}
-		}
-
-		[UnconditionalSuppressMessage ("AOT", "IL3050", Justification = "MyValueManager intentionally uses reflection-backed value manager behavior for tests.")]
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "MyValueManager intentionally uses reflection-backed value manager behavior for tests.")]
-		class MyValueManager : JniRuntime.ReflectionJniValueManager {
-
-			public override void WaitForGCBridgeProcessing ()
-			{
-			}
-
-			public override void CollectPeers ()
-			{
-			}
-
-			public override void AddPeer (IJavaPeerable reference)
-			{
-			}
-
-			public override void RemovePeer (IJavaPeerable reference)
-			{
-			}
-
-			public override void FinalizePeer (IJavaPeerable reference)
-			{
-			}
-
-			public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
-			{
-				return null;
-			}
-
-			public override IJavaPeerable PeekPeer (JniObjectReference reference)
-			{
-				return null;
-			}
-
-		}
-
-		[Test]
-		public void GetValue_ReturnsAlias ()
-		{
-			var local   = new JavaObject ();
-			local.UnregisterFromRuntime ();
-			Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.PeekValue (local.PeerReference));
-			// GetObject must always return a value (unless handle is null, etc.).
-			// However, since we called local.UnregisterFromRuntime(),
-			// JniRuntime.PeekObject() is null (asserted above), but GetObject() must
-			// **still** return _something_.
-			// In this case, it returns an _alias_.
-			// TODO: "most derived type" alias generation. (Not relevant here, but...)
-			var p       = local.PeerReference;
-			var alias   = JniRuntime.CurrentRuntime.ValueManager.GetValue<IJavaPeerable> (ref p, JniObjectReferenceOptions.Copy);
-			Assert.AreNotSame (local, alias);
-			alias.Dispose ();
-			local.Dispose ();
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithNullHandle ()
-		{
-			var r = new JniObjectReference ();
-			var o = JniRuntime.CurrentRuntime.ValueManager.GetValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsNull (o);
-		}
-
-		[Test]
-		public void PeekValue ()
-		{
-			JniObjectReference lref;
-			using (var o = new JavaObject ()) {
-				lref = o.PeerReference.NewLocalRef ();
-				Assert.AreSame (o, JniRuntime.CurrentRuntime.ValueManager.PeekValue (lref));
-			}
-			// At this point, the Java-side object is kept alive by `lref`,
-			// but the wrapper instance has been disposed, and thus should
-			// be unregistered, and thus unfindable.
-			Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.PeekValue (lref));
-			JniObjectReference.Dispose (ref lref);
-		}
-
-		public void PeekValue_BoxedObjects ()
-		{
-			var vm          = JniRuntime.CurrentRuntime.ValueManager;
-			var marshaler   = vm.GetValueMarshaler<object> ();
-			var ad          = AppDomain.CurrentDomain;
-
-			var proxy       = marshaler.CreateGenericArgumentState (ad);
-			Assert.AreSame (ad, vm.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ad, ref proxy);
-
-			var ex  = new InvalidOperationException ("boo!");
-			proxy   = marshaler.CreateGenericArgumentState (ex);
-			Assert.AreSame (ex, vm.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ex, ref proxy);
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithInvalidSafeHandle ()
-		{
-			var invalid = new JniObjectReference ();
-			Assert.IsNull (JniRuntime.CurrentRuntime.ValueManager.GetValue (ref invalid, JniObjectReferenceOptions.CopyAndDispose));
-		}
-
-#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-		[Test]
-		public unsafe void GetValue_FindBestMatchType ()
-		{
-			using (var t = new JniType (TestType.JniTypeName)) {
-				var c = t.GetConstructor ("()V");
-				var o = t.NewObject (c, null);
-				using (var w = JniRuntime.CurrentRuntime.ValueManager.GetValue<IJavaPeerable> (ref o, JniObjectReferenceOptions.CopyAndDispose)) {
-					Assert.AreEqual (typeof (TestType), w.GetType ());
-					Assert.IsTrue (((TestType) w).ExecutedActivationConstructor);
-				}
-			}
-		}
-#endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
deleted file mode 100644
index a3343de62a0..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeJniValueManagerContract.cs
+++ /dev/null
@@ -1,535 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Threading;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	// Android doesn't support `[NonParallelizable]`, but runs tests sequentially by default.
-#if !__ANDROID__
-	// Modifies JniRuntime.valueManager instance field; can't be done in parallel
-	[NonParallelizable]
-#endif  // !__ANDROID__
-	[Category ("TrimmableTypeMapUnsupported")]
-	public abstract class JniRuntimeJniValueManagerContract : JavaVMFixture {
-
-		[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-		protected abstract Type ValueManagerType {
-			get;
-		}
-
-		protected virtual JniRuntime.JniValueManager CreateValueManager ()
-		{
-			var manager = Activator.CreateInstance (ValueManagerType) as JniRuntime.JniValueManager;
-			return manager ?? throw new InvalidOperationException ($"Could not create instance of `{ValueManagerType}`!");
-		}
-
-#pragma warning disable CS8618
-		JniRuntime.JniValueManager  systemManager;
-		JniRuntime.JniValueManager  valueManager;
-#pragma warning restore CS8618
-
-		[SetUp]
-		public void CreateVM ()
-		{
-			systemManager   = JniRuntime.CurrentRuntime.valueManager!;
-			valueManager    = CreateValueManager ();
-			valueManager.OnSetRuntime (JniRuntime.CurrentRuntime);
-			JniRuntime.CurrentRuntime.valueManager  = valueManager;
-		}
-
-		[TearDown]
-		public void DestroyVM ()
-		{
-			JniRuntime.CurrentRuntime.valueManager  = systemManager;
-			systemManager   = null!;
-			valueManager?.Dispose ();
-			valueManager    = null!;
-		}
-
-		[Test]
-		public void AddPeer ()
-		{
-		}
-
-		int GetSurfacedPeersCount ()
-		{
-			return valueManager.GetSurfacedPeers ().Count;
-		}
-
-		[Test]
-		public void AddPeer_NoDuplicates ()
-		{
-			int startPeerCount  = GetSurfacedPeersCount ();
-			using (var v = new MyDisposableObject ()) {
-				// MyDisposableObject ctor implicitly calls AddPeer();
-				Assert.AreEqual (startPeerCount + 1, GetSurfacedPeersCount (), DumpPeers ());
-				valueManager.AddPeer (v);
-				Assert.AreEqual (startPeerCount + 1, GetSurfacedPeersCount (), DumpPeers ());
-			}
-		}
-
-		[Test]
-		public void ConstructPeer_ImplicitViaBindingConstructor_PeerIsInSurfacedPeers ()
-		{
-			int startPeerCount  = GetSurfacedPeersCount ();
-
-			var g               = new GetThis ();
-			var surfaced        = valueManager.GetSurfacedPeers ();
-			Assert.AreEqual (startPeerCount + 1, surfaced.Count);
-
-			var found           = false;
-			foreach (var pr in surfaced) {
-				if (!pr.SurfacedPeer.TryGetTarget (out var p))
-					continue;
-				if (object.ReferenceEquals (g, p)) {
-					found = true;
-				}
-			}
-			Assert.IsTrue (found);
-
-			var localRef        = g.PeerReference.NewLocalRef ();
-			g.Dispose ();
-			Assert.AreEqual (startPeerCount, GetSurfacedPeersCount ());
-			Assert.IsNull (valueManager.PeekPeer (localRef));
-			JniObjectReference.Dispose (ref localRef);
-		}
-
-		[Test]
-		public void ConstructPeer_ImplicitViaBindingMethod_PeerIsInSurfacedPeers ()
-		{
-			int startPeerCount  = GetSurfacedPeersCount ();
-
-			var g               = new GetThis ();
-			var surfaced        = valueManager.GetSurfacedPeers ();
-			Assert.AreEqual (startPeerCount + 1, surfaced.Count);
-
-			var found           = false;
-			foreach (var pr in surfaced) {
-				if (!pr.SurfacedPeer.TryGetTarget (out var p))
-					continue;
-				if (object.ReferenceEquals (g, p)) {
-					found = true;
-				}
-			}
-			Assert.IsTrue (found);
-
-			var localRef        = g.PeerReference.NewLocalRef ();
-			g.Dispose ();
-			Assert.AreEqual (startPeerCount, GetSurfacedPeersCount ());
-			Assert.IsNull (valueManager.PeekPeer (localRef));
-			JniObjectReference.Dispose (ref localRef);
-		}
-
-		// https://github.com/dotnet/android/issues/11101
-		[Test]
-		public void ConstructPeer_CalledMultipleTimes_ShouldNotLeakGlobalRefs ()
-		{
-			// Simulate what TypeManager.Activate does in dotnet/android:
-			// 1. Create an uninitialized JavaObject
-			// 2. Set a peer reference (storing the raw handle)
-			// 3. The constructor chain then calls ConstructPeer multiple times
-			//
-			// This should not leak JNI global references.
-
-			using (var original = new MyDisposableObject ()) {
-				// Get the jobject handle, simulating the IntPtr jobject param in Activate
-				var handle = original.PeerReference;
-
-				// Create an uninitialized peer and set its reference (simulating Activate)
-				var peer = (IJavaPeerable) RuntimeHelpers.GetUninitializedObject (typeof (MyDisposableObject));
-				peer.SetPeerReference (new JniObjectReference (handle.Handle));
-
-				try {
-					// Now simulate the constructor chain calling ConstructPeer multiple times
-					var ref1 = new JniObjectReference (handle.Handle);
-					valueManager.ConstructPeer (peer, ref ref1, JniObjectReferenceOptions.Copy);
-
-					int grefAfterFirst = JniEnvironment.Runtime.GlobalReferenceCount;
-
-					var ref2 = new JniObjectReference (handle.Handle);
-					valueManager.ConstructPeer (peer, ref ref2, JniObjectReferenceOptions.Copy);
-
-					int grefAfterSecond = JniEnvironment.Runtime.GlobalReferenceCount;
-
-					// The second ConstructPeer should NOT create an additional global ref
-					Assert.AreEqual (grefAfterFirst, grefAfterSecond,
-						"Second ConstructPeer call should not create an additional global ref");
-				} finally {
-					peer.Dispose ();
-				}
-			}
-		}
-
-
-		[Test]
-		public void CollectPeers ()
-		{
-			// TODO
-		}
-
-		[Test]
-		public void CreatePeer_InvalidHandleReturnsNull ()
-		{
-			var r = new JniObjectReference ();
-			var o = valueManager.CreatePeer (ref r, JniObjectReferenceOptions.Copy, null);
-			Assert.IsNull (o);
-		}
-
-		[Test]
-		public unsafe void CreatePeer_UsesFallbackType ()
-		{
-			using var t = new JniType (AnotherJavaInterfaceImpl.JniTypeName);
-
-			var ctor    = t.GetConstructor ("()V");
-			var lref    = t.NewObject (ctor, null);
-
-			using var p = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.CopyAndDispose, typeof (IJavaInterface));
-
-			Assert.IsFalse (lref.IsValid);  // .CopyAndDispose disposes
-
-			Assert.IsNotNull (p);
-			Assert.AreSame (typeof (IJavaInterfaceInvoker), p!.GetType ());
-		}
-
-		[Test]
-		public void CreatePeer_CreatesNewValueUsingActivationConstructor ()
-		{
-			using var v1    = new AnotherJavaInterfaceImpl ();
-			var lref        = v1.PeerReference.NewLocalRef ();
-			try {
-				using var v2    = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.CopyAndDispose, typeof (AnotherJavaInterfaceImpl));
-				Assert.AreNotSame (v1, v2, "CreatePeer() should create new values");
-			}
-			finally {
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public void DisposePeerUnlessReferenced_CallsManagedDispose ()
-		{
-			using var registered = new AnotherJavaInterfaceImpl ();
-			var lref = registered.PeerReference.NewLocalRef ();
-			try {
-				using var alias = valueManager.CreatePeer (
-						ref lref,
-						JniObjectReferenceOptions.Copy,
-						typeof (AnotherJavaInterfaceImpl)) as AnotherJavaInterfaceImpl
-					?? throw new InvalidOperationException ("Could not create peer alias.");
-
-				Assert.AreNotSame (registered, alias);
-				Assert.AreSame (registered, valueManager.PeekPeer (lref));
-
-				alias.DisposeUnlessReferenced ();
-
-				Assert.IsTrue (alias.DisposeCalled, "The unregistered alias should receive its managed disposal callback.");
-				Assert.IsFalse (alias.PeerReference.IsValid, "The unregistered alias should release its JNI reference.");
-				Assert.IsFalse (registered.DisposeCalled, "The registered peer should remain undisposed.");
-				Assert.IsTrue (registered.PeerReference.IsValid, "The registered peer should retain its JNI reference.");
-			} finally {
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public unsafe void GetPeer_ReentrantActivation_ReturnsRegisteredPeer ()
-		{
-			using var t = new JniType (AnotherJavaInterfaceImpl.JniTypeName);
-			var ctor = t.GetConstructor ("()V");
-			var lref = t.NewObject (ctor, null);
-			AnotherJavaInterfaceImpl? reentrant = null;
-			var createdPeers = new List<AnotherJavaInterfaceImpl> ();
-			try {
-				Assert.IsNull (valueManager.PeekPeer (lref));
-				AnotherJavaInterfaceImpl.PeerCreated = createdPeers.Add;
-				AnotherJavaInterfaceImpl.BeforeConstruct = reference => {
-					reentrant = valueManager.GetPeer (reference, typeof (AnotherJavaInterfaceImpl)) as AnotherJavaInterfaceImpl;
-				};
-
-				var peer = valueManager.GetPeer (lref, typeof (AnotherJavaInterfaceImpl)) as AnotherJavaInterfaceImpl
-					?? throw new InvalidOperationException ("Could not create peer.");
-				var registered = valueManager.PeekPeer (lref)
-					?? throw new InvalidOperationException ("No peer was registered.");
-
-				Assert.AreSame (reentrant, registered, "The reentrant lookup should register first.");
-				Assert.AreSame (registered, peer, "The outer lookup should return the registered peer.");
-				Assert.AreEqual (2, createdPeers.Count, "Both lookups should construct a peer.");
-				Assert.AreNotSame (createdPeers [0], createdPeers [1]);
-				foreach (var created in createdPeers) {
-					Assert.AreEqual (ReferenceEquals (created, registered), created.PeerReference.IsValid,
-						"Only the returned registered peer should retain a JNI reference.");
-					Assert.AreEqual (!ReferenceEquals (created, registered), created.DisposeCalled,
-						"Only the losing alias should receive its managed disposal callback.");
-				}
-			} finally {
-				AnotherJavaInterfaceImpl.BeforeConstruct = null;
-				AnotherJavaInterfaceImpl.PeerCreated = null;
-				foreach (var peer in createdPeers)
-					peer.Dispose ();
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public void CreatePeer_ThrowsIfNoActivationConstructorPresent ()
-		{
-			using var v1    = new GetThis ();
-			var lref        = v1.PeerReference.NewLocalRef ();
-			var ex = Assert.Throws<NotSupportedException> (
-					() => valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.CopyAndDispose, typeof (GetThis)),
-					$"`GetThis` has no activation constructor, so attempting to use it should throw NotSupportedException.");
-			Assert.IsTrue (lref.IsValid, "lref should still be valid");
-			JniObjectReference.Dispose (ref lref);
-		}
-
-		[Test]
-		public void CreatePeer_ReplaceableDoesNotReplace ()
-		{
-			var v       = new AnotherJavaInterfaceImpl ();
-			var lref    = v.PeerReference.NewLocalRef ();
-			v.Dispose ();
-
-			try {
-				Assert.IsNull (valueManager.PeekPeer (lref), "v.Dispose() should have unregistered the peer.");
-				var peer1   = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.Copy, typeof (AnotherJavaInterfaceImpl));
-				Assert.IsTrue (
-						peer1!.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable),
-						$"Expected peer1.JniManagedPeerState to have .Replaceable, but was {peer1.JniManagedPeerState}.");
-				Assert.AreSame (peer1, valueManager.PeekPeer (lref),
-						$"Expected peer1==PeekValue(peer1.PeerReference); it's the only one that should exist!");
-
-				var peer2   = valueManager.CreatePeer (ref lref, JniObjectReferenceOptions.Copy, typeof (AnotherJavaInterfaceImpl));
-				Assert.IsTrue (
-						peer2!.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable),
-						$"Expected peer2.JniManagedPeerState to have .Replaceable, but was {peer2.JniManagedPeerState}.");
-				Assert.AreNotSame (peer1, peer2, "Expected peer1 and peer2 to be different instances.");
-
-				var peeked  = valueManager.PeekPeer (lref);
-				Assert.AreSame (peer1, peeked,
-						"Expected peer1 and peeked to be the same instance; " +
-						$"peeked={RuntimeHelpers.GetHashCode (peeked).ToString ("x")}, " +
-						$"peer1={RuntimeHelpers.GetHashCode (peer1).ToString ("x")}, " +
-						$"peer2={RuntimeHelpers.GetHashCode (peer2).ToString ("x")}");
-			} finally {
-				JniObjectReference.Dispose (ref lref);
-			}
-		}
-
-		[Test]
-		public void CreateValue ()
-		{
-			using (var o = new JavaObject ()) {
-				var r = o.PeerReference;
-				var x = (IJavaPeerable) valueManager.CreateValue (ref r, JniObjectReferenceOptions.Copy)!;
-				Assert.AreNotSame (o, x);
-				x.Dispose ();
-
-				x = valueManager.CreateValue<IJavaPeerable> (ref r, JniObjectReferenceOptions.Copy);
-				Assert.AreNotSame (o, x);
-				x!.Dispose ();
-			}
-		}
-
-		[Test]
-		public void GetValue_ReturnsAlias ()
-		{
-			var local   = new JavaObject ();
-			local.UnregisterFromRuntime ();
-			Assert.IsNull (valueManager.PeekValue (local.PeerReference));
-			// GetObject must always return a value (unless handle is null, etc.).
-			// However, since we called local.UnregisterFromRuntime(),
-			// JniRuntime.PeekObject() is null (asserted above), but GetObject() must
-			// **still** return _something_.
-			// In this case, it returns an _alias_.
-			// TODO: "most derived type" alias generation. (Not relevant here, but...)
-			var p       = local.PeerReference;
-			var alias   = JniRuntime.CurrentRuntime.ValueManager.GetValue<IJavaPeerable> (ref p, JniObjectReferenceOptions.Copy);
-			Assert.AreNotSame (local, alias);
-			alias!.Dispose ();
-			local.Dispose ();
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithNullHandle ()
-		{
-			var r = new JniObjectReference ();
-			var o = valueManager.GetValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsNull (o);
-		}
-
-		[Test]
-		public void GetValue_ReturnsNullWithInvalidSafeHandle ()
-		{
-			var invalid = new JniObjectReference ();
-			Assert.IsNull (valueManager.GetValue (ref invalid, JniObjectReferenceOptions.CopyAndDispose));
-		}
-
-		[Test]
-		public unsafe void GetValue_FindBestMatchType ()
-		{
-#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-			using (var t = new JniType (TestType.JniTypeName)) {
-				var c = t.GetConstructor ("()V");
-				var o = t.NewObject (c, null);
-				using (var w = valueManager.GetValue<IJavaPeerable> (ref o, JniObjectReferenceOptions.CopyAndDispose)) {
-					Assert.AreEqual (typeof (TestType), w!.GetType ());
-					Assert.IsTrue (((TestType) w).ExecutedActivationConstructor);
-				}
-			}
-#endif  // !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
-		}
-
-		[Test]
-		public void PeekPeer ()
-		{
-			Assert.IsNull (valueManager.PeekPeer (new JniObjectReference ()));
-
-			using (var v = new MyDisposableObject ()) {
-				Assert.IsNotNull (valueManager.PeekPeer (v.PeerReference));
-				Assert.AreSame (v, valueManager.PeekPeer (v.PeerReference));
-			}
-		}
-
-		[Test]
-		public void PeekValue ()
-		{
-			JniObjectReference lref;
-			using (var o = new JavaObject ()) {
-				lref = o.PeerReference.NewLocalRef ();
-				Assert.AreSame (o, valueManager.PeekValue (lref));
-			}
-			// At this point, the Java-side object is kept alive by `lref`,
-			// but the wrapper instance has been disposed, and thus should
-			// be unregistered, and thus unfindable.
-			Assert.IsNull (valueManager.PeekValue (lref));
-			JniObjectReference.Dispose (ref lref);
-		}
-
-		[Test]
-		public void PeekValue_BoxedObjects ()
-		{
-			var marshaler   = valueManager.GetValueMarshaler<object> ();
-			var ad          = AppDomain.CurrentDomain;
-
-			var proxy       = marshaler.CreateGenericArgumentState (ad);
-			Assert.AreSame (ad, valueManager.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ad, ref proxy);
-
-			var ex  = new InvalidOperationException ("boo!");
-			proxy   = marshaler.CreateGenericArgumentState (ex);
-			Assert.AreSame (ex, valueManager.PeekValue (proxy.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (ex, ref proxy);
-		}
-
-		void AllNestedRegistrationScopeTests ()
-		{
-			AddPeer ();
-			AddPeer_NoDuplicates ();
-			ConstructPeer_ImplicitViaBindingConstructor_PeerIsInSurfacedPeers ();
-			CreateValue ();
-			GetValue_FindBestMatchType ();
-			GetValue_ReturnsAlias ();
-			GetValue_ReturnsNullWithInvalidSafeHandle ();
-			GetValue_ReturnsNullWithNullHandle ();
-			PeekPeer ();
-			PeekValue ();
-			PeekValue_BoxedObjects ();
-		}
-
-		string DumpPeers ()
-		{
-			return DumpPeers (valueManager.GetSurfacedPeers ());
-		}
-
-		static string DumpPeers (IEnumerable<JniSurfacedPeerInfo> peers)
-		{
-			return string.Join ("," + Environment.NewLine, peers);
-		}
-
-
-		// also test:
-		// Singleton scenario
-		// Types w/o "activation" constructors -- need to support checking parent scopes
-		// nesting of scopes
-		// Adding an instance already added in a previous scope?
-	}
-
-	public abstract class JniRuntimeJniValueManagerContract<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-			T
-		> : JniRuntimeJniValueManagerContract
-	{
-		[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-		protected override Type ValueManagerType => typeof (T);
-	}
-
-#if !__ANDROID__
-	[TestFixture]
-	public class JniRuntimeJniValueManagerContract_NoGCIntegration : JniRuntimeJniValueManagerContract<ManagedValueManager> {
-	}
-#endif  // !__ANDROID__
-
-	// Note: Java side implements JavaInterface, while managed binding DOES NOT.
-	// This is so that `CreatePeer(…, typeof(IJavaInterface))` tests don't use an existing AnotherJavaInterfaceImpl instance.
-	//
-	// This is mostly identical to MyJavaInterfaceImpl; the important difference is that
-	// it contains an activation constructor, while MyJavaInterfaceImpl does not.
-	// MyJavaInterfaceImpl can't have one, as that's what provokes the NotSupportedException in the JavaAs() tests.
-	//
-	// We want one here so that in "bad" `CreatePeer()` implementations, we'll find this peer and construct it
-	// before verifying that it satisfies the targetType requirement.
-	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
-	public class AnotherJavaInterfaceImpl : JavaObject {
-		internal            const       string          JniTypeName    = "net/dot/jni/test/AnotherJavaInterfaceImpl";
-
-		internal    static  readonly    JniPeerMembers  _members    = new JniPeerMembers (JniTypeName, typeof (AnotherJavaInterfaceImpl));
-
-		internal static Action<JniObjectReference>? BeforeConstruct;
-		internal static Action<AnotherJavaInterfaceImpl>? PeerCreated;
-
-		public bool DisposeCalled {
-			get;
-			private set;
-		}
-
-		public override JniPeerMembers JniPeerMembers {
-			get {return _members;}
-		}
-
-		unsafe AnotherJavaInterfaceImpl (ref JniObjectReference reference, JniObjectReferenceOptions options)
-			: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			var callback = BeforeConstruct;
-			BeforeConstruct = null;
-			callback?.Invoke (reference);
-			Construct (ref reference, options);
-			PeerCreated?.Invoke (this);
-		}
-
-		public unsafe AnotherJavaInterfaceImpl ()
-			: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
-		{
-			const   string  id  = "()V";
-			var peer = _members.InstanceMethods.StartCreateInstance (id, GetType (), null);
-			Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
-			_members.InstanceMethods.FinishCreateInstance (id, this, null);
-		}
-
-		protected override void Dispose (bool disposing)
-		{
-			if (disposing)
-				DisposeCalled = true;
-			base.Dispose (disposing);
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
index f28d24727aa..63144cf2fec 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Reflection;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Diagnostics.CodeAnalysis;
 
@@ -11,9 +10,6 @@
 
 namespace Java.InteropTests
 {
-#if !__ANDROID__
-	[NonParallelizable]
-#endif  // !__ANDROID__
 	[TestFixture]
 	public class JniRuntimeTest : JavaVMFixture
 	{
@@ -25,61 +21,12 @@ public void CreateJavaVM ()
 			Assert.IsTrue (JniEnvironment.EnvironmentPointer != IntPtr.Zero);
 		}
 
-#if !__ANDROID__
-		[Test]
-		[RequiresDynamicCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not trimming-compatible.")]
-		public void JDK_OnlySupportsOneVM ()
-		{
-			try {
-				var second = new TestJVM (new TestJVMOptions () {
-					JvmLibraryPath  = TestJVM.GetJvmLibraryPath (),
-				});
-				// If we reach here, we're in a JVM that supports > 1 VM
-				second.Dispose ();
-				Assert.Ignore ();
-			} catch (NotSupportedException) {
-			} catch (Exception e){
-				Assert.Fail ("Expected NotSupportedException; got: {0}", e);
-			}
-		}
-
-		[Test]
-		[RequiresDynamicCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not NativeAOT-compatible.")]
-		[RequiresUnreferencedCode ("This test intentionally uses the default JRE type manager, which is reflection-based and not trimming-compatible.")]
-		public void UseInvocationPointerOnNewThread ()
-		{
-			var InvocationPointer = JniRuntime.CurrentRuntime.InvocationPointer;
-
-			var t = new Thread (() => {
-				try {
-					var second = new TestJVM (new TestJVMOptions () {
-						InvocationPointer   = InvocationPointer,
-					});
-				}
-				catch (Exception e) {
-					Assert.Fail ("Expected no exception, got: {0}", e);
-				}
-			});
-			t.Start ();
-			t.Join ();
-		}
-#endif  // !__ANDROID__
-
 		[Test]
 		public void CreateJavaVMWithNullBuilder ()
 		{
 			Assert.Throws<ArgumentNullException> (() => new JavaVMWithNullBuilder ());
 		}
 
-		[Test]
-		[Category ("TrimmableTypeMapUnsupported")]
-		public void BuiltInSimpleReferenceMap_ContainsManagedPeerByDefault ()
-		{
-			var types = JniRuntime.CurrentRuntime.TypeManager.GetTypes (new JniTypeSignature (ManagedPeer.JniTypeName));
-			Assert.IsTrue (types.Contains (typeof (ManagedPeer)));
-		}
-
 		class JavaVMWithNullBuilder : JniRuntime {
 			public JavaVMWithNullBuilder ()
 				: base ((JniRuntime.CreationOptions) null)
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs
index 3a407b527d1..ff5fb0d66a1 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs
@@ -88,18 +88,6 @@ public void GetTypeSignature_Type ()
 			AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>),         "[[I",                  true,   2);
 			AssertGetJniTypeInfoForType (typeof (JavaArray<int[]>[]),       "[[[I",                 true,   3);
 
-#if !__ANDROID__
-			// Re-enable once typemap files contain `JavaObject` subclasses, not just Java.Lang.Object subclasses
-			//
-			// Note: dotnet/android@5c23bcda updates Java.Lang.Object to inherit JavaObject; this is not enough,
-			// as `<GenerateJavaStubs/>` only processes assemblies if they reference Mono.Android.dll.
-			AssertGetJniTypeInfoForType (typeof (GenericHolder<int>),       GenericHolder<int>.JniTypeName,    false,   0);
-
-			// XAJavaInterop1 Java Callable Wrappers, as used in dotnet/android, may contain
-			// `Runtime.register("Java.InteropTests.GenericHolder`1, Mono.Android-Tests", …)`,
-			// which results in a generic type definition.  Permit this.
-			AssertGetJniTypeInfoForType (typeof (GenericHolder<>),          GenericHolder<int>.JniTypeName,    false,   0);
-#endif  // !__ANDROID__
 		}
 
 		static void AssertGetJniTypeInfoForType (Type type, string jniType, bool isKeyword, int arrayRank)
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
index 97397fc70a6..6ef4b07b487 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 
 using Java.Interop;
 
@@ -19,5 +20,55 @@ public void Constructor ()
 			Assert.AreEqual (a.MarshalerType, typeof (DemoValueTypeValueMarshaler));
 		}
 	}
-}
 
+	[JniValueMarshaler (typeof (DemoValueTypeValueMarshaler))]
+	struct DemoValueType {
+		public int Value { get; }
+
+		public DemoValueType (int value)
+		{
+			Value = value;
+		}
+	}
+
+	class DemoValueTypeValueMarshaler : JniValueMarshaler<DemoValueType> {
+
+		JniValueMarshaler<int> Int32Marshaler;
+
+		public override bool IsJniValueType => Int32Marshaler.IsJniValueType;
+
+		public DemoValueTypeValueMarshaler ()
+		{
+			Int32Marshaler = JniRuntime.CurrentRuntime.ValueManager.GetValueMarshaler<int> ();
+		}
+
+		public override DemoValueType CreateGenericValue (
+			ref JniObjectReference reference,
+			JniObjectReferenceOptions options,
+			Type targetType)
+		{
+			var value = Int32Marshaler.CreateGenericValue (ref reference, options, typeof (int));
+			return new DemoValueType (value);
+		}
+
+		public override JniValueMarshalerState CreateGenericArgumentState (DemoValueType value, ParameterAttributes synchronize)
+		{
+			return Int32Marshaler.CreateGenericArgumentState (value.Value, synchronize);
+		}
+
+		public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (DemoValueType value, ParameterAttributes synchronize)
+		{
+			return Int32Marshaler.CreateGenericObjectReferenceArgumentState (value.Value, synchronize);
+		}
+
+		public override void DestroyArgumentState (object value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
+		{
+			Int32Marshaler.DestroyArgumentState ((value as DemoValueType?)?.Value, ref state, synchronize);
+		}
+
+		public override void DestroyGenericArgumentState (DemoValueType value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
+		{
+			Int32Marshaler.DestroyGenericArgumentState (value.Value, ref state, synchronize);
+		}
+	}
+}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
deleted file mode 100644
index b241836a9d9..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
+++ /dev/null
@@ -1,770 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-using Java.Interop;
-using Java.Interop.Expressions;
-
-using Mono.Linq.Expressions;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests {
-
-	[Category ("TrimmableTypeMapUnsupported")]
-	public abstract class JniValueMarshalerContractTests<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-			T
-		> : JavaVMFixture
-	{
-
-		protected   abstract    T       Value           {get;}
-
-		protected   virtual     bool    IsJniValueType  {get;}
-		protected   virtual     bool    UsesProxy       {get;}
-
-		protected   virtual     bool    Equals (T x, T y)
-		{
-			return EqualityComparer<T>.Default.Equals (x, y);
-		}
-
-		protected   virtual     void    Dispose (T value)
-		{
-		}
-
-		protected   JniValueMarshaler<T>    marshaler;
-
-		protected JniValueMarshalerContractTests (JniValueMarshaler<T> marshaler = null)
-		{
-			this.marshaler  = marshaler ?? JniRuntime.CurrentRuntime.ValueManager.GetValueMarshaler<T> ();
-		}
-
-		[Test]
-		public void TestIsJniValueType ()
-		{
-			Assert.AreEqual (IsJniValueType, marshaler.IsJniValueType);
-		}
-
-		[Test]
-		public void CreateArgumentState ()
-		{
-			if (IsJniValueType) {
-				var s   = marshaler.CreateArgumentState (Value);
-
-				// Note: Only valid if `Value` isn't 0, so don't do that!
-				Assert.AreNotEqual (new JniArgumentValue (), s.JniArgumentValue);
-
-				// JniValueMarshaler<T>.CreateArgumentState() for value types only
-				// fills out the JniArgumentValue value, nothing else.
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.IsNull (s.PeerableValue);
-				Assert.IsNull (s.Extra);
-
-				marshaler.DestroyArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-			else {
-				var s   = marshaler.CreateArgumentState (Value);
-
-				if (s.PeerableValue != null) {
-					Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-				}
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-				marshaler.DestroyArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-		}
-
-		[Test]
-		public void CreateGenericArgumentState ()
-		{
-			if (IsJniValueType) {
-				var s   = marshaler.CreateGenericArgumentState (Value);
-
-				// Note: Only valid if `Value` isn't 0, so don't do that!
-				Assert.AreNotEqual (new JniArgumentValue (), s.JniArgumentValue);
-
-				// JniValueMarshaler<T>.CreateArgumentState() for value types only
-				// fills out the JniArgumentValue value, nothing else.
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.IsNull (s.PeerableValue);
-				Assert.IsNull (s.Extra);
-
-				marshaler.DestroyGenericArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-			else {
-				var s   = marshaler.CreateGenericArgumentState (Value);
-
-				if (s.PeerableValue != null) {
-					Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-				}
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-				marshaler.DestroyGenericArgumentState (Value, ref s);
-				Assert.AreEqual (new JniValueMarshalerState (), s);
-			}
-		}
-
-		[Test]
-		public void CreateObjectReferenceArgumentState_DefaultValue ()
-		{
-			var s = marshaler.CreateObjectReferenceArgumentState (default (T));
-
-			if (IsJniValueType) {
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-			} else {
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (), s.JniArgumentValue);
-			}
-			Assert.IsNull (s.PeerableValue);
-			marshaler.DestroyArgumentState (default (T), ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateObjectReferenceArgumentState ()
-		{
-			var s   = marshaler.CreateObjectReferenceArgumentState (Value);
-			if (s.PeerableValue != null) {
-				Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-			}
-			Assert.IsTrue (s.ReferenceValue.IsValid);
-			Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-			marshaler.DestroyArgumentState (Value, ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateGenericObjectReferenceArgumentState_DefaultValue ()
-		{
-			var s = marshaler.CreateGenericObjectReferenceArgumentState (default (T));
-
-			if (IsJniValueType) {
-				Assert.IsTrue (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-			} else {
-				Assert.IsFalse (s.ReferenceValue.IsValid);
-				Assert.AreEqual (new JniArgumentValue (), s.JniArgumentValue);
-			}
-			Assert.IsNull (s.PeerableValue);
-			marshaler.DestroyGenericArgumentState (default (T), ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateGenericObjectReferenceArgumentState ()
-		{
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (Value);
-			if (s.PeerableValue != null) {
-				Assert.AreEqual (s.PeerableValue.PeerReference, s.ReferenceValue);
-			}
-			Assert.IsTrue (s.ReferenceValue.IsValid);
-			Assert.AreEqual (new JniArgumentValue (s.ReferenceValue), s.JniArgumentValue);
-
-			marshaler.DestroyGenericArgumentState (Value, ref s);
-			Assert.AreEqual (new JniValueMarshalerState (), s);
-		}
-
-		[Test]
-		public void CreateValue ()
-		{
-			var s   = marshaler.CreateObjectReferenceArgumentState (Value);
-			var r   = s.ReferenceValue;
-			var o   = marshaler.CreateValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsTrue (Equals (Value, (T) o));
-			if (!UsesProxy && !typeof(T).IsValueType)
-				Assert.AreNotSame (Value, o);
-			marshaler.DestroyArgumentState (Value, ref s);
-
-			Dispose ((T) o);
-		}
-
-		[Test]
-		public void CreateGenericValue ()
-		{
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (Value);
-			var r   = s.ReferenceValue;
-			var o   = marshaler.CreateGenericValue (ref r, JniObjectReferenceOptions.Copy);
-			Assert.IsTrue (Equals (Value, o));
-			if (!UsesProxy && !typeof(T).IsValueType)
-				Assert.AreNotSame (Value, o);
-			marshaler.DestroyGenericArgumentState (Value, ref s);
-
-			Dispose (o);
-		}
-
-		[Test]
-		public void DestroyArgumentState ()
-		{
-			var s   = new JniValueMarshalerState ();
-			marshaler.DestroyArgumentState (null, ref s);
-		}
-
-		[Test]
-		public void DestroyGenericArgumentState ()
-		{
-			var s   = new JniValueMarshalerState ();
-			marshaler.DestroyGenericArgumentState (default (T), ref s);
-		}
-
-		[Test]
-		[RequiresUnreferencedCode ("CreateReturnValueFromManagedExpression")]
-		[RequiresDynamicCode ("CreateReturnValueFromManagedExpression")]
-		public void CreateReturnValueFromManagedExpression ()
-		{
-			var runtime = Expression.Variable (typeof (JniRuntime), "__jvm");
-			var value   = Expression.Variable (typeof (T),          "__value");
-			var context = new JniValueMarshalerContext (runtime) {
-				LocalVariables  = {
-					runtime,
-					value,
-				},
-			};
-			var ret     = marshaler.CreateReturnValueFromManagedExpression (context, value);
-			CheckExpression (context, GetExpectedReturnValueFromManagedExpression (runtime.Name, value.Name, ret), ret);
-		}
-
-		protected virtual string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var valueType       = GetTypeName (typeof (T));
-			var marshalerType   = GetTypeName (marshaler.GetType ());
-			return $@"{{
-	JniRuntime {jvm};
-	{valueType} {value};
-	{marshalerType} {value}_marshaler;
-	JniValueMarshalerState {value}_state;
-	IntPtr {value}_val;
-	IntPtr {value}_rtn;
-
-	try
-	{{
-		{value}_marshaler = new {marshalerType}();
-		{value}_state = {value}_marshaler.CreateArgumentState((object){value}, ParameterAttributes.None);
-		{value}_val = {value}_state.ReferenceValue.Handle;
-		{value}_rtn = References.NewReturnToJniRef({value}_state.ReferenceValue);
-		return {value}_rtn;
-	}}
-	finally
-	{{
-		{value}_marshaler.DestroyArgumentState((object){value}, {value}_state, ParameterAttributes.None);
-	}}
-}}";
-		}
-
-		void CheckExpression (JniValueMarshalerContext context, string expected, Expression ret)
-		{
-			var body    = Expression.Block (context.CreationStatements.Concat (new[]{ ret }));
-			var cleanup = context.CleanupStatements.Any ()
-				? (Expression) Expression.Block (context.CleanupStatements.Reverse ())
-				: (Expression) Expression.Empty ();
-			var expr    = Expression.TryFinally (body, cleanup);
-			var block   = Expression.Block (context.LocalVariables, expr);
-			// Convert line endings to Unix style to support building and running on different OS types.
-			string blockCSharp = block.ToCSharpCode ();
-			blockCSharp = blockCSharp.Replace ("\r\n", "\n");
-			expected = expected.Replace ("\r\n", "\n");
-			Console.WriteLine ("# jonp: expected: {0}", GetType ().Name);
-			Console.WriteLine (blockCSharp);
-			Assert.AreEqual (expected, blockCSharp);
-		}
-
-		protected static string GetTypeName (Type type)
-		{
-			switch (type.Name) {
-			case "Boolean":
-				return "bool";
-			case "Byte":
-				return "byte";
-			case "Char":
-				return "char";
-			case "Double":
-				return "double";
-			case "Int16":
-				return "short";
-			case "Int32":
-				return "int";
-			case "Int64":
-				return "long";
-			case "Object":
-				return "object";
-			case "SByte":
-				return "sbyte";
-			case "Single":
-				return "float";
-			}
-			if (type.IsArray) {
-				return GetTypeName (type.GetElementType ()) + "[]";
-			}
-			if (!type.IsGenericType) {
-				return type.Name;
-			}
-			var n = new System.Text.StringBuilder ();
-			n.Append (type.Name);
-			var b = type.Name.IndexOf ('`');
-			n.Remove (b, type.Name.Length - b);
-			n.Append ("<");
-			n.Append (string.Join (", ", type.GenericTypeArguments.Select (tp => GetTypeName (tp))));
-			n.Append (">");
-			return n.ToString ();
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_String_ContractTests : JniValueMarshalerContractTests<string> {
-		protected   override    string      Value       {get {return "value";}}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var rname       = ((ParameterExpression) ret).Name;
-			return $@"{{
-	JniRuntime {jvm};
-	string {value};
-	JniObjectReference {value}_ref;
-	IntPtr {value}_rtn;
-
-	try
-	{{
-		{value}_ref = Strings.NewString({value});
-		{value}_rtn = References.NewReturnToJniRef({value}_ref);
-		return {rname};
-	}}
-	finally
-	{{
-		JniObjectReference.Dispose(__value_ref);
-	}}
-}}";
-		}
-	}
-
-	public abstract class JniValueMarshaler_BuiltinType_ContractTests<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-			T
-		> : JniValueMarshalerContractTests<T>
-	{
-		protected   override    bool    IsJniValueType  {get {return true;}}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var valueType   = GetTypeName (typeof (T));
-			var rname       = ((ParameterExpression) ret).Name;
-			return $@"{{
-	JniRuntime {jvm};
-	{valueType} {value};
-
-	try
-	{{
-		return {rname};
-	}}
-	finally
-	{{
-		default(void);
-	}}
-}}";
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Boolean_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<bool> {
-		protected   override    bool    Value           {get {return true;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_SByte_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<sbyte> {
-		protected   override    sbyte   Value           {get {return (sbyte) 2;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Char_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<char> {
-		protected   override    char    Value           {get {return '3';}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int16_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<short> {
-		protected   override    short   Value           {get {return (short) 4;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int32_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<int> {
-		protected   override    int     Value           {get {return 5;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int64_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<long> {
-		protected   override    long    Value           {get {return 6;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Single_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<float> {
-		protected   override    float   Value           {get {return 7F;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Double_ContractTests : JniValueMarshaler_BuiltinType_ContractTests<double> {
-		protected   override    double  Value           {get {return 8D;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableBoolean_ContractTests : JniValueMarshalerContractTests<bool?> {
-		protected   override    bool?   Value           {get {return true;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableSByte_ContractTests : JniValueMarshalerContractTests<sbyte?> {
-		protected   override    sbyte?  Value           {get {return (sbyte) 2;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableByte_ContractTests : JniValueMarshalerContractTests<byte?> {
-		protected   override    byte?   Value           {get {return (byte) 200;}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableChar_ContractTests : JniValueMarshalerContractTests<char?> {
-		protected   override    char?   Value           {get {return '3';}}
-	}
-
-	[TestFixture]
-	[Category("LLVMIgnore")] //FIXME: https://github.com/dotnet/runtime/issues/89190
-	public class JniValueMarshaler_NullableInt16_ContractTests : JniValueMarshalerContractTests<short?> {
-		protected   override    short?  Value           {get {return (short) 4;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableInt32_ContractTests : JniValueMarshalerContractTests<int?> {
-		protected   override    int?    Value           {get {return 5;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableInt64_ContractTests : JniValueMarshalerContractTests<long?> {
-		protected   override    long?   Value           {get {return 6;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableSingle_ContractTests : JniValueMarshalerContractTests<float?> {
-		protected   override    float?  Value           {get {return 7F;}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_NullableDouble_ContractTests : JniValueMarshalerContractTests<double?> {
-		protected   override    double? Value           {get {return 8D;}}
-	}
-
-	public abstract class JniInt32ArrayValueMarshalerContractTests<
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
-			T
-		> : JniValueMarshalerContractTests<T>
-			where T : IEnumerable<int>
-	{
-		protected   abstract    T       CreateArray (int[] values);
-		protected   abstract    string  ValueMarshalerSourceType    {get;}
-
-		protected   override    T       Value {
-			get {return CreateArray (new[]{ 1, 2, 3 });}
-		}
-
-		protected   override    bool    Equals (T x, T y)
-		{
-			return x.SequenceEqual (y);
-		}
-
-		[Test]
-		public unsafe void DestroyGenericArgumentState_UpdatesSource ()
-		{
-			var a   = CreateArray (new[]{ 1 });
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (a);
-			fixed (int *p = new[]{3})
-				JniEnvironment.Arrays.SetIntArrayRegion (s.ReferenceValue, 0, 1, p);
-			marshaler.DestroyGenericArgumentState (a, ref s);
-			Assert.AreEqual (3, a.First ());
-			Dispose (a);
-		}
-
-		protected override void Dispose (T value)
-		{
-			var d = value as IDisposable;
-			if (d != null) {
-				d.Dispose ();
-			}
-		}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			return $@"{{
-	JniRuntime __jvm;
-	{ValueMarshalerSourceType} __value;
-	ValueMarshaler __value_marshaler;
-	JniValueMarshalerState __value_state;
-	IntPtr __value_val;
-	IntPtr __value_rtn;
-
-	try
-	{{
-		__value_marshaler = new ValueMarshaler();
-		__value_state = __value_marshaler.CreateArgumentState((object)__value, ParameterAttributes.None);
-		__value_val = __value_state.ReferenceValue.Handle;
-		__value_rtn = References.NewReturnToJniRef(__value_state.ReferenceValue);
-		return __value_rtn;
-	}}
-	finally
-	{{
-		__value_marshaler.DestroyArgumentState((object)__value, __value_state, ParameterAttributes.None);
-	}}
-}}";
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_Int32Array_ContractTests : JniInt32ArrayValueMarshalerContractTests<int[]> {
-		protected   override    int[]                   CreateArray (int[] values) {return values;}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "int[]";}}
-
-		[Test]
-		public unsafe void CreateGenericObjectReferenceArgumentState_OutParameterDoesNotCopy ()
-		{
-			var a   = new[]{ 1 };
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (a, ParameterAttributes.Out);
-			int v;
-			JniEnvironment.Arrays.GetIntArrayRegion (s.ReferenceValue, 0, 1, &v);
-			Assert.AreEqual (0, v);
-			marshaler.DestroyGenericArgumentState (a, ref s);
-		}
-
-		[Test]
-		public unsafe void DestroyGenericArgumentState_InParameterDoesNotUpdatesSource ()
-		{
-			var a   = CreateArray (new[]{ 1 });
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (a);
-			fixed (int *p = new[]{3})
-				JniEnvironment.Arrays.SetIntArrayRegion (s.ReferenceValue, 0, 1, p);
-			marshaler.DestroyGenericArgumentState (a, ref s, ParameterAttributes.In);
-			Assert.AreEqual (1, a.First ());
-			Dispose (a);
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_ListOfInt32_ContractTests : JniInt32ArrayValueMarshalerContractTests<IList<int>> {
-		protected   override    IList<int>              CreateArray (int[] values) {return values;}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "IList<int>";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_JavaArray_Int32_ContractTests : JniInt32ArrayValueMarshalerContractTests<JavaArray<int>> {
-		protected   override    JavaArray<int>          CreateArray (int[] values) {return new JavaInt32Array (values);}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "JavaArray<int>";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_JavaPrimitiveArray_Int32_ContractTests : JniInt32ArrayValueMarshalerContractTests<JavaPrimitiveArray<int>> {
-		protected   override    JavaPrimitiveArray<int> CreateArray (int[] values) {return new JavaInt32Array (values);}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "JavaPrimitiveArray<int>";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_JavaInt32Array_ContractTests : JniInt32ArrayValueMarshalerContractTests<JavaInt32Array> {
-		protected   override    JavaInt32Array          CreateArray (int[] values) {return new JavaInt32Array (values);}
-
-		protected   override    string                  ValueMarshalerSourceType {get {return "JavaInt32Array";}}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_object_ContractTests : JniValueMarshalerContractTests<object> {
-
-		readonly    object      value   = new object ();
-
-		protected   override    object                  Value               {get {return value;}}
-		protected   override    bool                    UsesProxy           {get {return true;}}
-
-		[Test]
-		public unsafe void ProxyObjectMethodsDelegateToManagedValue ()
-		{
-			var value       = new ProxyValue (42);
-			var equalValue  = new ProxyValue (42);
-			var otherValue  = new ProxyValue (43);
-			var valueState  = marshaler.CreateGenericObjectReferenceArgumentState (value);
-			var equalState  = marshaler.CreateGenericObjectReferenceArgumentState (equalValue);
-			var otherState  = marshaler.CreateGenericObjectReferenceArgumentState (otherValue);
-
-			try {
-				using (var proxyType = new JniType ("net/dot/jni/internal/JavaProxyObject")) {
-					var equals   = proxyType.GetInstanceMethod ("equals", "(Ljava/lang/Object;)Z");
-					var hashCode = proxyType.GetInstanceMethod ("hashCode", "()I");
-					var toString = proxyType.GetInstanceMethod ("toString", "()Ljava/lang/String;");
-					var args     = stackalloc JniArgumentValue [1];
-
-					args [0] = new JniArgumentValue (equalState.ReferenceValue);
-					Assert.IsTrue (JniEnvironment.InstanceMethods.CallBooleanMethod (valueState.ReferenceValue, equals, args));
-
-					args [0] = new JniArgumentValue (otherState.ReferenceValue);
-					Assert.IsFalse (JniEnvironment.InstanceMethods.CallBooleanMethod (valueState.ReferenceValue, equals, args));
-
-					Assert.AreEqual (value.GetHashCode (), JniEnvironment.InstanceMethods.CallIntMethod (valueState.ReferenceValue, hashCode));
-
-					var proxyString = JniEnvironment.InstanceMethods.CallObjectMethod (valueState.ReferenceValue, toString);
-					Assert.AreEqual (value.ToString (), JniEnvironment.Strings.ToString (ref proxyString, JniObjectReferenceOptions.CopyAndDispose));
-				}
-			} finally {
-				marshaler.DestroyGenericArgumentState (otherValue, ref otherState);
-				marshaler.DestroyGenericArgumentState (equalValue, ref equalState);
-				marshaler.DestroyGenericArgumentState (value, ref valueState);
-			}
-		}
-
-		[Test]
-		public void SpecificTypesAreUsed ()
-		{
-			// As a "GREF optimization", the JniValueMarshaler<object> implementation
-			// will use a "nested" JniValueMarshaler for the runtime type,
-			// e.g. a boxed int will use JniValueMarshaler<int>
-			var s   = marshaler.CreateGenericObjectReferenceArgumentState (42);
-			Assert.AreEqual ("java/lang/Integer",   JniEnvironment.Types.GetJniTypeNameFromInstance (s.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (42, ref s);
-
-			// Compare to the default proxy behavior...
-			s       = marshaler.CreateGenericObjectReferenceArgumentState (value);
-			Assert.AreEqual ("net/dot/jni/internal/JavaProxyObject",    JniEnvironment.Types.GetJniTypeNameFromInstance (s.ReferenceValue));
-			marshaler.DestroyGenericArgumentState (value, ref s);
-		}
-
-		sealed class ProxyValue {
-
-			readonly int value;
-
-			public ProxyValue (int value)
-			{
-				this.value = value;
-			}
-
-			public override bool Equals (object obj)
-			{
-				return obj is ProxyValue other && value == other.value;
-			}
-
-			public override int GetHashCode ()
-			{
-				return value;
-			}
-
-			public override string ToString ()
-			{
-				return $"ProxyValue({value})";
-			}
-		}
-	}
-
-	[TestFixture]
-	public class JniValueMarshaler_IJavaPeerable_ContractTests : JniValueMarshalerContractTests<IJavaPeerable> {
-		readonly    IJavaPeerable      value   = new JavaObject ();
-
-		protected   override    IJavaPeerable       Value   {get {return value;}}
-
-		protected override string GetExpectedReturnValueFromManagedExpression (string jvm, string value, Expression ret)
-		{
-			var pret    = (ParameterExpression) ret;
-			return $@"{{
-	JniRuntime {jvm};
-	IJavaPeerable {value};
-	JniObjectReference {value}_ref;
-	IntPtr {value}_rtn;
-
-	try
-	{{
-		if (null == {value})
-		{{
-			return {value}_ref = new JniObjectReference();
-		}}
-		else
-		{{
-			return {value}_ref = (IJavaPeerable){value}.PeerReference;
-		}}
-		{value}_rtn = References.NewReturnToJniRef({value}_ref);
-		return {pret.Name};
-	}}
-	finally
-	{{
-		default(void);
-	}}
-}}";
-		}
-	}
-
-	[JniValueMarshaler (typeof (DemoValueTypeValueMarshaler))]
-	struct DemoValueType {
-		public  int Value   {get;}
-
-		public DemoValueType (int value)
-		{
-			Value = value;
-		}
-	}
-
-	class DemoValueTypeValueMarshaler : JniValueMarshaler<DemoValueType> {
-
-		JniValueMarshaler<int>  Int32Marshaler;
-
-		public override bool IsJniValueType {
-			get {
-				return Int32Marshaler.IsJniValueType;
-			}
-		}
-
-		public DemoValueTypeValueMarshaler ()
-		{
-			Int32Marshaler  = JniRuntime.CurrentRuntime.ValueManager.GetValueMarshaler<int> ();
-		}
-
-		public override DemoValueType CreateGenericValue (
-			ref JniObjectReference reference,
-			JniObjectReferenceOptions options,
-			Type targetType)
-		{
-			var v   = Int32Marshaler.CreateGenericValue (ref reference, options, typeof (int));
-			return new DemoValueType (v);
-		}
-
-		public override JniValueMarshalerState CreateGenericArgumentState (DemoValueType value, ParameterAttributes synchronize)
-		{
-			return Int32Marshaler.CreateGenericArgumentState (value.Value, synchronize);
-		}
-
-		public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (DemoValueType value, ParameterAttributes synchronize)
-		{
-			return Int32Marshaler.CreateGenericObjectReferenceArgumentState (value.Value, synchronize);
-		}
-
-		public override void DestroyArgumentState (object value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
-		{
-			Int32Marshaler.DestroyArgumentState ((value as DemoValueType?)?.Value, ref state, synchronize);
-		}
-
-		public override void DestroyGenericArgumentState (DemoValueType value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
-		{
-			Int32Marshaler.DestroyGenericArgumentState (value.Value, ref state, synchronize);
-		}
-	}
-
-	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
-	class JniValueMarshaler_DemoValueType_ContractTests : JniValueMarshalerContractTests<DemoValueType> {
-
-		protected   override    DemoValueType       Value           {get {return new DemoValueType (42);}}
-		protected   override    bool                IsJniValueType  {get {return true;}}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
deleted file mode 100644
index 05e8156fa91..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-
-using Java.Interop;
-
-using NUnit.Framework;
-
-namespace Java.InteropTests
-{
-	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
-	public class MethodBindingTests : JavaVMFixture
-	{
-		//
-		//  https://bugzilla.xamarin.com/show_bug.cgi?id=17630
-		//  https://bugzilla.xamarin.com/show_bug.cgi?id=17750#c6
-		//  https://code.google.com/p/android/issues/detail?id=65710
-		//
-		//  The scenario: Assume a class hiearchy three-deep:
-		//      CallNonvirtualBase > CallNonvirtualDerived > CallNonvirtualDerived2
-		//
-		//  Historically, "normal" binding rules/convention within Xamarin.Android
-		//  is that if a Java class' Derived method overrides a base method
-		//  without changing anything (visibility, return type), then the Derived
-		//  method is not emitted.
-		//
-		//  Thus consider the java CallNonvirtualDerived.method() method, which
-		//  overrides but doesn't otherwise change CallNonvirtualBase.method().
-		//  Consequently, it doesn't need to be emitted, saving on IL size.
-		//
-		//  Which leads us to the problem: what should the body of the "common"
-		//  CallNonvirtualBase.Method() binding do? It needs to do EITHER a
-		//  virtual method dispatch (invocation on non-public types) OR a
-		//  non-virtual method dispatch (e.g. `base.Method()` invocation).
-		//
-		//  THEN there are concerns about efficiency and not doing too much extra
-		//  work within the binding methods.
-		//
-		//  Which brings us to THIS scenario: CallNonvirtualBase declares method().
-		//  CallNonvirtualDerived overrides method(), but the override isn't
-		//  declared within the CallNonvirtualDerived binding. Finally we have
-		//  CallNonvirtualDerived2, which inherits CallNonvirtualDerived and
-		//  doesn't override anything.
-		//
-		//  Logically then, if we have a CallNonvirtualDerived2 instance and we
-		//  invoke method() upon it, then we SHOULD invoke
-		//  CallNonvirtualDerived.method(). ASSERT that this is the case.
-		//  Failure to do so possibly results in Bug #17630/#65710, or #17750.
-		//
-		//  Aside: just to get to this point we're throwing in
-		//  JavaObject.JniThresholdType and JavaObject.JniThresholdClass.
-		//  These likely won't survive long.
-		//
-		//  Aside: in Bug #17630 terms, CallNonvirtualBase is ContextWrapper,
-		//  CallNonvirtualDerived is Activity, and CallNonvirtualDerived2 is
-		//  an Android Callable Wrapper/user subclass
-		[Test]
-		public void VirtualMethodBinding ()
-		{
-			using (var d = new CallNonvirtualDerived ()) {
-				d.Method ();
-				Assert.IsTrue (d.MethodInvoked);
-			}
-			using (var b = new CallNonvirtualBase ()) {
-				b.Method ();
-				Assert.IsTrue (b.MethodInvoked);
-			}
-			using (CallNonvirtualBase b = new CallNonvirtualDerived ()) {
-				b.Method ();
-				Assert.IsFalse (b.MethodInvoked);
-				Assert.IsTrue (((CallNonvirtualDerived) b).MethodInvoked);
-			}
-			using (var d2 = new CallNonvirtualDerived2 ()) {
-				d2.Method ();
-				Assert.IsTrue (((CallNonvirtualDerived) d2).MethodInvoked);
-				Assert.IsFalse (((CallNonvirtualBase) d2).MethodInvoked);
-			}
-		}
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
index b65e6f08412..3ae85674ca7 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
@@ -9,7 +9,6 @@ namespace Java.InteropTests
 {
 #if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
 	[TestFixture]
-	[Category ("TrimmableTypeMapUnsupported")]
 	public class TestTypeTests : JavaVMFixture
 	{
 		int lrefStartCount;
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java
deleted file mode 100644
index 02005c388b3..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/AnotherJavaInterfaceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.dot.jni.test;
-
-public class AnotherJavaInterfaceImpl
-	implements JavaInterface, Cloneable
-{
-	public String getValue() {
-		return "Another hello from Java!";
-	}
-
-	public Object clone() {
-		return this;
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java
deleted file mode 100644
index f4660d0cb87..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorBase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class CallVirtualFromConstructorBase implements GCUserPeerable {
-
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.CallVirtualFromConstructorBase, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public CallVirtualFromConstructorBase (int value) {
-		if (CallVirtualFromConstructorBase.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					"System.Int32",
-					value
-			);
-		}
-		calledFromConstructor (value);
-	}
-
-	public void calledFromConstructor (int value) {
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
-
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java
deleted file mode 100644
index 5ae143daf1c..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CallVirtualFromConstructorDerived.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class CallVirtualFromConstructorDerived
-		extends CallVirtualFromConstructorBase
-		implements GCUserPeerable
-{
-	static {
-		net.dot.jni.ManagedPeer.registerNativeMembers (
-				CallVirtualFromConstructorDerived.class,
-				"");
-	}
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public CallVirtualFromConstructorDerived (int value) {
-		super (value);
-		if (CallVirtualFromConstructorDerived.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					"(I)V",
-					value
-			);
-		}
-	}
-
-	public static CallVirtualFromConstructorDerived newInstance (int value)
-	{
-		return new CallVirtualFromConstructorDerived (value);
-	}
-
-	public native void calledFromConstructor (int value);
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
-
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java
deleted file mode 100644
index a2c915bfe77..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/CrossReferenceBridge.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class CrossReferenceBridge implements GCUserPeerable {
-
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.CrossReferenceBridge, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public CrossReferenceBridge () {
-		if (CrossReferenceBridge.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java
deleted file mode 100644
index d843e43a7c6..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase1.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class RenameClassBase1
-	implements GCUserPeerable
-{
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.RenameClassBase, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public RenameClassBase1 () {
-		System.out.println("RenameClassBase.<init>()");
-		if (RenameClassBase1.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	public int hashCode () {
-		System.out.println("RenameClassBase1.hashCode()");
-		return 16;
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java
deleted file mode 100644
index 562e15bff04..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassBase2.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class RenameClassBase2
-	extends RenameClassBase1
-	implements GCUserPeerable
-{
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.RenameClassBase, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public RenameClassBase2 () {
-		System.out.println("RenameClassBase.<init>()");
-		if (RenameClassBase2.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	public int hashCode () {
-		System.out.println("RenameClassBase2.hashCode()");
-		return 32;
-	}
-
-	public int myNewHashCode() {
-		System.out.println("RenameClassBase2.myNewHashCode()");
-		return 33;
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
diff --git a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java b/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java
deleted file mode 100644
index cfbe173f005..00000000000
--- a/external/Java.Interop/tests/Java.Interop-Tests/java/net/dot/jni/test/RenameClassDerived.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package net.dot.jni.test;
-
-import java.util.ArrayList;
-
-import net.dot.jni.GCUserPeerable;
-
-public class RenameClassDerived
-	extends RenameClassBase2        // Note: does NOT match C# binding!  This is "post Bytecode rewriting"
-	implements GCUserPeerable
-{
-	static  final   String  assemblyQualifiedName   = "Java.InteropTests.RenameClassDerived, Java.Interop-Tests";
-
-	ArrayList<Object>       managedReferences     = new ArrayList<Object>();
-
-	public RenameClassDerived () {
-		System.out.println("RenameClassDerived.<init>()");
-		if (RenameClassDerived.class == getClass ()) {
-			net.dot.jni.ManagedPeer.construct (
-					this,
-					assemblyQualifiedName,
-					""
-			);
-		}
-	}
-
-	// Note: while *at runtime* `RenameClassBase1` is replaced with `RenameClassBase2`,
-	// Java Callable Wrapper generator doesn't know about that (yet?), and thus the
-	// *original* method name will be present.
-	// Not sure if this is actually a problem; perhaps Bytecode rewriting happens *after*
-	// Java Callable Wrapper generation?
-	public int hashCode () {
-		System.out.println("RenameClassDerived.hashCode()");
-		return 64;
-	}
-
-	public void jiAddManagedReference (java.lang.Object obj)
-	{
-		managedReferences.add (obj);
-	}
-
-	public void jiClearManagedReferences ()
-	{
-		managedReferences.clear ();
-	}
-}
diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
index 280413dd93b..0f67a75f1a9 100644
--- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
+++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
@@ -37,10 +37,17 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
     <RuntimeHostConfigurationOption Include="IncludeCategories" Value="$(IncludeCategories)" Condition=" '$(IncludeCategories)' != '' " />
-    <!-- NUnit discovers fixtures through reflection, not through the application's call graph. -->
-    <TrimmerRootAssembly Include="$(AssemblyName)" RootMode="All" />
   </ItemGroup>
 
+  <!-- NUnit discovers these fixtures by reflection, including when the type map default is set late. -->
+  <Target Name="_AndroidRootJcwGenTests"
+      BeforeTargets="PrepareForILLink;_RunILLink"
+      Condition=" '$(Configuration)' == 'Release' and '$(PublishTrimmed)' == 'true' ">
+    <ItemGroup>
+      <TrimmerRootAssembly Include="$(AssemblyName)" RootMode="All" />
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <ProjectReference Include="..\..\TestRunner.Core\TestRunner.Core.NET.csproj" />
     <ProjectReference Include="..\Xamarin.Android.LegacyThresholdBinding\Xamarin.Android.LegacyThresholdBinding.csproj" />
diff --git a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
index 58dc9222be1..38c319b894c 100644
--- a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
+++ b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
@@ -30,24 +30,6 @@
     <Compile Remove="$(JavaInteropTestDirectory)obj\Release\net7.0-android/designtime/Resource.designer.cs" />
   </ItemGroup>
 
-  <!--
-    [JniAddNativeMethodRegistrationAttribute] is not supported under the trimmable
-    typemap (XA4251). Exclude the upstream Java.Interop fixtures that use it (and
-    their dependents) from the Android test assembly so the assembly can
-    compile through the generator. The matching NUnit test class is excluded by
-    name in tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs.
-  -->
-  <ItemGroup>
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\CallVirtualFromConstructorBase.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\CallVirtualFromConstructorDerived.cs" />
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\InvokeVirtualFromConstructorTests.cs" />
-  </ItemGroup>
-
-  <!-- ReflectionJniValueManager is unsupported by the trimmable typemap value manager. See dotnet/android#12221. -->
-  <ItemGroup>
-    <Compile Remove="$(JavaInteropTestDirectory)Java.Interop\JniRuntime.JniValueManagerTests.cs" />
-  </ItemGroup>
-
   <!-- Import Microsoft.NET.Sdk targets before our targets so we can override build/clean behavior -->
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <Import Project="Java.Interop-Tests.targets" />
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index 0d2ffad0efe..7ce9b9366d5 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(XamarinAndroidSourcePath)product.snk</AssemblyOriginatorKeyFile>
-    <_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>$(XamarinAndroidSourcePath)bin\Test$(Configuration)</OutputPath>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -89,17 +88,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="All" />
-    <TrimmerRootAssembly Include="Mono.Android-Test.Library.NET" RootMode="All" />
-    <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="All" />
     <TrimmerRootAssembly Include="StartupHook" RootMode="All" Condition=" '$(StartupHookSupport)' == 'true' " />
-    <TrimmerRootDescriptor Include="TrimmerRoots.xml" />
     <_AndroidRemapMembers Include="Remaps.xml" />
     <_AndroidRemapMembers Include="IsAssignableFromRemaps.xml" Condition=" '$(_AndroidIsAssignableFromCheck)' == 'false' " />
     <ProguardConfiguration Include="proguard.cfg" />
     <ProguardConfiguration Include="InterfaceCollection.proguard.cfg" />
   </ItemGroup>
 
+  <!-- NUnit discovers these tests by reflection even when the type map default is set late. -->
+  <Target Name="_AndroidRootRuntimeTests"
+      BeforeTargets="PrepareForILLink;_RunILLink;WriteIlcRspFileForCompilation">
+    <ItemGroup>
+      <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="All" />
+      <TrimmerRootAssembly Include="Mono.Android-Test.Library.NET" RootMode="All" />
+      <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="All" />
+      <TrimmerRootDescriptor Include="TrimmerRoots.xml" />
+    </ItemGroup>
+  </Target>
+
   <!--
     NativeAOT trims the closed-generic-instantiation metadata for IEquatable<T>,
     so NUnit's EquatablesComparer.GetEquatableImplementations() ends up calling
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml b/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml
index 349faad5fd4..b6b5b103226 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Remaps.xml
@@ -1,7 +1,4 @@
 <replacements>
-  <replace-type
-      from="net/dot/jni/test/RenameClassBase1"
-      to="net/dot/jni/test/RenameClassBase2" />
   <replace-type
       from="net/dot/jni/test/AndroidInterface"
       to="net/dot/jni/test/DesugarAndroidInterface$_CC" />
@@ -50,12 +47,6 @@
       source-method-name="remappedToGetRuntime"
       target-type="java/lang/Runtime"
       target-method-name="getRuntime" target-method-instance-to-static="false" />
-  <replace-method
-      source-type="net/dot/jni/test/RenameClassBase2"
-      source-method-name="hashCode"
-      source-method-signature="()"
-      target-type="net/dot/jni/test/RenameClassBase2"
-      target-method-name="myNewHashCode" target-method-instance-to-static="false" />
   <replace-method
       source-type="net/dot/android/remap/ManagedLookup"
       source-method-name="overload"
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
index 4d31aa19c0e..5f636409252 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/TestInstrumentation.cs
@@ -30,9 +30,6 @@ protected override IEnumerable<string>? ExcludedCategories {
 				categories.Add ("CoreCLRIgnore");
 				categories.Add ("NTLM");
 
-				categories.Add ("NativeTypeMap");
-				categories.Add ("TrimmableTypeMapUnsupported");
-
 				// Build-time flags flow in via runtimeconfig.json properties
 				// (see <RuntimeHostConfigurationOption> entries in Mono.Android.NET-Tests.csproj).
 				if (HasAppContextSwitch ("PublishAot")) {

From 86016faa8ce2f805348027fae54fd0f6c5bed553 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 21:24:32 +0200
Subject: [PATCH 57/58] Reuse built-in marshaler in attribute test

The demo marshaler was moved from a removed contract-test fixture solely to keep this constructor test compiling. Use the existing JniInt32ValueMarshaler instead.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../JniValueMarshalerAttributeTests.cs        | 56 +------------------
 1 file changed, 2 insertions(+), 54 deletions(-)

diff --git a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
index 6ef4b07b487..7a0c6fbcc29 100644
--- a/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
+++ b/external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 
 using Java.Interop;
 
@@ -16,59 +15,8 @@ public void Constructor ()
 			Assert.Throws<ArgumentNullException> (() => new JniValueMarshalerAttribute (null));
 			Assert.Throws<ArgumentException> (() => new JniValueMarshalerAttribute (typeof(int)));
 
-			var a   = new JniValueMarshalerAttribute (typeof (DemoValueTypeValueMarshaler));
-			Assert.AreEqual (a.MarshalerType, typeof (DemoValueTypeValueMarshaler));
-		}
-	}
-
-	[JniValueMarshaler (typeof (DemoValueTypeValueMarshaler))]
-	struct DemoValueType {
-		public int Value { get; }
-
-		public DemoValueType (int value)
-		{
-			Value = value;
-		}
-	}
-
-	class DemoValueTypeValueMarshaler : JniValueMarshaler<DemoValueType> {
-
-		JniValueMarshaler<int> Int32Marshaler;
-
-		public override bool IsJniValueType => Int32Marshaler.IsJniValueType;
-
-		public DemoValueTypeValueMarshaler ()
-		{
-			Int32Marshaler = JniRuntime.CurrentRuntime.ValueManager.GetValueMarshaler<int> ();
-		}
-
-		public override DemoValueType CreateGenericValue (
-			ref JniObjectReference reference,
-			JniObjectReferenceOptions options,
-			Type targetType)
-		{
-			var value = Int32Marshaler.CreateGenericValue (ref reference, options, typeof (int));
-			return new DemoValueType (value);
-		}
-
-		public override JniValueMarshalerState CreateGenericArgumentState (DemoValueType value, ParameterAttributes synchronize)
-		{
-			return Int32Marshaler.CreateGenericArgumentState (value.Value, synchronize);
-		}
-
-		public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (DemoValueType value, ParameterAttributes synchronize)
-		{
-			return Int32Marshaler.CreateGenericObjectReferenceArgumentState (value.Value, synchronize);
-		}
-
-		public override void DestroyArgumentState (object value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
-		{
-			Int32Marshaler.DestroyArgumentState ((value as DemoValueType?)?.Value, ref state, synchronize);
-		}
-
-		public override void DestroyGenericArgumentState (DemoValueType value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
-		{
-			Int32Marshaler.DestroyGenericArgumentState (value.Value, ref state, synchronize);
+			var a   = new JniValueMarshalerAttribute (typeof (JniInt32ValueMarshaler));
+			Assert.AreEqual (a.MarshalerType, typeof (JniInt32ValueMarshaler));
 		}
 	}
 }

From 7602e7b2ad272bca7a2b25cc76a98687b5b8968a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 5 Oct 2026 21:29:33 +0200
Subject: [PATCH 58/58] Keep test roots at project evaluation

With trimmable as the only supported type map, NUnit roots no longer need late target hooks. Retain the existing roots at evaluation so NativeAOT ILC and ILLink both receive them.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Xamarin.Android.JcwGen-Tests.csproj           | 11 ++---------
 .../Mono.Android.NET-Tests.csproj                 | 15 ++++-----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
index 0f67a75f1a9..280413dd93b 100644
--- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
+++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
@@ -37,17 +37,10 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
     <RuntimeHostConfigurationOption Include="IncludeCategories" Value="$(IncludeCategories)" Condition=" '$(IncludeCategories)' != '' " />
+    <!-- NUnit discovers fixtures through reflection, not through the application's call graph. -->
+    <TrimmerRootAssembly Include="$(AssemblyName)" RootMode="All" />
   </ItemGroup>
 
-  <!-- NUnit discovers these fixtures by reflection, including when the type map default is set late. -->
-  <Target Name="_AndroidRootJcwGenTests"
-      BeforeTargets="PrepareForILLink;_RunILLink"
-      Condition=" '$(Configuration)' == 'Release' and '$(PublishTrimmed)' == 'true' ">
-    <ItemGroup>
-      <TrimmerRootAssembly Include="$(AssemblyName)" RootMode="All" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <ProjectReference Include="..\..\TestRunner.Core\TestRunner.Core.NET.csproj" />
     <ProjectReference Include="..\Xamarin.Android.LegacyThresholdBinding\Xamarin.Android.LegacyThresholdBinding.csproj" />
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index 7ce9b9366d5..d8127037c51 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -88,24 +88,17 @@
   </ItemGroup>
 
   <ItemGroup>
+    <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="All" />
+    <TrimmerRootAssembly Include="Mono.Android-Test.Library.NET" RootMode="All" />
+    <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="All" />
     <TrimmerRootAssembly Include="StartupHook" RootMode="All" Condition=" '$(StartupHookSupport)' == 'true' " />
+    <TrimmerRootDescriptor Include="TrimmerRoots.xml" />
     <_AndroidRemapMembers Include="Remaps.xml" />
     <_AndroidRemapMembers Include="IsAssignableFromRemaps.xml" Condition=" '$(_AndroidIsAssignableFromCheck)' == 'false' " />
     <ProguardConfiguration Include="proguard.cfg" />
     <ProguardConfiguration Include="InterfaceCollection.proguard.cfg" />
   </ItemGroup>
 
-  <!-- NUnit discovers these tests by reflection even when the type map default is set late. -->
-  <Target Name="_AndroidRootRuntimeTests"
-      BeforeTargets="PrepareForILLink;_RunILLink;WriteIlcRspFileForCompilation">
-    <ItemGroup>
-      <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="All" />
-      <TrimmerRootAssembly Include="Mono.Android-Test.Library.NET" RootMode="All" />
-      <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="All" />
-      <TrimmerRootDescriptor Include="TrimmerRoots.xml" />
-    </ItemGroup>
-  </Target>
-
   <!--
     NativeAOT trims the closed-generic-instantiation metadata for IEquatable<T>,
     so NUnit's EquatablesComparer.GetEquatableImplementations() ends up calling