Remove $(AndroidGenerateJniMarshalMethods) support#11135
Open
jonathanpeppers wants to merge 2 commits intomainfrom
Open
Remove $(AndroidGenerateJniMarshalMethods) support#11135jonathanpeppers wants to merge 2 commits intomainfrom
$(AndroidGenerateJniMarshalMethods) support#11135jonathanpeppers wants to merge 2 commits intomainfrom
Conversation
jonathanpeppers
force-pushed
the
jonathanpeppers/dev-peppers-remove-jnimm-support
branch
3 times, most recently
from
9419b85 to
8b0e86e
Compare
Member
Author
|
/azp run Xamarin.Android-PR |
|
No pipelines are associated with this pull request. |
…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>
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>
jonathanpeppers
force-pushed
the
jonathanpeppers/dev-peppers-remove-jnimm-support
branch
from
8b0e86e to
8445f5e
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates dotnet/android to accommodate upstream removals in external/Java.Interop (dotnet/java-interop#1405), specifically dropping legacy marshal-method generation components and removing now-obsolete runtime configuration.
Changes:
- Add a non-output
ProjectReferencetoJava.Interop.csprojfromXamarin.Android.Build.Tasksto ensure build ordering after the Java.Interop repo changes. - Remove
UseMarshalMemberBuilder = falseinitialization from both the Mono runtime (AndroidRuntime) and NativeAOT runtime (JavaInteropRuntime) paths (property is now obsolete/no-op upstream). - Remove deleted
Java.Interop.ExportandXamarin.Android.Tools.JniMarshalMethodGeneratorprojects fromXamarin.Android.sln.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj |
Ensures Java.Interop project is built as part of the build-tasks dependency graph after upstream removals. |
src/Mono.Android/Android.Runtime/AndroidRuntime.cs |
Drops obsolete/no-op UseMarshalMemberBuilder initialization from runtime options. |
src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs |
Drops obsolete/no-op UseMarshalMemberBuilder initialization from NativeAOT runtime options. |
Xamarin.Android.sln |
Removes solution entries for projects deleted upstream in external/Java.Interop. |
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Bump
external/Java.Interopto dotnet/java-interop#1405, which removesJava.Interop.Export,jnimarshalmethod-gen, andJava.Interop.Tools.Expressions.Changes in dotnet/android:
UseMarshalMemberBuilder = falsefromAndroidRuntimeand NativeAOTJavaInteropRuntime(property is now obsolete/no-op in Java.Interop).Java.Interop.ExportandXamarin.Android.Tools.JniMarshalMethodGeneratorprojects fromXamarin.Android.sln.