-
Notifications
You must be signed in to change notification settings - Fork 534
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[illink] consolidate & remove hardcoded assembly names (#9662)
Our codebase has various notions of "framework assembly", many of which are outdated and wrong! * `@(_SharedRuntimeAssemblies)` in `Xamarin.Android.Build.Tasks.targets`, which generates- * `src\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cs` * `src\Xamarin.Android.Build.Tasks\Utilities\Profile.cs` * `src\Microsoft.Android.Sdk.ILLink\Profile.cs` The new and *correct* way to identify a "framework assembly" is to check either: * `%(FrameworkReferenceName)` is `Microsoft.Android` or starts with `Microsoft.NETCore.` * `%(NuGetPackageId)` starts with `Microsoft.NETCore.App.Runtime.` or `Microsoft.Android.Runtime.` I moved the new logic into `MonoAndroidHelper.IsFrameworkAssembly()` and `MonoAndroidHelper.IsFromAKnownRuntimePack()` (useful for `.jar` and other files). I deleted all other instances of `Profile.cs`, which simplifies how trimmer steps are shared between the `<LinkAssembliesNoShrink/>` MSBuild task and the trimmer (illink). In these places, we were likely just checking against a stale list of assemblies *anyway*, so I simply removed all these checks.
- Loading branch information
1 parent
3127c47
commit 7aed4e3
Showing
27 changed files
with
69 additions
and
494 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.