Skip to content

Remove the managed typemap implementation #12134

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

Merged
jonathanpeppers merged 6 commits into from
Jul 20, 2026
Merged

Remove the managed typemap implementation #12134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6e1ce2
Remove the "managed" typemap implementation
simonrozsival Jul 16, 2026
a647cf3
Remove the managed marshal methods lookup feature
simonrozsival Jul 16, 2026
c107421
Merge remote-tracking branch 'origin/main' into android-remove-manage…
simonrozsival Jul 17, 2026
84541ad
Restore JNIEnvInit interop import
simonrozsival Jul 17, 2026
917a1be
Merge origin/main into android-remove-managed-type-map
Copilot Jul 17, 2026
287b924
Merge branch 'main' into android-remove-managed-type-map
simonrozsival Jul 17, 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
4 changes: 2 additions & 2 deletions .github/copilot-instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,13 @@ When diagnosing runtime, build, or test failures, follow these practices. They e
make prepare && make all CONFIGURATION=Release
./dotnet-local.sh build -t:Install -c Release \
tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj \
-p:_AndroidTypeMapImplementation=<llvm-ir|managed|trimmable> \
-p:_AndroidTypeMapImplementation=<llvm-ir|trimmable> \
-p:UseMonoRuntime=<true|false>
(
cd tests/Mono.Android-Tests/Mono.Android-Tests
../../../dotnet-local.sh test Mono.Android.NET-Tests.csproj --no-build -c Release \
--report-trx --results-directory ../../../bin/TestRelease/TestResults \
-p:_AndroidTypeMapImplementation=<llvm-ir|managed|trimmable> \
-p:_AndroidTypeMapImplementation=<llvm-ir|trimmable> \
-p:UseMonoRuntime=<true|false>
)
```
Expand Down
10 changes: 1 addition & 9 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 @@ -77,15 +77,7 @@ internal protected JreRuntime (NativeAotRuntimeOptions builder)

static JniRuntime.JniTypeManager CreateDefaultTypeManager ()
{
if (RuntimeFeature.TrimmableTypeMap) {
return new TrimmableTypeMapTypeManager ();
}

return CreateManagedTypeManager ();

[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "Managed type manager is preserved by the MarkJavaObjects trimmer step.")]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This type manager won't be used in Native AOT builds in the future.")]
static JniRuntime.JniTypeManager CreateManagedTypeManager () => new ManagedTypeManager ();
return new TrimmableTypeMapTypeManager ();
}

[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "CoreCLR value manager is preserved by the MarkJavaObjects trimmer step.")]
Expand Down
Loading
Loading