Skip to content

Update to new linker custom steps API #5748

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
jonpryor merged 36 commits into from
Jun 2, 2021
Merged

Update to new linker custom steps API #5748

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
9c3ffb9
Build locally against new IMarkHandler interface
sbomer Feb 19, 2021
88a3607
Fix up custom steps
sbomer Feb 22, 2021
bac562c
Update to latest interface
sbomer Mar 3, 2021
8fd0cb3
Cleanup
sbomer Mar 3, 2021
ab2949f
Remove unused code under defines
sbomer Mar 3, 2021
cc8a654
Fix whitespace
sbomer Mar 10, 2021
5d8d897
Remove workaround
sbomer Mar 16, 2021
6e941ee
Clean up targets
sbomer Mar 16, 2021
05df054
Don't duplicate MonoDroid.Tuner steps
sbomer Mar 23, 2021
e90b93a
Use LinkContext's type resolve cache
sbomer Apr 27, 2021
3dfe570
Undo TrimmerDefaultAction change
sbomer Apr 27, 2021
d6aaa38
PR feedback
sbomer Apr 28, 2021
41de20f
PR feedback
sbomer Apr 29, 2021
e0c002e
PR feedback
sbomer Apr 30, 2021
f26d8dd
Don't pass --verbose argument
sbomer May 4, 2021
3b616b6
Fix nullref in GenerateProguardConfiguration
sbomer May 7, 2021
cec24b8
Fix RemoveDesigner test
sbomer May 10, 2021
3111a94
Fix typo
sbomer May 10, 2021
b1d9ec7
_CustomStepDll -> _AndroidLinkerCustomStepAssembly
sbomer May 12, 2021
b41545a
Fix code style
sbomer May 18, 2021
5643dfa
Add BaseMarkHandler
sbomer May 18, 2021
20d1ca6
Fix overrides
sbomer May 19, 2021
3a1efaa
Subclass TypeDefinitionCache
sbomer May 19, 2021
6bb719e
Merge remote-tracking branch 'origin/main' into illinkMarkHandler2
sbomer May 25, 2021
1cc2d5a
Implement IMetadataResolver for LinkContextMetadataResolver
sbomer May 25, 2021
67c9593
PR feedback
sbomer May 28, 2021
01b56ec
Fix indentation
jonpryor May 28, 2021
7c70a52
Fix indentation
jonpryor May 28, 2021
6c6d4c8
Fix indentation
jonpryor May 28, 2021
d83a793
Fix indentation
jonpryor May 28, 2021
b13b50c
Add comment for why we're setting _TrimmerDumpDependencies
jonpryor May 28, 2021
8b4c908
Fix indentation
jonpryor May 28, 2021
7501a0c
Merge remote-tracking branch 'origin/main' into illinkMarkHandler2
jonpryor May 28, 2021
bda4b4f
Remove LinkContextMetadataResolver
sbomer May 28, 2021
ff9ea51
Remove reflection workaround
sbomer Jun 2, 2021
742507a
Merge remote-tracking branch 'origin/main' into illinkMarkHandler2
sbomer Jun 2, 2021
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
Prev Previous commit
Next Next commit
Clean up targets
  • Loading branch information
