Skip to content

Commit e2214d6

Browse files
Add TypeMap DLLs to _ResolvedAssemblies, fix CoreCLR glob wildcards
Add TypeMap DLLs from typemap/ to _ResolvedAssemblies in _GenerateJavaStubs so they flow through the normal assembly pipeline. Fix CoreCLR targets: use wildcards for _Microsoft.Android.TypeMaps to avoid adding non-existent literal paths when linked/ doesn't exist. Note: device deployment still requires proper ILLink inner builds and correct assembly store hash registration. The assembly count in GenerateNativeApplicationConfigSources needs the TypeMap DLLs visible at evaluation time, which requires further build ordering work. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent a2a8977 commit e2214d6

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@
9898
</ItemGroup>
9999
<Copy SourceFiles="@(_TypeMapJavaFiles)" DestinationFolder="$(IntermediateOutputPath)android\src\%(RecursiveDir)" />
100100

101+
<!-- Add TypeMap DLLs to _ResolvedAssemblies so they flow through the normal
102+
assembly pipeline (shrunk → compress → assembly store). -->
103+
<ItemGroup>
104+
<_ResolvedAssemblies Include="$(_TypeMapOutputDirectory)*.dll">
105+
<DestinationSubPath>%(Filename)%(Extension)</DestinationSubPath>
106+
</_ResolvedAssemblies>
107+
</ItemGroup>
108+
101109
<Touch Files="$(IntermediateOutputPath)acw-map.txt" AlwaysCreate="true" />
102110

103111
<MakeDir Directories="$(IntermediateOutputPath)android\src\net\dot\android" />

0 commit comments

Comments
 (0)