[TrimmableTypeMap] Manifest rooting and deferred registration propagation#11097
Merged
simonrozsival merged 2 commits intodev/simonrozsival/trimmable-scanner-jcw-fixesfrom Apr 10, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR extends the trimmable typemap generator pipeline to be manifest-aware: it roots manifest-referenced components (including placeholder/substitution handling), promotes compat JNI names so generated JCW names match manifest declarations, and propagates deferred registerNatives behavior through managed base hierarchies for Application/Instrumentation types.
Changes:
- Root manifest-referenced component types as unconditional (with placeholder resolution) and log/warn for unresolved types (XA4250).
- Promote compat JNI names for manifest-rooted components so generated JCW class names align with manifest entries.
- Propagate deferred registration (
CannotRegisterInStaticConstructor) to generated managed base types and default instrumentationtargetPackage.
Reviewed changes
Copilot reviewed 11 out of 12 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs | Adds unit tests for manifest rooting, placeholder resolution, compat name promotion, deferred registration propagation, and unresolved-type warnings. |
| tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ManifestGeneratorTests.cs | Adds a test ensuring instrumentation defaults targetPackage to the manifest package. |
| src/Xamarin.Android.Build.Tasks/Tasks/GenerateTrimmableTypeMap.cs | Implements new typed logger methods: XA4250 warning + info logging for manifest rooting. |
| src/Xamarin.Android.Build.Tasks/Properties/Resources.resx | Adds localized string for XA4250. |
| src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs | Updates generated resource accessor for XA4250. |
| src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs | Adds manifest-rooting + placeholder prep, compat-JNI promotion, and deferred registration propagation logic. |
| src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerInfo.cs | Makes several properties mutable to support post-scan manifest rooting and propagation. |
| src/Microsoft.Android.Sdk.TrimmableTypeMap/ITrimmableTypeMapLogger.cs | Extends logger interface with unresolved-type warning + manifest-rooting info message. |
| src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs | Passes package name into instrumentation generation and simplifies placeholder application. |
| src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ComponentElementBuilder.cs | Defaults instrumentation targetPackage when missing. |
| Documentation/docs-mobile/messages/xa4250.md | Adds documentation page for XA4250 warning. |
| Documentation/docs-mobile/messages/index.md | Adds XA4250 to the messages index. |
Files not reviewed (1)
- src/Xamarin.Android.Build.Tasks/Properties/Resources.Designer.cs: Language not supported
Comment on lines
+195
to
+208
| foreach (var name in componentNames) { | ||
| if (peersByDotName.TryGetValue (name, out var peers)) { | ||
| foreach (var peer in peers.Distinct ()) { | ||
| PromoteManifestCompatibleJavaName (allPeers, peer, name); | ||
|
|
||
| if (deferredRegistrationNames.Contains (name)) { | ||
| peer.CannotRegisterInStaticConstructor = true; | ||
| } | ||
|
|
||
| if (!peer.IsUnconditional) { | ||
| peer.IsUnconditional = true; | ||
| logger?.LogRootingManifestReferencedTypeInfo (name, peer.ManagedTypeName); | ||
| } | ||
| } |
There was a problem hiding this comment.
peers.Distinct() here relies on JavaPeerInfo record value equality/hashing, but JavaPeerInfo now has mutable properties (e.g., JavaName, IsUnconditional, CannotRegisterInStaticConstructor) that are modified inside this loop. Mutating keys used in Distinct()/HashSet can lead to incorrect de-duplication and unpredictable behavior. Consider de-duping by reference (custom comparer) or avoid Distinct() and instead track processed peers in a separate HashSet<JavaPeerInfo> using reference equality.
src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ComponentElementBuilder.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs
Outdated
Show resolved
Hide resolved
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-scanner-jcw-fixes
branch
from
d64ece1 to
6ccb7ca
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-manifest-rooting
branch
2 times, most recently
from
2b22bc6 to
3b1083e
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-scanner-jcw-fixes
branch
2 times, most recently
from
3aa9b44 to
8fd237a
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-manifest-rooting
branch
2 times, most recently
from
23890de to
6ac587c
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-scanner-jcw-fixes
branch
from
8fd237a to
b82f717
Compare
simonrozsival
added
trimmable-type-map
copilot
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-scanner-jcw-fixes
branch
from
b82f717 to
0768a52
Compare
…tion - Manifest name promotion: promote compat JNI names for manifest-rooted components so the generated JCW class name matches the manifest entry - Deferred registration propagation: propagate CannotRegisterInStaticConstructor to generated managed base types of Application/Instrumentation - Instrumentation targetPackage: pass package name for manifest instrumentation elements - XA4250 warning: warn when manifest references a type that cannot be resolved in any scanned assembly - NestedAssembly for UTF-8 helpers: fix FieldAccessException from NestedPrivate visibility Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-manifest-rooting
branch
from
6ac587c to
3b2d707
Compare
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival
merged commit 682ebac
into
dev/simonrozsival/trimmable-scanner-jcw-fixes
2 of 3 checks passed
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.
Summary
Manifest-aware rooting and deferred registration propagation for the trimmable typemap generator.
Depends on: #11096 (scanner + JCW fixes)
Changes
CannotRegisterInStaticConstructorto generated managed base types of Application/InstrumentationLogUnresolvedTypeWarningandLogRootingManifestReferencedTypeInfoto the logger interface