Skip to content

Commit 819cb88

Browse files
authored
Merge pull request #160 from winnerspiros/fix/android-trimming-errors-v2-12996628315585577934
Fix Android build failures caused by trimming and unresolvable linker types
2 parents e36d7a9 + 7943e93 commit 819cb88

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

osu.Android/OboeAudioRedirector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void RefreshMixers(int hardwareSampleRate)
102102
Console.WriteLine($"[osu!] Oboe redirector initialized successfully: master={masterMixer}, sources={string.Join(',', mixerHandles)}");
103103
}
104104

105-
[UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Preserved in Linker.xml")]
105+
[UnconditionalSuppressMessage("Trimming", "IL2070, IL2072, IL2075", Justification = "Preserved in Linker.xml")]
106106
private IEnumerable<AudioMixer> getActiveMixers()
107107
{
108108
Type type = typeof(AudioManager);
@@ -279,7 +279,7 @@ private void addMixer(AudioMixer? mixer)
279279
mixerHandles.Add(handle);
280280
}
281281

282-
[UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Preserved in Linker.xml")]
282+
[UnconditionalSuppressMessage("Trimming", "IL2067, IL2070, IL2072, IL2075", Justification = "Preserved in Linker.xml")]
283283
private int findHandle(object obj)
284284
{
285285
Type? type = obj.GetType();

osu.Android/OsuGameAndroid.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public OsuGameAndroid(OsuGameActivity activity)
6262
gameActivity = activity;
6363
}
6464

65-
[UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Preserved in Linker.xml")]
65+
[UnconditionalSuppressMessage("Trimming", "IL2070, IL2072, IL2075", Justification = "Preserved in Linker.xml")]
6666
protected override void LoadComplete()
6767
{
6868
base.LoadComplete();
@@ -390,7 +390,7 @@ public override void SetHost(GameHost host)
390390

391391
protected override BatteryInfo CreateBatteryInfo() => new AndroidBatteryInfo();
392392

393-
[UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Preserved in Linker.xml")]
393+
[UnconditionalSuppressMessage("Trimming", "IL2070, IL2072, IL2075", Justification = "Preserved in Linker.xml")]
394394
protected override void Dispose(bool isDisposing)
395395
{
396396
try

0 commit comments

Comments
 (0)