Skip to content

[NativeAOT] Remove managed NativeAOT type map in favor of the trimmable type map #11643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
simonrozsival wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[NativeAOT] Remove managed NativeAOT type map in favor of the trimmable type map #11643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a698b95
Remove managed NativeAOT type map
simonrozsival Jun 12, 2026
aee45d5
Address NativeAOT typemap review feedback
simonrozsival Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Microsoft.Android.Runtime.NativeAOT/Java.Interop/JreRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ static NativeAotRuntimeOptions CreateJreVM (NativeAotRuntimeOptions builder)
builder.EnvironmentPointer == IntPtr.Zero &&
string.IsNullOrEmpty (builder.JvmLibraryPath))
throw new InvalidOperationException ($"Member `{nameof (NativeAotRuntimeOptions)}.{nameof (NativeAotRuntimeOptions.JvmLibraryPath)}` must be set.");
if (!RuntimeFeature.TrimmableTypeMap) {
throw new NotSupportedException ("NativeAOT requires the trimmable typemap.");
}

#if NET
builder.TypeManager ??= CreateDefaultTypeManager ();
Expand All @@ -77,11 +80,11 @@ internal protected JreRuntime (NativeAotRuntimeOptions builder)

static JniRuntime.JniTypeManager CreateDefaultTypeManager ()
{
if (RuntimeFeature.TrimmableTypeMap) {
return new TrimmableTypeMapTypeManager ();
if (!RuntimeFeature.TrimmableTypeMap) {
throw new NotSupportedException ("NativeAOT requires the trimmable typemap.");
Comment on lines +83 to +84

@github-actions github-actions Bot Jun 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 💡 Code organization — This guard is unreachable. CreateJreVM (line 59–61) already throws NotSupportedException before builder.TypeManager ??= CreateDefaultTypeManager() on line 64 can execute. The duplicate check is harmless but adds dead code. Consider removing it and just keeping the unconditional return new TrimmableTypeMapTypeManager().

Rule: Remove unused code (Postmortem #58)

}

return new ManagedTypeManager ();
return new TrimmableTypeMapTypeManager ();
}

public override string? GetCurrentManagedThreadName ()
Expand Down
5 changes: 0 additions & 5 deletions src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil\MethodDefinitionRocks.cs" Link="Java.Interop\MethodDefinitionRocks.cs" />
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil\TypeDefinitionCache.cs" Link="Java.Interop\TypeDefinitionCache.cs" />
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil\TypeDefinitionRocks.cs" Link="Java.Interop\TypeDefinitionRocks.cs" />
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.cs" />
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64.Table.cs" />
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers\Crc64Helper.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Utilities\MonoAndroidHelper.Linker.cs" Link="Utilities\MonoAndroidHelper.Linker.cs" />
</ItemGroup>
<Import Project="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" />
<Import Project="..\..\external\Java.Interop\src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" />
<ItemGroup>
<Folder Include="Java.Interop\" />
<Folder Include="Utilities\" />
Expand Down
Loading
Loading