Conversation
|
@copilot continue |
…Manager Agent-Logs-Url: https://github.com/dotnet/android/sessions/1eb1fc88-df89-4cb7-bd45-15187eea3776 Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>
Added the |
There was a problem hiding this comment.
Pull request overview
Adds support in the trimmable typemap runtime type manager for resolving Java 8+ desugared default interface method companion classes during JNI static method lookup, preventing runtime NoSuchMethodError when default interface methods are used.
Changes:
- Added
GetStaticMethodFallbackTypesCore()override toTrimmableTypeMapTypeManager. - Implemented desugar companion-class fallback name generation (
Desugar{Type}$_CCand{Type}$-CC) consistent withManagedTypeManager.
| protected override IReadOnlyList<string>? GetStaticMethodFallbackTypesCore (string jniSimpleReference) | ||
| { | ||
| int slash = jniSimpleReference.LastIndexOf ('/'); | ||
| var desugarType = slash > 0 | ||
| ? $"{jniSimpleReference.Substring (0, slash + 1)}Desugar{jniSimpleReference.Substring (slash + 1)}" | ||
| : $"Desugar{jniSimpleReference}"; | ||
| return new[] { | ||
| $"{desugarType}$_CC", | ||
| $"{jniSimpleReference}$-CC", | ||
| }; | ||
| } |
There was a problem hiding this comment.
@copilot we are missing a new test to verify this code path works.
There was a problem hiding this comment.
Added tests in b8d9cca. The new TrimmableTypeMapTypeManagerTests class in tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/TrimmableTypeMapTypeManagerTests.cs creates a subclass of TrimmableTypeMapTypeManager (accessible via the existing InternalsVisibleTo in Mono.Android) and verifies the fallback type generation for three cases: type with a package name, type without a package name, and type with a deep package hierarchy.
…Core Agent-Logs-Url: https://github.com/dotnet/android/sessions/66cf81ea-433f-43ac-8c85-45bb0483a230 Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>
Adds
GetStaticMethodFallbackTypesCoreoverride toTrimmableTypeMapTypeManagerto support Java 8+ default interface methods desugared by D8/R8.Problem
TrimmableTypeMapTypeManagerdid not overrideGetStaticMethodFallbackTypesCore(). Without this, calls to desugared default interface methods fail withNoSuchMethodErrorat runtime when using the trimmable type map. This affects any app using Java libraries with default interface methods (Java 8+ feature, very common in modern Android libraries like AndroidX).Fix
Added the same override that already exists in
ManagedTypeManagertoTrimmableTypeMapTypeManager:This generates two fallback type names for desugared companion classes (
Desugar{Type}$_CCand{Type}$-CC) so that JNI static method lookups on desugared default interface methods succeed at runtime.Tests
Added
TrimmableTypeMapTypeManagerTeststotests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/to verify the fallback type generation. The tests use a subclass ofTrimmableTypeMapTypeManager(accessible via the existingInternalsVisibleToinMono.Android) and cover three cases:android/app/Activity)Activity)com/example/package/MyInterface)