Skip to content

[TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane#11091

Open
simonrozsival wants to merge 19 commits intomainfrom
dev/simonrozsival/trimmable-test-plumbing
Open

[TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane#11091
simonrozsival wants to merge 19 commits intomainfrom
dev/simonrozsival/trimmable-test-plumbing

Conversation

@simonrozsival
Copy link
Copy Markdown
Member

@simonrozsival simonrozsival commented Apr 8, 2026 •
edited
Loading

Summary

Add a new CoreCLRTrimmable Mono.Android.NET-Tests lane to CI and fix the issues uncovered by running it.

CI lane plumbing

  • Add Mono.Android.NET_Tests-CoreCLRTrimmable in stage-package-tests.yaml
  • Keep existing CoreCLR lane on LLVM IR typemap
  • Pass extraBuildArgs to the Clean step

SDK packaging fixes

  • Add PreserveLists/** glob to Microsoft.Android.Sdk.proj for Trimmable.CoreCLR.xml
  • Restore correct Link=..\PreserveLists\... in ILLink.csproj
  • Add TrimmableTypeMap_PreserveList_IsPackagedInSdk regression test

Manifest generation fixes

  • Default <instrumentation android:targetPackage> to app package name
  • Add _FixRootAssembly target (Android apps have no Main())
  • Rewrite compat JNI names in manifest templates to CRC names

Generic type fixes

  • Use JavaPeerProxy<Java.Lang.Object> for open generic definitions (prevents TypeLoadException when loading the proxy type)
  • Skip TypeMapAssociation emission for generic definitions (prevents cross-assembly open generic resolution failure)

Runtime initialization

  • Single TrimmableTypeMap.Initialize() call after JniRuntime.SetCurrent() (matching the proven pattern from prior trimmable branches)

Typemap output path + stale artifact handling

  • Use _OuterIntermediateOutputPath for typemap outputs
  • Sentinel file for stale artifact detection on mode switch

Test exclusions

  • Exclude Export, NativeTypeMap, SSL, TrimmableIgnore categories
  • Exclude Java.Interop test fixtures without JCW classes

@simonrozsival simonrozsival mentioned this pull request Apr 8, 2026
Closed
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from f8106b0 to a437455 Compare April 9, 2026 09:19
@simonrozsival simonrozsival added trimmable-type-map copilot `copilot-cli` or other AIs were used to author this labels Apr 9, 2026
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-runtime-fixes branch from d5aefaa to 3a8d509 Compare April 10, 2026 09:49
@simonrozsival simonrozsival mentioned this pull request Apr 10, 2026
Merged
Base automatically changed from dev/simonrozsival/trimmable-runtime-fixes to main April 10, 2026 22:50
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch 2 times, most recently from 1814a6d to d0e30f6 Compare April 11, 2026 09:42
@simonrozsival simonrozsival changed the title [TrimmableTypeMap] Test plumbing and CI lane for Mono.Android.NET-Tests [TrimmableTypeMap] Stabilize CoreCLR Mono.Android.NET-Tests lane Apr 11, 2026
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from 17b123b to e2c70fd Compare April 11, 2026 23:28
@simonrozsival simonrozsival changed the base branch from main to dev/simonrozsival/root-manifest-referenced-types April 11, 2026 23:28
simonrozsival added a commit that referenced this pull request Apr 11, 2026
@simonrozsival
[TrimmableTypeMap] Keep #11091 to explicit skips
87c531f 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from e2c70fd to 87c531f Compare April 11, 2026 23:50
@simonrozsival simonrozsival changed the title [TrimmableTypeMap] Stabilize CoreCLR Mono.Android.NET-Tests lane [TrimmableTypeMap] Add CoreCLR Mono.Android.NET-Tests lane plumbing Apr 11, 2026
@simonrozsival simonrozsival marked this pull request as ready for review April 12, 2026 08:01
Copilot AI review requested due to automatic review settings April 12, 2026 08:01
Copilot AI reviewed Apr 12, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds CI/test-lane plumbing to run Mono.Android.NET-Tests on CoreCLR with the trimmable typemap implementation, keeping currently-unsupported test buckets explicitly excluded to maintain green coverage while follow-up runtime/generator work lands separately.

Changes:

  • Adds a new CoreCLRTrimmable APK instrumentation lane and pins the existing CoreCLR lane to llvm-ir.
  • Updates Mono.Android.NET-Tests.csproj to default to CoreCLR + exclude trimmable-specific buckets when _AndroidTypeMapImplementation=trimmable.
  • Centralizes additional trimmable-mode runtime test exclusions in NUnitInstrumentation, and adjusts a few Java.Interop tests/projects to avoid unsupported coverage.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs Adds runtime-switch-driven exclusions for categories and specific Java.Interop test names under trimmable typemap.
tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj Sets defaults/exclusions for trimmable typemap runs (incl. CoreCLRTrimmable flavor).
tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs Marks specific tests as TrimmableIgnore.
tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JavaObjectExtensionsTests.cs Marks a specific test as TrimmableIgnore (and normalizes file header).
tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj Removes JniTypeUtf8Test.cs from compilation due to unsupported APIs in the product assembly.
build-tools/automation/yaml-templates/stage-package-tests.yaml Updates CoreCLR lane args and adds the new CoreCLRTrimmable lane.

Comment thread ...s/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs Outdated
simonrozsival
simonrozsival commented Apr 12, 2026
View reviewed changes
Copy link
Copy Markdown
Member Author

@simonrozsival simonrozsival left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Review Summary

Verdict: ✅ LGTM

Found 1 suggestion:

  • 💡 Code organization — the trimmable category filtering is now split between Mono.Android.NET-Tests.csproj and NUnitInstrumentation.cs (NUnitInstrumentation.cs:29). Keeping one source of truth would make the temporary exclusions easier to retire.

The lane wiring itself looks good, and I like that the unsupported cases stay explicit instead of being hidden behind runtime fallback behavior.

Review generated by android-reviewer from review guidelines.

Comment thread ...s/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs Outdated
Base automatically changed from dev/simonrozsival/root-manifest-referenced-types to main April 13, 2026 11:47
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch 2 times, most recently from 02780bb to c3a7ebc Compare April 13, 2026 12:15
jonathanpeppers
jonathanpeppers reviewed Apr 13, 2026
View reviewed changes
Comment thread build-tools/automation/yaml-templates/stage-package-tests.yaml Outdated
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from 619991d to 6a0644f Compare April 13, 2026 16:39
@simonrozsival simonrozsival changed the base branch from main to dev/simonrozsival/fix-deferred-registration-propagation April 13, 2026 16:39
Base automatically changed from dev/simonrozsival/fix-deferred-registration-propagation to main April 14, 2026 14:19
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from 19ec2fa to e084238 Compare April 14, 2026 14:32
@simonrozsival simonrozsival changed the title [TrimmableTypeMap] Add CoreCLR Mono.Android.NET-Tests lane plumbing [TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane plumbing Apr 14, 2026
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from e084238 to ff75ff4 Compare April 15, 2026 08:25
@simonrozsival simonrozsival changed the title [TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane plumbing [TrimmableTypeMap] Stabilize CoreCLRTrimmable Mono.Android.NET-Tests lane Apr 15, 2026
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from ff75ff4 to ebb4b14 Compare April 15, 2026 08:35
@simonrozsival simonrozsival changed the title [TrimmableTypeMap] Stabilize CoreCLRTrimmable Mono.Android.NET-Tests lane [TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane Apr 15, 2026
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from ebb4b14 to 76e6a0a Compare April 15, 2026 08:41
@simonrozsival simonrozsival changed the title [TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane [TrimmableTypeMap] Stabilize CoreCLRTrimmable Mono.Android.NET-Tests lane Apr 15, 2026
@simonrozsival simonrozsival changed the title [TrimmableTypeMap] Stabilize CoreCLRTrimmable Mono.Android.NET-Tests lane [TrimmableTypeMap] Add CoreCLRTrimmable Mono.Android.NET-Tests lane Apr 15, 2026
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from 76e6a0a to ae5690c Compare April 15, 2026 08:57
simonrozsival added a commit that referenced this pull request Apr 16, 2026
@simonrozsival
[TrimmableTypeMap] Keep #11091 to explicit skips
6cb8962 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival and others added 14 commits April 16, 2026 16:43
@simonrozsival
Add trimmable typemap test plumbing and CI lane
6543b9c 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
Keep CoreCLR test flavor naming in CI
854c1df 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Package CoreCLR preserve list in SDK pack
4f084ec 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Keep CoreCLR lane on CoreCLR runtime
ce44773 
Restore -p:UseMonoRuntime=false on the existing Mono.Android.NET_Tests-CoreCLR job so this PR only adds the new trimmable lane without changing the old lane's runtime behavior.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix CoreCLR preserve list packaging
7e4a505 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix SDK preserve list test path
1b55202 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
Include trimmable CoreCLR preserve list in SDK pack
b779469 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix PreserveLists packaging for both local and CI …
45b8a33 
…paths

The SDK pack layout has PreserveLists/ at the pack root (sibling to
targets/ and tools/). There are two packaging paths:

1. Local dev: ILLink.csproj copies files from OutputPath (tools/) using
   Link=..\PreserveLists\... to place them at the pack root. The prior
   commit broke this by changing Link to PreserveLists\... which would
   put files inside tools/PreserveLists/ instead.

2. CI NuGet pack: Microsoft.Android.Sdk.proj directly packs from source.
   The prior commit correctly added the missing glob for
   Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/PreserveLists/.

This commit restores the correct Link path in ILLink.csproj so both
packaging paths produce the correct layout.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix IL1034 by changing root assembly RootMode from…
f6ea0b7 
… EntryPoint to All

Android apps don't have a traditional Main() entry point, so ILLink's
EntryPoint root mode fails with IL1034. The non-trimmable path
(TypeMap.LlvmIr.targets) already has _FixRootAssembly to handle this,
but it was missing from the trimmable CoreCLR path.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Default instrumentation targetPackage to app packa…
70deb30 
…ge name

The legacy ManifestDocument automatically sets targetPackage to the app's
PackageName when [Instrumentation] doesn't specify it. Without this, the
generated manifest has <instrumentation> without android:targetPackage,
causing INSTALL_PARSE_FAILED_MANIFEST_MALFORMED on the device.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix stale manifest causing ClassNotFoundException …
f719fb1 
…on mode switch

The CoreCLRTrimmable CI test was crashing with:
  ClassNotFoundException: Didn't find class "android.apptests.App"

Root cause: when switching from the default (LLVM IR) typemap build to the
trimmable path in the same intermediate directory (sequential CI test runs),
_GenerateTrimmableTypeMap was incorrectly skipped because its output DLL
existed from a prior run.  The stale LLVM IR manifest (which uses compat JNI
names like "android.apptests.App") remained while the JCW was generated with
the CRC-based name ("crc64.../App"), causing a name mismatch at runtime.

Fixes:
1. Add a sentinel file (.trimmable) written when _GenerateTrimmableTypeMap
   runs.  A new target _CleanStaleNonTrimmableState deletes the stale
   typemap DLL when the sentinel is missing, forcing regeneration.

2. Pass extraBuildArgs to the Clean step in apk-instrumentation.yaml so
   the Clean imports the same targets as the build and properly cleans
   trimmable-specific files.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Use outer IntermediateOutputPath for typemap/manif…
a5a6dd8 
…est generation

The _GenerateTrimmableTypeMap target runs AfterTargets="CoreCompile" which
executes during per-RID inner builds where IntermediateOutputPath includes the
RID subdirectory (e.g. obj/.../android-arm64/).  The generated manifest was
written there, but _ManifestMerger and _GenerateJavaStubs (packaging phase)
read from the outer IntermediateOutputPath (obj/.../net11.0-android/).  This
caused the stale LLVM IR manifest (with compat JNI names like
"android.apptests.App") to be used instead of the trimmable manifest (with
CRC-based JCW names), resulting in ClassNotFoundException at runtime.

Fix: prefer _OuterIntermediateOutputPath (set by the outer build for inner
per-RID builds) so typemap outputs land where the packaging phase expects.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Rewrite compat JNI names in manifest template to C…
1f22129 
…RC names

Manifest templates may hardcode compat JNI names (e.g., android.apptests.App)
but the trimmable JCW generator uses CRC-based names (e.g., crc64.../App).
The compat name rewrite must happen before collecting existingTypes so the
duplicate check works correctly and we don't end up with both versions.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix runtime initialization ordering and generic ty…
9082b24 
…pe crash

Two fixes for the CoreCLRTrimmable test lane:

1. Split TrimmableTypeMap.Initialize() into CreateInstance() + RegisterNativeMethods().
   CreateInstance() runs BEFORE JniRuntime creation (so ManagedPeer..cctor() can
   resolve types via TrimmableTypeMap.Instance). RegisterNativeMethods() runs AFTER
   (because it needs JNI). This fixes a chicken-and-egg crash where ManagedPeer's
   static constructor triggered type resolution before the typemap was initialized.

2. Catch TypeLoadException in OnRegisterNatives for open generic definitions
   (e.g., TestInstrumentation`1). These types have JCW classes but can't be loaded
   via Type.GetType() as open generics. Registration is skipped — their native
   methods will be registered when the concrete derived class loads.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/trimmable-test-plumbing branch from 6da7dae to 9082b24 Compare April 16, 2026 15:10
simonrozsival added a commit that referenced this pull request Apr 16, 2026
@simonrozsival
[TrimmableTypeMap] Keep #11091 to explicit skips
1b88509 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival and others added 5 commits April 16, 2026 18:16
@simonrozsival
[TrimmableTypeMap] Fix generic type proxy loading in typemap
306a207 
Two fixes for open generic definitions (e.g., TestInstrumentation<T>):

1. Use Java.Lang.Object as the JavaPeerProxy<T> type parameter instead of
   the open generic type. Loading the proxy type forces the CLR to resolve
   its base class generic argument, and open generics from external assemblies
   can't be resolved by the TypeMapLazyDictionary loader. The T parameter
   only affects CreateInstance, which already throws for generic definitions.

2. Skip TypeMapAssociation emission for generic definitions. The association
   attribute references typeof(TestInstrumentation<>) which triggers the
   same cross-assembly open generic resolution failure when the runtime
   scans assembly-level attributes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Revert two-phase init — use single Initialize() af…
883f030 
…ter runtime creation

The two-phase split (CreateInstance before runtime, RegisterNativeMethods after)
was a workaround for a Debug-only issue (#if DEBUG in JniPeerMembers). But it
caused OnRegisterNatives to never be called — the JNI RegisterNatives succeeded
but was ineffective.

Revert to the working pattern: single Initialize() after JniRuntime.SetCurrent(),
matching the proven java-interop-proxies branch where 758 tests passed.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix ClassLoader mismatch in RegisterNatives
2ccf01b 
Use the string overload of JniType which resolves via Class.forName with
the runtime's app ClassLoader. The UTF-8 span overload (ReadOnlySpan<byte>)
uses raw JNI FindClass which resolves via the system ClassLoader — returning
a different Runtime class instance than the one JCWs reference. This caused
OnRegisterNatives to never be called because the native method was registered
on the wrong class.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix static initializer ordering for Instrumentatio…
d303fde 
…n subtypes

Two fixes for the Instrumentation class loading order:

1. Export Runtime.registerNatives as a JNI native method from C++ so it's
   available via JNI auto-discovery when libmonodroid.so is loaded. Without
   this, calling registerNatives before the managed runtime initializes
   causes UnsatisfiedLinkError. The C++ stub is a no-op fallback — once the
   managed runtime starts, TrimmableTypeMap.Initialize() re-registers the
   method with the managed OnRegisterNatives callback.

2. Propagate CannotRegisterInStaticConstructor to all descendants of
   Application and Instrumentation types. Android loads Instrumentation
   subclasses before the native library, so ALL types in the hierarchy
   must use the lazy __md_registerNatives pattern instead of static {}.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@simonrozsival
[TrimmableTypeMap] Fix Release build pipeline and ApplicationRegistra…
ce55722 
…tion

Three fixes:

1. Fix _RemoveRegisterAttribute override to reset _ShrunkAssemblies to
   _ResolvedAssemblies. When PublishTrimmed=true, ProcessAssemblies points
   shrunk items to R2R/shrunk/ which is only created by the (now no-op)
   _RemoveRegisterAttribute. Without this fix, CompressAssemblies and
   CreateAssemblyStore fail with DirectoryNotFoundException.

2. Exclude DoNotGenerateAcw types from ApplicationRegistration to prevent
   referencing deprecated android.test framework types.

3. Export Runtime.registerNatives from C++ as a JNI native method and
   propagate CannotRegisterInStaticConstructor to all Instrumentation/
   Application descendants.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jonathanpeppers jonathanpeppers jonathanpeppers left review comments

Copilot code review Copilot Copilot left review comments

Assignees

No one assigned

Labels

copilot `copilot-cli` or other AIs were used to author this trimmable-type-map

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@simonrozsival @jonathanpeppers