Uh oh!
There was an error while loading. Please reload this page.
This repository was archived by the owner on Aug 27, 2026. It is now read-only.
Remove $(AndroidGenerateJniMarshalMethods) support - #1405
Merged
jonathanpeppers merged 5 commits intoApr 27, 2026
Merged
Conversation
Delete the jnimarshalmethod-gen tool, Java.Interop.Export library, Java.Interop.Export-Tests, and Java.Interop.Tools.Expressions projects. All public APIs in Java.Interop.dll (JniMarshalMemberBuilder, CreationOptions.UseMarshalMemberBuilder, etc.) are retained but marked [Obsolete] with no-op implementations. Runtime code in JreTypeManager, ManagedValueManager, and MonoRuntimeValueManager is simplified to remove MarshalMemberBuilder fallback paths. NativeAOT samples, Makefile, and CI pipeline are updated accordingly. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers added a commit
to dotnet/android
that referenced
this pull request
Apr 16, 2026
Bump \�xternal/Java.Interop\ to dotnet/java-interop#1405, which removes \Java.Interop.Export\, \jnimarshalmethod-gen\, and \Java.Interop.Tools.Expressions\. Changes in dotnet/android: - Remove \UseMarshalMemberBuilder = false\ from AndroidRuntime and NativeAOT JavaInteropRuntime (property is now obsolete/no-op). - Remove deleted \Java.Interop.Export\ and \Xamarin.Android.Tools.JniMarshalMethodGenerator\ projects from \Xamarin.Android.sln\. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…eManager trim warnings - JreTypeManager: Simplify RegisterNativeMembers to return early when methods is empty (types like JavaProxyThrowable register with no methods), and throw for non-empty methods without static registration. - MonoRuntimeValueManager: Add trim suppression attributes for GetUninitializedObject call to fix NativeAOT publish errors. - Java.Base-Tests: Add explicit marshal methods and static registration to MyRunnable and MyIntConsumer test types, since dynamic marshal method generation via MarshalMemberBuilder is no longer available. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppersforce-pushed
the
jonathanpeppers/dev-peppers-remove-jni-marshal-methods
branch
from
April 17, 2026 13:51
01256d8 to
5cb82cdCompare…hal methods ManagedType.cs used [JavaCallable] attributes which relied on the now-removed jnimarshalmethod-gen tool. Replace with explicit n_* marshal methods and [JniAddNativeMethodRegistration] static registration. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ration jcw-gen uses Cecil to find [JavaCallable] and [JavaCallableConstructor] by attribute name to emit Java-side methods. These attributes must still exist at compile time for the JCW to include getString() and the constructor. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
NativeAOT requires delegate types used for JNI callbacks to have [UnmanagedFunctionPointer] for proper marshalling data generation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers added a commit
to dotnet/android
that referenced
this pull request
Apr 22, 2026
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers added a commit
to dotnet/android
that referenced
this pull request
Apr 22, 2026
…et/java-interop#1405 - Remove UseMarshalMemberBuilder = false from AndroidRuntime and NativeAOT JavaInteropRuntime (property is now obsolete/no-op). - Remove deleted Java.Interop.Export and Xamarin.Android.Tools.JniMarshalMethodGenerator projects from Xamarin.Android.sln. - Bump external/Java.Interop submodule to PR 1405 head. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers
commented
Apr 23, 2026
MemberAuthor
The dotnet/android test PR looks OK: There are some flaky tests, but everything builds. |
There was a problem hiding this comment.
Pull request overview
This PR removes the legacy $(AndroidGenerateJniMarshalMethods)-driven marshal-method generation infrastructure from java-interop, aligning with the earlier removal in dotnet/android, while keeping the public surface area in Java.Interop.dll as [Obsolete] stubs that now throw NotSupportedException.
Changes:
- Removes the
jnimarshalmethod-gentool and theJava.Interop.Export/Java.Interop.Tools.Expressionsprojects (plus associated tests and pipeline hooks). - Simplifies runtime activation/registration paths to rely on reflection and explicit
[JniAddNativeMethodRegistration]patterns instead ofMarshalMemberBuilder. - Updates samples and tests to no longer depend on
Java.Interop.Exportand generated marshal methods.
Reviewed changes
Copilot reviewed 44 out of 46 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| tools/jnimarshalmethod-gen/Xamarin.Android.Tools.JniMarshalMethodGenerator.csproj | Deletes the marshal-method generator tool project. |
| tools/jnimarshalmethod-gen/TypeMover.cs | Removes type-moving logic used by the generator. |
| tools/jnimarshalmethod-gen/Message.cs | Removes generator-specific localized messages. |
| tools/jnimarshalmethod-gen/App.cs | Removes generator app entrypoint and processing pipeline. |
| tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop/JavaCallableConstructorAttribute.cs | Adds local test-only attribute type to replace removed Export assembly dependency. |
| tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop/JavaCallableAttribute.cs | Adds local test-only attribute type to replace removed Export assembly dependency. |
| tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj | Stops compiling attribute sources from Java.Interop.Export. |
| tests/Java.Interop.Tools.Expressions-Tests/Usings.cs | Removes global using as the Expressions test project is removed. |
| tests/Java.Interop.Tools.Expressions-Tests/Java.Interop.Tools.ExpressionsTests/ExpressionAssemblyBuilderTests.cs | Deletes tests for the removed Expressions toolchain. |
| tests/Java.Interop.Tools.Expressions-Tests/Java.Interop.Tools.Expressions-Tests.csproj | Deletes the Expressions test project. |
| tests/Java.Interop.Export-Tests/java/net/dot/jni/test/UseJavaCallableExample.java | Deletes Export test Java sources. |
| tests/Java.Interop.Export-Tests/java/net/dot/jni/test/ExportType.java | Deletes Export test Java sources. |
| tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs | Deletes Export/MarshalMemberBuilder test coverage. |
| tests/Java.Interop.Export-Tests/Java.Interop/JavaVMFixture.cs | Deletes fixture used only by Export tests. |
| tests/Java.Interop.Export-Tests/Java.Interop/JavaCallableExampleTests.cs | Deletes JavaCallable example tests tied to Export infra. |
| tests/Java.Interop.Export-Tests/Java.Interop/JavaCallableExample.cs | Deletes JavaCallable example type tied to Export infra. |
| tests/Java.Interop.Export-Tests/Java.Interop/ExportTest.cs | Deletes ExportTest type which relied on MarshalMemberBuilder. |
| tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.targets | Deletes MSBuild targets used to build Export test jar and wrappers. |
| tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj | Deletes Export tests project. |
| tests/Java.Interop-Tests/Java.Interop/TestType.cs | Stops using MarshalMemberBuilder.CreateMarshalToManagedDelegate(); returns existing delegate directly. |
| tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs | Removes ProxyMarshalMemberBuilder test shim as marshal builder is no longer supported. |
| tests/Java.Base-Tests/Java.Base/JavaToManagedTests.cs | Adds explicit native registration methods instead of relying on marshal builder infrastructure. |
| src/Java.Runtime.Environment/Java.Runtime.Environment.csproj | Removes project reference to Java.Interop.Export. |
| src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs | Switches activation to reflection-based creation instead of CreateConstructActivationPeerFunc(). |
| src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs | Removes marshal-member-builder activation branch; always uses reflection path. |
| src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs | Removes marshal-member-builder fallback; now throws if registration isn’t handled explicitly. |
| src/Java.Interop/Java.Interop/JniRuntime.cs | Removes initialization/disposal of marshal member builder. |
| src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs | Obsoletes marshal member builder APIs; replaces behavior with NotSupportedException. |
| src/Java.Interop/GlobalSuppressions.cs | Drops suppression for removed IsDirectMethod analyzer case. |
| src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/ExpressionMethodRegistration.cs | Deletes Expressions helper type. |
| src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/ExpressionAssemblyBuilder.cs | Deletes Expressions-to-IL compiler utility. |
| src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/CecilCompilerExpressionVisitor.cs | Deletes Expressions-to-IL compiler visitor. |
| src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions.csproj | Deletes Expressions project. |
| src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs | Deletes Export-side MarshalMemberBuilder implementation. |
| src/Java.Interop.Export/Java.Interop.Export.csproj | Deletes Export assembly project. |
| samples/Hello-NativeAOTFromJNI/ManagedType.cs | Adds explicit native registration/marshal method stub instead of post-build generator. |
| samples/Hello-NativeAOTFromJNI/JavaInteropRuntime.cs | Removes UseMarshalMemberBuilder=false usage. |
| samples/Hello-NativeAOTFromJNI/JavaCallableAttributes.cs | Adds local attribute definitions for the sample (no Export dependency). |
| samples/Hello-NativeAOTFromJNI/Hello-NativeAOTFromJNI.targets | Removes post-build _AddMarshalMethods target. |
| samples/Hello-NativeAOTFromJNI/Hello-NativeAOTFromJNI.csproj | Removes references to Export + jnimarshalmethod-gen tool projects. |
| samples/Hello-NativeAOTFromAndroid/JavaInteropRuntime.cs | Removes UseMarshalMemberBuilder=false usage. |
| samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.targets | Removes _AddMarshalMethods target and dependency ordering. |
| samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.csproj | Removes references to Export + jnimarshalmethod-gen tool projects. |
| build-tools/automation/templates/core-tests.yaml | Removes CI steps that ran Export tests and marshal-method generator. |
| Makefile | Removes Export test target and jnimarshalmethod-gen test recipe. |
| Java.Interop.sln | Removes Export/Expressions/tool projects from the solution. |
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
jonathanpeppers
deleted the
jonathanpeppers/dev-peppers-remove-jni-marshal-methods
branch
April 27, 2026 17:20
jonathanpeppers added a commit
to dotnet/android
that referenced
this pull request
Apr 27, 2026
…et/java-interop#1405 - Remove UseMarshalMemberBuilder = false from AndroidRuntime and NativeAOT JavaInteropRuntime (property is now obsolete/no-op). - Remove deleted Java.Interop.Export and Xamarin.Android.Tools.JniMarshalMethodGenerator projects from Xamarin.Android.sln. - Bump external/Java.Interop submodule to PR 1405 head. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers added a commit
to dotnet/android
that referenced
this pull request
Apr 28, 2026
### Remove UseMarshalMemberBuilder and bump external/Java.Interop to dotnet/java-interop#1405 - Remove UseMarshalMemberBuilder = false from AndroidRuntime and NativeAOT JavaInteropRuntime (property is now obsolete/no-op). - Remove deleted Java.Interop.Export and Xamarin.Android.Tools.JniMarshalMethodGenerator projects from Xamarin.Android.sln. - Bump external/Java.Interop submodule to PR 1405 head. ### Copy java-interop.jar to SDK output directory Add a ProjectReference to Java.Interop.csproj (with ReferenceOutputAssembly=false) from Xamarin.Android.Build.Tasks.csproj so that `java-interop.jar` (a Content item in Java.Interop.csproj) gets copied to the output directory. Previously this happened transitively through Java.Interop.Export which is now deleted. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival added a commit
to dotnet/android
that referenced
this pull request
May 11, 2026
…emap [JniAddNativeMethodRegistrationAttribute] is a legacy Java.Interop API whose primary consumer — the jnimarshalmethod-gen build-time generator — was removed in dotnet/java-interop#1405. The trimmable typemap deliberately does not support this attribute. When the scanner detects the attribute on any method, the generator emits XA4251 telling the developer to either avoid it or switch off the trimmable typemap (for example, by using the 'llvm-ir' type map implementation) and report the scenario at https://github.com/dotnet/android/issues. The build fails via TaskLoggingHelper.HasLoggedErrors. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers added a commit
to dotnet/android
that referenced
this pull request
May 14, 2026
…ith XA4251 (#11274) ### Use trimmable Java proxy runtime sources Add trimmable-specific java_runtime jars that replace Java.Interop's JavaProxyObject and JavaProxyThrowable sources only for the trimmable typemap path. Keep the existing runtime jars on Java.Interop's native-registration behavior and select the trimmable jars when _AndroidTypeMapImplementation is trimmable. Re-enable the affected Java.Interop runtime tests and add focused coverage for JavaProxyObject marshaling/object methods under the trimmable typemap path. ### Use trimmable virtual-constructor fixtures Enable the Java.Interop virtual-constructor tests in the trimmable typemap lane by swapping in Android-owned Java fixtures that use Runtime.registerNatives and generated n_* callbacks instead of ManagedPeer. Teach the trimmable typemap scanner/model to emit native registrations for hand-written Java peers that opt into JniAddNativeMethodRegistrationAttribute. ### Address Java proxy review comments Use repository Java formatting for trimmable proxy sources and strengthen the proxy hashCode test so it compares against Java identityHashCode instead of itself. ### Simplify trimmable runtime artifacts Drop stale _net6 Java runtime artifact names and collapse the trimmable runtime jar/dex to a single shared artifact for CoreCLR and NativeAOT. ### Drop unrelated obsolete-jar cleanup from java-runtime.targets and TrimmableTypeMapBuildTests This cleanup is not related to fixing InvokeVirtualFromConstructorTests and belongs in a separate change. ### Refuse [JniAddNativeMethodRegistrationAttribute] in the trimmable typemap [JniAddNativeMethodRegistrationAttribute] is a legacy Java.Interop API whose primary consumer — the jnimarshalmethod-gen build-time generator — was removed in dotnet/java-interop#1405. The trimmable typemap deliberately does not support this attribute. When the scanner detects the attribute on any method, the generator emits XA4251 telling the developer to either avoid it or switch off the trimmable typemap (for example, by using the 'llvm-ir' type map implementation) and report the scenario at https://github.com/dotnet/android/issues. The build fails via TaskLoggingHelper.HasLoggedErrors. ### Move XA4251 reporting into JavaPeerScanner Address review feedback: - Drop JavaPeerInfo.HasJniAddNativeMethodRegistrationAttribute. The scanner now takes an optional ITrimmableTypeMapLogger and reports XA4251 directly when it encounters the attribute, instead of propagating a bool the rest of the pipeline doesn't otherwise need. - Drop the orchestrator's post-scan loop; TrimmableTypeMapGenerator just passes its logger into JavaPeerScanner. - Reset external/Java.Interop and external/xamarin-android-tools to the SHAs on main; this PR doesn't need either submodule moved. ### Restore tests/Mono.Android-Tests/Java.Interop-Tests/java-trimmable/net/dot/jni/test/GetThis.java This file is unrelated to the XA4251 work; it was accidentally removed during an earlier 'git rm -r java-trimmable' cleanup. It's still needed by JavaObjectTest.DisposeAccessesThis under the trimmable typemap. ### Exclude InvokeVirtualFromConstructor fixtures for trimmable The upstream Java.Interop test fixture CallVirtualFromConstructorDerived uses [JniAddNativeMethodRegistrationAttribute]. Now that the trimmable typemap refuses that attribute with XA4251, the offending sources need to be excluded from the test assembly when building for the trimmable type map; otherwise the build cannot reach the device tests at all. Validated locally: ANDROID_SERIAL=emulator-5554 MSBUILDDISABLENODEREUSE=1 \ ./dotnet-local.sh build \ tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj \ -t:RunTestApp -c Release \ -p:_AndroidTypeMapImplementation=trimmable \ -p:UseMonoRuntime=false -nr:false -m:1 TestResult-Mono.Android.NET_Tests-ReleaseCoreCLRTrimmable.xml: 888 total, 0 errors, 0 failures, 21 ignored. ### Detect [JniAddNativeMethodRegistrationAttribute] on non-peer types too Code-review caught that the prior placement of the XA4251 check sat *after* the scanner's per-type filtering, so a type carrying the attribute but no [Register] (and not extending a Java peer) would slip past the diagnostic and the build would silently succeed. Hoist the check to immediately after the <Module> skip so it fires uniformly for every non-<Module> type, regardless of whether the type would otherwise have been added to the typemap. Add a NonPeerNativeRegistration fixture to the scanner test to guard the regression. ### Skip per-method XA4251 walk when assembly doesn't reference the attribute Address Copilot reviewer feedback on the per-type method-attribute walk. AssemblyIndex.Build now does a cheap pass over the TypeReferences and TypeDefinitions tables to set MayUseJniAddNativeMethodRegistrationAttribute, and the scanner short-circuits the per-method walk in the overwhelmingly common case where the assembly neither imports nor declares the attribute. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context: dotnet/android@4296716
Summary
Remove the
$(AndroidGenerateJniMarshalMethods)infrastructure from java-interop, which was already removed from dotnet/android.44 files changed, 54 insertions, 5,513 deletions
What's removed
tools/jnimarshalmethod-gen/— the marshal method generator toolsrc/Java.Interop.Export/—MarshalMemberBuilderimplementation +[JavaCallable]attributestests/Java.Interop.Export-Tests/— tests for the abovesrc/Java.Interop.Tools.Expressions/— Expression-to-IL compiler used only by jnimarshalmethod-gentests/Java.Interop.Tools.Expressions-Tests/— tests for the aboveWhat's kept (marked
[Obsolete])All public APIs in
Java.Interop.dllare retained but obsoleted:CreationOptions.UseMarshalMemberBuilderCreationOptions.MarshalMemberBuilderJniRuntime.MarshalMemberBuilderJniRuntime.JniMarshalMemberBuilderabstract class + all membersNon-abstract methods now throw
NotSupportedException.Runtime simplification
JreTypeManager.RegisterNativeMembers— removed the MarshalMemberBuilder fallback path; now throws ifTryRegisterNativeMembersfailsManagedValueManager.ActivatePeer— always uses reflection activationMonoRuntimeValueManager.ActivatePeer— uses reflection activation instead ofMarshalMemberBuilder.CreateConstructActivationPeerFuncdotnet/android impact
dotnet/android sets
UseMarshalMemberBuilder = falsein two places. After this change, those lines should be removed (they'll generate[Obsolete]warnings):src/Mono.Android/Android.Runtime/AndroidRuntime.cssrc/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.csBuild & test