[TrimmableTypeMap] Add ManifestGenerator by simonrozsival · Pull Request #10991 · dotnet/android

simonrozsival · 2026-03-21T22:14:10Z

Summary

Cecil-free Android manifest generation from component attributes captured by the SRM-based JavaPeerScanner. Part of #10807.

All code lives in the Microsoft.Android.Sdk.TrimmableTypeMap assembly (netstandard2.0) — no MSBuild dependency.

Depends on #10967. Used by #10980.

Features

Component attributes

[Activity], [Service], [BroadcastReceiver], [ContentProvider] with all named properties
MainLauncher → <intent-filter> with MAIN/LAUNCHER + android:exported="true"
[IntentFilter] → <intent-filter> with actions, categories, data elements
[MetaData] → <meta-data> with name/value/resource
[Application] → updates <application> element attributes
[Instrumentation] → <instrumentation> under <manifest>

Assembly-level attributes

[Permission], [PermissionGroup], [PermissionTree] → <permission> etc. with dedup
[UsesPermission] → <uses-permission> with maxSdkVersion
[UsesFeature] → <uses-feature> (named + GL ES version variants)
[UsesLibrary], [UsesConfiguration] → inside <application>
[assembly: Application] → merged into <application> attributes
[assembly: MetaData], [assembly: Property] → inside <application>

Build properties

ManifestPlaceholders — ${key} → value replacement
CheckedBuild → android:debuggable + android:extractNativeLibs
ApplicationJavaClass → <application android:name="...">
VersionCode defaults to "1", VersionName defaults to "1.0" (matching legacy)

Validation

XA4213: component types must have a public parameterless constructor
Duplicate Application type detection (assembly-level vs type-level)

Runtime provider

