Skip to content

[TrimmableTypeMap] Add GetStaticMethodFallbackTypesCore override for desugared default interface methods #11050

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
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −0
Draft

[TrimmableTypeMap] Add GetStaticMethodFallbackTypesCore override for desugared default interface methods #11050

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
830af19
Initial plan
Copilot Mar 30, 2026
c0a25a0
Add GetStaticMethodFallbackTypesCore override to TrimmableTypeMapType…
Copilot Mar 31, 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
12 changes: 12 additions & 0 deletions src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
return base.GetInvokerTypeCore (type);
}

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",
};
}

public override void RegisterNativeMembers (
JniType nativeClass,
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
Expand Down