Skip to content

[TrimmableTypeMap] Preserve trimmable typemap outputs on no-op builds #11472

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

Merged
jonathanpeppers merged 4 commits into from
May 27, 2026
+46 −8
Merged

[TrimmableTypeMap] Preserve trimmable typemap outputs on no-op builds #11472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87ebed9
Preserve trimmable typemap outputs on no-op builds
simonrozsival May 24, 2026
1e35d6b
Use IncrementalCleanDependsOn for trimmable typemap file writes
simonrozsival May 27, 2026
1bf5002
Merge origin/main into PR 11472
simonrozsival May 27, 2026
0c78315
Address review feedback: remove redundant stamp FileWrites entry, add…
Copilot May 27, 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
49 changes: 41 additions & 8 deletions ...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
defaults to 0 otherwise, where dynamic code can use Array.CreateInstance directly. -->
<_AndroidTrimmableTypeMapMaxArrayRank Condition=" '$(_AndroidTrimmableTypeMapMaxArrayRank)' == '' and '$(PublishAot)' == 'true' ">3</_AndroidTrimmableTypeMapMaxArrayRank>
<_AndroidTrimmableTypeMapMaxArrayRank Condition=" '$(_AndroidTrimmableTypeMapMaxArrayRank)' == '' ">0</_AndroidTrimmableTypeMapMaxArrayRank>
<IncrementalCleanDependsOn>
_RecordTrimmableTypeMapFileWrites;
$(IncrementalCleanDependsOn);
</IncrementalCleanDependsOn>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -136,6 +140,38 @@
</ReadLinesFromFile>
</Target>

<!--
The TypeMap generator has dynamic outputs: the set of generated assemblies
and Java files comes from scanning references. FileWrites entries in the
generating targets are correct for builds that run those targets, but
skipped targets do not execute their ItemGroup bodies on no-op builds.
Re-emit the previous dynamic outputs before MSBuild's IncrementalClean
reads FileWrites, otherwise those outputs look orphaned and can be deleted
before packaging target inputs are evaluated.
-->
<Target Name="_RecordTrimmableTypeMapFileWrites"
Condition=" '$(_OuterIntermediateOutputPath)' == '' and Exists('$(_TypeMapAssembliesListFile)') ">
<ItemGroup>
<_GeneratedTypeMapAssembliesForFileWrites Remove="@(_GeneratedTypeMapAssembliesForFileWrites)" />
<_TypeMapJavaFilesForFileWrites Remove="@(_TypeMapJavaFilesForFileWrites)" />
</ItemGroup>
<ReadLinesFromFile File="$(_TypeMapAssembliesListFile)">
<Output TaskParameter="Lines" ItemName="_GeneratedTypeMapAssembliesForFileWrites" />
</ReadLinesFromFile>
<ItemGroup>
<_TypeMapJavaFilesForFileWrites Include="$(_TypeMapJavaOutputDirectory)/**/*.java" />

<FileWrites Include="@(_GeneratedTypeMapAssembliesForFileWrites)" />
<FileWrites Include="@(_TypeMapJavaFilesForFileWrites)" />
<FileWrites Include="@(_TypeMapJavaFilesForFileWrites->'$(IntermediateOutputPath)android/src/%(RecursiveDir)%(Filename)%(Extension)')" />
<FileWrites Include="$(_TypeMapAssembliesListFile)" />
<FileWrites Include="$(_TypeMapBaseOutputDir)AndroidManifest.xml" Condition="Exists('$(_TypeMapBaseOutputDir)AndroidManifest.xml')" />
<FileWrites Include="$(IntermediateOutputPath)AndroidManifest.xml" Condition="Exists('$(IntermediateOutputPath)AndroidManifest.xml')" />
<FileWrites Include="$(IntermediateOutputPath)acw-map.txt" Condition="Exists('$(IntermediateOutputPath)acw-map.txt')" />
<FileWrites Include="$(IntermediateOutputPath)android/src/net/dot/android/ApplicationRegistration.java" Condition="Exists('$(IntermediateOutputPath)android/src/net/dot/android/ApplicationRegistration.java')" />
</ItemGroup>
</Target>

<!--
Populates @(_AdditionalNativeConfigResolvedAssemblies) with the trimmable TypeMap DLLs
so that GenerateNativeApplicationConfigSources (in _GeneratePackageManagerJava) accounts
Expand Down Expand Up @@ -176,18 +212,15 @@
included in the assembly store hash table, and keep _RemoveRegisterAttribute
source/destination counts in sync. -->
<ItemGroup>
<_ResolvedAssemblies Include="@(_GeneratedTypeMapAssembliesFromList)">
<Abi>$(_TypeMapFirstAbi)</Abi>
<RuntimeIdentifier>$(_TypeMapFirstRid)</RuntimeIdentifier>
<DestinationSubPath>$(_TypeMapFirstAbi)/%(Filename)%(Extension)</DestinationSubPath>
<DestinationSubDirectory>$(_TypeMapFirstAbi)/</DestinationSubDirectory>
</_ResolvedAssemblies>
<_ShrunkAssemblies Include="@(_GeneratedTypeMapAssembliesFromList)">
<_TrimmableTypeMapResolvedAssemblies Remove="@(_TrimmableTypeMapResolvedAssemblies)" />
<_TrimmableTypeMapResolvedAssemblies Include="@(_GeneratedTypeMapAssembliesFromList)">
<Abi>$(_TypeMapFirstAbi)</Abi>
<RuntimeIdentifier>$(_TypeMapFirstRid)</RuntimeIdentifier>
<DestinationSubPath>$(_TypeMapFirstAbi)/%(Filename)%(Extension)</DestinationSubPath>
<DestinationSubDirectory>$(_TypeMapFirstAbi)/</DestinationSubDirectory>
</_ShrunkAssemblies>
</_TrimmableTypeMapResolvedAssemblies>
<_ResolvedAssemblies Include="@(_TrimmableTypeMapResolvedAssemblies)" />
<_ShrunkAssemblies Include="@(_TrimmableTypeMapResolvedAssemblies)" />
</ItemGroup>
</Target>

Expand Down
5 changes: 5 additions & 0 deletions ...marin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,17 @@ public void Build_WithTrimmableTypeMap_IncrementalBuild ([Values] bool isRelease

var intermediateDir = builder.Output.GetIntermediaryPath ("typemap");
AssertTrimmableTypeMapOutputs (intermediateDir);
var typemapDlls = Directory.GetFiles (intermediateDir, "*.dll");
Comment thread
simonrozsival marked this conversation as resolved.
Assert.IsNotEmpty (typemapDlls, "First build should have generated typemap DLL(s).");

Assert.IsTrue (builder.Build (proj), "Second build should have succeeded.");

Assert.IsTrue (
builder.Output.IsTargetSkipped ("_GenerateJavaStubs"),
"_GenerateJavaStubs should be skipped on incremental build.");
foreach (var typemapDll in typemapDlls) {
FileAssert.Exists (typemapDll, $"No-op builds should preserve generated typemap assembly {typemapDll} when _GenerateTrimmableTypeMap is skipped.");
}
}

[Test]
Expand Down