MonoRuntimeProvider / NativeAotRuntimeProvider injection
Multi-process support (per-process providers)
Dedup check against template (won't duplicate existing providers)

Tests

30 test cases (xunit, [Fact]/[Theory]), ~130ms
Covers all component types, assembly-level attrs, template merging, dedup, placeholders, validation, enum conversion

Copilot

Pull request overview

Adds a Cecil-free ManifestGenerator to the TrimmableTypeMap generator pipeline, producing AndroidManifest.xml from scanner-captured component/assembly attributes, plus a new unit test suite validating expected manifest output.

Changes:

Introduces ManifestGenerator to synthesize/merge manifest elements (components, permissions/features/libraries, runtime provider injection, placeholder replacement).
Adds xUnit tests covering activity/service/receiver/provider/application/instrumentation emission, template merging, placeholder replacement, and enum conversions.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.

File	Description
src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs	New manifest generation/merge implementation driven by scanned attribute metadata (no Cecil).
tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ManifestGeneratorTests.cs	New unit tests validating generated manifest structure, merging, and attribute mapping behaviors.

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ManifestGeneratorTests.cs

…avaConvert (#10967) Fixes: #10791 ## Summary Adds the runtime-side support for the trimmable typemap: type resolution, peer creation, native method registration, and AOT-safe collection marshaling. All behind `RuntimeFeature.TrimmableTypeMap` (defaults to `false`). ### New runtime types - **`JavaPeerProxy` / `JavaPeerProxy<T>`** — AOT-safe proxy attribute base. Generated proxy types extend this and provide `CreateInstance()` for peer creation and `GetContainerFactory()` for collection marshaling. - **`IAndroidCallableWrapper`** — `RegisterNatives(JniType)` interface for ACW proxy types to register JNI native methods. - **`JavaPeerContainerFactory`** — AOT-safe factories for arrays, lists, collections, and dictionaries without `MakeGenericType()`. - **`TrimmableTypeMap`** — Central class owning the `TypeMapping` dictionary. Encapsulates all proxy attribute access: peer creation, invoker resolution, container factories, and native method registration bootstrap. - **`TrimmableTypeMapTypeManager`** — `JniTypeManager` subclass delegating type lookups to `TrimmableTypeMap`. `RegisterNativeMembers` throws `UnreachableException` (JCW static blocks handle registration). ### Type resolution - `GetProxyForManagedType(Type)` resolves managed type → JNI name via `IJniNameProviderAttribute` (shared interface for `[Register]` and `[JniTypeSignature]`) → TypeMap dictionary → proxy. Results cached in `ConcurrentDictionary`. - `TryGetJniNameForType` shared between `TrimmableTypeMap` and `TrimmableTypeMapTypeManager`. - `ActivateInstance` uses JNI `GetObjectClass` → `GetJniTypeNameFromClass` → TypeMap lookup for constructor activation (proxy types have self-applied attribute, not the target type). ### TypeMap dictionary initialization - The runtime's `GetOrCreateExternalTypeMapping<Java.Lang.Object>()` handles assembly resolution automatically via the `System.Runtime.InteropServices.TypeMappingEntryAssembly` runtimeconfig property (set in `Trimmable.targets`). No manual `Assembly.Load` pre-loading is needed — the runtime walks `TypeMapAssemblyTargetAttribute` attributes from the entry assembly recursively. ### Native interop refactoring - **`RegisterJniNatives` passed via init args** — `Initialize` sets `args->registerJniNativesFn` (null when `TrimmableTypeMap=true`). Eliminates the `create_delegate` call for `RegisterJniNatives`, letting the trimmer remove it cleanly in the trimmable path. - **C++ `registerNatives` stub** — `Host::Java_mono_android_Runtime_registerNatives` no-op for the trimmable path (managed code handles registration via `Initialize`). - **Null guard** on `jnienv_register_jni_natives` call site. - `Initialize` is now the **single** `create_delegate` entry point from native code. ### RegisterNatives bootstrap - `mono.android.Runtime.registerNatives(Class)` Java native method added - `TrimmableTypeMap.Initialize()` registers the JNI callback during init (behind explicit `if (RuntimeFeature.TrimmableTypeMap)` guard for trimmer compatibility) - When Java loads a JCW class, `OnRegisterNatives` resolves the proxy and calls `IAndroidCallableWrapper.RegisterNatives()` to bind UCO function pointers ### AOT-safe JavaConvert - `JavaConvert.GetJniHandleConverter()` uses `JavaPeerContainerFactory` for `IList`, `ICollection`, `IDictionary` - `JNIEnv.ArrayCreateInstance()` uses factory path ### Peer creation - `JavaMarshalValueManager` (renamed from `ManagedValueManager`) overrides `CreatePeer` for the trimmable path — calls `proxy.CreateInstance()` directly, bypassing `GetUninitializedObject` - `GetSimpleReferences` walks base type chain for managed-only subclasses without `[Register]` ### Wiring - `RuntimeFeature.TrimmableTypeMap` feature switch with ILLink substitutions - `JNIEnvInit` (CoreCLR) and `JavaInteropRuntime` + `JreRuntime` (NativeAOT) create the new managers when the feature is on - `JavaMarshalValueManager` (renamed from `ManagedValueManager`) gets proxy-based peer creation in `TryConstructPeer` ### Dependencies - dotnet/java-interop#1391 (RegisterNatives with raw function pointers — follow-up optimization) - Manifest generator: #10991 - Build pipeline: #10980 ### Test coverage - 255/255 generator tests pass - End-to-end HelloWorld app runs on device with Activity, layout XML, FindViewById\<Button\>, Click events - Runtime tests require device integration (tracked by #10793) ### Trimmer size regression prevention - Add ILLink substitutions for `IsMonoRuntime` and `IsCoreClrRuntime` — enables trimmer to eliminate runtime-specific branches - `JavaMarshalValueManager`: remove `TrimmableTypeMap?` field, use `TrimmableTypeMap.Instance` singleton - `TrimmableTypeMap`: private ctor, `Initialize()` static method, `Instance` throws if not initialized - `TrimmableTypeMapTypeManager`: no constructor parameter, uses singleton - No `TrimmableTypeMap` type references outside feature guards — clean trimming for MonoVM/NativeAOT Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

ManifestGenerator in Microsoft.Android.Sdk.TrimmableTypeMap assembly. Converts ComponentInfo records from JavaPeerScanner into AndroidManifest.xml. - Data-driven property mapping (7 static arrays, 9 enum converters) - MainLauncher intent-filter, runtime provider, template merging, deduplication - Assembly-level: Permission, UsesPermission, UsesFeature, UsesLibrary, UsesConfiguration, Application, MetaData, Property - ManifestPlaceholders, debuggable/extractNativeLibs, ApplicationJavaClass - XA4213 constructor validation, duplicate Application detection - VersionCode defaults to '1' matching legacy 23 unit tests (xunit). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Split into focused classes in Microsoft.Android.Sdk.TrimmableTypeMap: - ManifestGenerator: orchestration (load template, call builders, write output) - ManifestConstants: shared AndroidNs and AttName - PropertyMapper: data-driven property mapping (7 arrays, MappingKind enum) - AndroidEnumConverter: 9 enum-to-string converters - ComponentElementBuilder: Activity/Service/Receiver/Provider/Instrumentation XML - AssemblyLevelElementBuilder: permissions, uses-permissions, features, libraries Features: MainLauncher, runtime provider (with dedup), template merging, ManifestPlaceholders, debuggable/extractNativeLibs, XA4213 validation. 30 unit tests (xunit, 130ms). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

simonrozsival

🤖 AI Review Summary

Verdict: ✅ LGTM

Found 1 suggestion (no blockers):

💡 Formatting: Use [] instead of Array.Empty<T>() in ManifestModel.cs (4 occurrences)

👍 Clean, well-structured manifest generator with good separation of concerns — enum conversion, property mapping, component building, and assembly-level elements are each in focused files. Excellent test coverage (30 cases) covering all component types, template merging, dedup, placeholders, enum flags, and edge cases (abstract types, existing components). Proper use of CultureInfo.InvariantCulture for numeric formatting. Data models are kept together in ManifestModel.cs which is pragmatic for 13 small DTOs.

CI: All checks pending (branch just rebased). Cannot verify build status yet.

Review generated by android-reviewer from review guidelines.

simonrozsival · 2026-03-24T22:12:51Z

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestModel.cs

+public class MetaDataInfo
+{
+	public string Name { get; set; } = "";
+	public string? Value { get; set; }


🤖 💡 Formatting — Per repo conventions, use [] instead of Array.Empty<T>():

public IReadOnlyList<IntentFilterInfo> IntentFilters { get; set; } = []; public IReadOnlyList<MetaDataInfo> MetaData { get; set; } = [];

Same applies to IntentFilterInfo.Actions, IntentFilterInfo.Categories below.

Rule: Use [] not Array.Empty<T>()

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

simonrozsival requested a review from jonathanpeppers as a code owner March 21, 2026 22:14

Copilot AI review requested due to automatic review settings March 21, 2026 22:14

simonrozsival requested a review from grendello as a code owner March 21, 2026 22:14

Copilot started reviewing on behalf of simonrozsival March 21, 2026 22:14 View session

simonrozsival added copilot `copilot-cli` or other AIs were used to author this trimmable-type-map labels Mar 21, 2026

simonrozsival changed the title ~~[TrimmableTypeMap] Add ManifestGenerator (#10807)~~ [TrimmableTypeMap] Add ManifestGenerator Mar 21, 2026

Copilot AI reviewed Mar 21, 2026

View reviewed changes

This was referenced Mar 21, 2026

[TrimmableTypeMap] Build pipeline: targets, scanner, task, assembly store #10980

Open

[TrimmableTypeMap] Implement runtime TypeManager, ValueManager, and JavaConvert #10967

Merged

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-manifest-generation branch from b686f08 to c4c214f Compare March 21, 2026 22:46

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-runtime-pr branch from 71ed636 to 2b80737 Compare March 21, 2026 23:14

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-manifest-generation branch 3 times, most recently from 3637001 to e3b02dd Compare March 23, 2026 16:54

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-runtime-pr branch from 6a9cdd3 to 8eba142 Compare March 23, 2026 18:25

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-manifest-generation branch from e3b02dd to 7377bdf Compare March 23, 2026 18:27

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-runtime-pr branch 5 times, most recently from c0bb477 to d1ae3a5 Compare March 24, 2026 11:10

Base automatically changed from dev/simonrozsival/trimmable-typemap-runtime-pr to main March 24, 2026 21:27

simonrozsival and others added 3 commits March 24, 2026 22:52

trigger PR creation

b2d88ee

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-manifest-generation branch from 7377bdf to 683c0be Compare March 24, 2026 21:54

simonrozsival commented Mar 24, 2026

View reviewed changes

Use [] instead of Array.Empty<T>() in ManifestModel

6492b9a

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TrimmableTypeMap] Add ManifestGenerator#10991

[TrimmableTypeMap] Add ManifestGenerator#10991
simonrozsival wants to merge 4 commits intomainfrom
dev/simonrozsival/trimmable-typemap-manifest-generation

simonrozsival commented Mar 21, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

simonrozsival left a comment

Uh oh!

simonrozsival Mar 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

simonrozsival commented Mar 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Features

Component attributes

Assembly-level attributes

Build properties

Validation

Runtime provider

Tests

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

simonrozsival left a comment

Choose a reason for hiding this comment

🤖 AI Review Summary

Uh oh!

simonrozsival Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

simonrozsival commented Mar 21, 2026 •

edited

Loading