Skip to content

[TrimmableTypeMap] Wire AcwMapWriter to populate acw-map.txt #11015

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
simonrozsival merged 1 commit into from
Mar 25, 2026
+8 −5
Merged

[TrimmableTypeMap] Wire AcwMapWriter to populate acw-map.txt #11015

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 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 @@ -73,7 +73,8 @@
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
ManifestPlaceholders="$(AndroidManifestPlaceholders)"
CheckedBuild="$(_AndroidCheckedBuild)"
ApplicationJavaClass="$(AndroidApplicationJavaClass)">
ApplicationJavaClass="$(AndroidApplicationJavaClass)"
AcwMapOutputFile="$(IntermediateOutputPath)acw-map.txt">
Comment on lines +76 to +77
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

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

GenerateTrimmableTypeMap is being invoked with a new AcwMapOutputFile parameter, but the task implementation currently has no matching public settable property. MSBuild will fail with MSB4064/MSB4063 (“parameter is not supported”) unless GenerateTrimmableTypeMap is updated to accept this parameter (or the parameter name is corrected to match the task).

Suggested change
ApplicationJavaClass="$(AndroidApplicationJavaClass)"
AcwMapOutputFile="$(IntermediateOutputPath)acw-map.txt">
ApplicationJavaClass="$(AndroidApplicationJavaClass)">

Copilot uses AI. Check for mistakes.
<Output TaskParameter="GeneratedAssemblies" ItemName="_GeneratedTypeMapAssemblies" />
<Output TaskParameter="GeneratedJavaFiles" ItemName="_GeneratedJavaFiles" />
<Output TaskParameter="AdditionalProviderSources" ItemName="_AdditionalProviderSources" />
Expand All @@ -83,6 +84,7 @@
<FileWrites Include="@(_GeneratedTypeMapAssemblies)" />
<FileWrites Include="@(_GeneratedJavaFiles)" />
<FileWrites Include="$(_TypeMapBaseOutputDir)AndroidManifest.xml" />
<FileWrites Include="$(IntermediateOutputPath)acw-map.txt" />
</ItemGroup>
</Target>

Expand Down Expand Up @@ -134,10 +136,11 @@
SkipUnchangedFiles="true"
Condition="Exists('$(_TypeMapBaseOutputDir)AndroidManifest.xml')" />

<!-- acw-map.txt is consumed as an Input by _ConvertCustomView and _UpdateAndroidResgen.
Create an empty file if it doesn't exist yet. The trimmable path doesn't populate it
(no Cecil-based ACW mapping), but it must exist for downstream targets to evaluate. -->
<Touch Files="$(IntermediateOutputPath)acw-map.txt" AlwaysCreate="true" />
<!-- acw-map.txt is populated by _GenerateTrimmableTypeMap with real managed→Java mappings.
If that target was skipped (e.g., no input assemblies), create an empty placeholder so
downstream targets (_ConvertCustomView, _UpdateAndroidResgen) can evaluate their Inputs. -->
<Touch Files="$(IntermediateOutputPath)acw-map.txt" AlwaysCreate="true"
Condition="!Exists('$(IntermediateOutputPath)acw-map.txt')" />

<!-- Generate ApplicationRegistration.java.
In the trimmable path, Application/Instrumentation types are activated via
Expand Down
Loading