@sbomer
sbomer committed May 5, 2021
commit 6e941ee80e8060c2a08d9fc7d321ba374dde70ee
42 changes: 14 additions & 28 deletions ...in.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ This file contains the .NET 5-specific targets to customize ILLink
Condition=" '$(PublishTrimmed)' == 'true' "
AfterTargets="ComputeResolvedFilesToPublishList"
DependsOnTargets="GetReferenceAssemblyPaths;_CreatePropertiesCache">
<PropertyGroup>
<!-- Mark all assemblies to be linked for AndroidLinkMode=Full -->
<_TrimmerDefaultAction Condition=" '$(AndroidLinkMode)' == 'Full' ">link</_TrimmerDefaultAction>
<_TrimmerDumpDependencies Condition=" '$(LinkerDumpDependencies)' == 'true' ">true</_TrimmerDumpDependencies>
<!-- make the output verbose to see what the linker is doing. FIXME: make dependent upon verbosity level -->
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose</_ExtraTrimmerArgs>
</PropertyGroup>
<ItemGroup>
<RuntimeHostConfigurationOption Include="Android.Runtime.AndroidEnvironment.VSAndroidDesignerIsEnabled"
Condition="'$(VSAndroidDesigner)' != ''"
Expand All @@ -23,39 +30,18 @@ This file contains the .NET 5-specific targets to customize ILLink
Condition=" '$(AndroidLinkMode)' == 'SdkOnly' and ( $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.AndroidX.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.Android.Support.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.Google.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.GooglePlayServices.')) ) ">
<TrimMode>link</TrimMode>
</ResolvedFileToPublish>
<!-- Mark our entry assembly as a root assembly. -->
<TrimmerRootAssembly Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Filename)' == '$(AssemblyName)' and '%(ResolvedFileToPublish.Extension)' == '.dll' " />
</ItemGroup>
<PropertyGroup>
<!-- make the output verbose to see what the linker is doing. FIXME: make dependent upon verbosity level -->
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose --deterministic --custom-data XATargetFrameworkDirectories="$(_XATargetFrameworkDirectories)"</_ExtraTrimmerArgs>
<_AdditionalTaskAssemblyDirectory>$(XamarinSdkRootDirectory)tools/dotnet-linker/</_AdditionalTaskAssemblyDirectory>
<_AdditionalTaskAssembly>$(_AdditionalTaskAssemblyDirectory)dotnet-linker.dll</_AdditionalTaskAssembly>
</PropertyGroup>
<PropertyGroup
Condition=" '$(AndroidAddKeepAlives)' != '' ">
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data AddKeepAlivesStep="$(AndroidAddKeepAlives)"</_ExtraTrimmerArgs>
</PropertyGroup>
<PropertyGroup
Condition=" '$(_ProguardProjectConfiguration)' != '' ">
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data ProguardConfiguration="$(_ProguardProjectConfiguration)"</_ExtraTrimmerArgs>
</PropertyGroup>
<PropertyGroup
Condition=" '$(AndroidLinkResources)' != '' ">
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data AndroidLinkResources="$(AndroidLinkResources)"</_ExtraTrimmerArgs>
</PropertyGroup>
<PropertyGroup
Condition=" '$(LinkerDumpDependencies)' == 'true' ">
<_ExtraTrimmerArgs>--dump-dependencies $(_ExtraTrimmerArgs)"</_ExtraTrimmerArgs>
</PropertyGroup>
<ItemGroup>

<_TrimmerCustomData Include="XATargetFrameworkDirectories" Value="$(_XATargetFrameworkDirectories)" />
<_TrimmerCustomData Condition=" '$(AndroidAddKeepAlives)' != '' " Include="AddKeepAlivesStep" Value="$(AndroidAddKeepAlives)" />
<_TrimmerCustomData Condition=" '$(_ProguardProjectConfiguration)' != '' " Include="ProguardConfiguration" Value="$(_ProguardProjectConfiguration)" />
<_TrimmerCustomData Condition=" '$(AndroidLinkResources)' != '' " Include="AndroidLinkResources" Value="$(AndroidLinkResources)" />

<!-- add our custom steps -->
<_TrimmerCustomSteps Include="$(MSBuildThisFileDirectory)..\tools\Microsoft.Android.Sdk.ILLink.dll">
<BeforeStep>MarkStep</BeforeStep>
<Type>Microsoft.Android.Sdk.ILLink.SetupStep</Type>
</_TrimmerCustomSteps>
</ItemGroup>
<ItemGroup>

<_PreserveLists Include="$(MSBuildThisFileDirectory)..\PreserveLists\*.xml" />
<TrimmerRootDescriptor
Condition=" '@(ResolvedFileToPublish->Count())' != '0' and '%(Filename)' != '' "
Expand Down