Commit 7aed4e3
authored
[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.1 parent 3127c47 commit 7aed4e3
File tree
27 files changed
+69
-494
lines changed- src
- Microsoft.Android.Sdk.ILLink
- Xamarin.Android.Build.Tasks
- Linker
- Mobile.Tuner
- MonoDroid.Tuner
- Microsoft.Android.Sdk/targets
- Tasks
- Utilities
27 files changed
+69
-494
lines changedLines changed: 3 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
| 8 | + | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
| |||
25 | 24 | | |
26 | 25 | | |
27 | 26 | | |
28 | | - | |
| 27 | + | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
| |||
27 | 26 | | |
28 | 27 | | |
29 | 28 | | |
30 | | - | |
31 | | - | |
32 | | - | |
| 29 | + | |
33 | 30 | | |
34 | 31 | | |
35 | 32 | | |
| |||
397 | 394 | | |
398 | 395 | | |
399 | 396 | | |
400 | | - | |
| 397 | + | |
401 | 398 | | |
402 | 399 | | |
403 | 400 | | |
| |||
Lines changed: 0 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
16 | 14 | | |
17 | 15 | | |
18 | 16 | | |
| |||
21 | 19 | | |
22 | 20 | | |
23 | 21 | | |
24 | | - | |
25 | | - | |
26 | 22 | | |
27 | 23 | | |
28 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| 8 | + | |
12 | 9 | | |
13 | 10 | | |
14 | 11 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | | - | |
9 | | - | |
10 | | - | |
| 9 | + | |
11 | 10 | | |
12 | 11 | | |
13 | 12 | | |
| |||
24 | 23 | | |
25 | 24 | | |
26 | 25 | | |
27 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
28 | 31 | | |
29 | 32 | | |
30 | 33 | | |
| |||
Lines changed: 2 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| 8 | + | |
12 | 9 | | |
13 | 10 | | |
14 | 11 | | |
| |||
This file was deleted.
This file was deleted.
Lines changed: 2 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
| 20 | + | |
24 | 21 | | |
25 | | - | |
26 | 22 | | |
27 | 23 | | |
28 | 24 | | |
29 | 25 | | |
30 | | - | |
| 26 | + | |
31 | 27 | | |
32 | 28 | | |
33 | 29 | | |
| |||
0 commit comments