Skip to content

Commit 071d677

Browse files
Fix Android build failure by updating Linker.xml
- Correct assembly for PriorityQueue`2 in .NET 10 (System.Collections). - Remove preservation for missing UnbindCollectionChanged method in BindableList. - Consolidate Veldrid and ManagedBass assembly references to resolve linker errors. - Fix assembly/namespace mapping for osu.Framework.Platform.Android.
1 parent 85e7200 commit 071d677

1 file changed

Lines changed: 7 additions & 16 deletions

File tree

osu.Android/Linker.xml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,38 @@
11
<linker>
2-
<assembly fullname="System.Runtime">
2+
<assembly fullname="System.Collections">
33
<type fullname="System.Collections.Generic.PriorityQueue`2" preserve="all" />
4+
</assembly>
5+
<assembly fullname="System.Runtime">
46
<type fullname="System.Collections.Generic.IEnumerable`1" preserve="all" />
57
<type fullname="System.Collections.IEnumerable" preserve="all" />
68
<type fullname="System.Runtime.CompilerServices.Unsafe" preserve="all" />
79
</assembly>
810
<assembly fullname="System.Memory" preserve="all" />
911
<assembly fullname="System.Formats.Asn1" preserve="all" />
1012
<assembly fullname="MessagePack">
11-
<type fullname="MessagePack.Internal.PriorityQueue`1" preserve="all" />
1213
<type fullname="MessagePack.Resolvers.DynamicUnionResolver" preserve="all" />
1314
<type fullname="MessagePack.Resolvers.DynamicObjectResolver" preserve="all" />
1415
</assembly>
15-
<assembly fullname="ManagedBass">
16-
<type fullname="ManagedBass.Bass" preserve="all" />
17-
</assembly>
18-
<assembly fullname="ManagedBass.Mix">
19-
<type fullname="ManagedBass.Mix.BassMix" preserve="all" />
20-
</assembly>
2116
<assembly fullname="osu.Framework">
2217
<namespace fullname="osu.Framework.Audio" preserve="all" />
2318
<namespace fullname="osu.Framework.Bindables" preserve="all" />
24-
<namespace fullname="osu.Framework.Platform.Android" preserve="all" />
2519
<type fullname="osu.Framework.Audio.AudioManager">
2620
<property name="ActiveMixers" />
2721
<field name="TrackMixer" />
2822
<field name="SampleMixer" />
2923
</type>
3024
<type fullname="osu.Framework.Bindables.IBindableList`1">
3125
<method name="BindCollectionChanged" />
32-
<method name="UnbindCollectionChanged" />
3326
</type>
3427
<type fullname="osu.Framework.Bindables.BindableList`1">
3528
<method name="BindCollectionChanged" />
36-
<method name="UnbindCollectionChanged" />
3729
</type>
3830
<type fullname="osu.Framework.Audio.Mixing.AudioMixer" preserve="all" />
3931
</assembly>
40-
<assembly fullname="osu.Framework.Android" preserve="all" />
32+
<assembly fullname="osu.Framework.Android">
33+
<namespace fullname="osu.Framework.Platform.Android" preserve="all" />
34+
<namespace fullname="osu.Framework.Android" preserve="all" />
35+
</assembly>
4136
<assembly fullname="osu.Game">
4237
<type fullname="osu.Game.OsuGameBase" preserve="all" />
4338
<type fullname="osu.Game.Beatmaps.Beatmap" preserve="all" />
@@ -65,10 +60,6 @@
6560
<assembly fullname="Veldrid" preserve="all" />
6661
<assembly fullname="Veldrid.SPIRV" preserve="all" />
6762
<assembly fullname="ppy.Veldrid.SPIRV" preserve="all" />
68-
<assembly fullname="Veldrid.Vk">
69-
<type fullname="Veldrid.Vk.VkGraphicsDevice" preserve="all" />
70-
<type fullname="Veldrid.Vk.VkCommandList" preserve="all" />
71-
</assembly>
7263
<assembly fullname="AutoMapper" preserve="all" />
7364
<assembly fullname="Newtonsoft.Json" preserve="all" />
7465
<assembly fullname="Realm" preserve="all" />

0 commit comments

Comments
 (0)