Merge pull request #173 from winnerspiros/fix/revert-to-android-native-build-working-state-4120152865434539135

Revert to last working build for Android native (PR #10772562851119172684)

Author: winnerspiros

.github/workflows/release.yml

@@ -86,11 +86,14 @@ jobs:
 
       - name: Build Android APK
         run: |
-          # Use optimized publish command with aggressive trimming (defined in project props)
+          # Use optimized publish command with aggressive trimming and RID-specific build
           PUBLISH_CMD="dotnet publish -c Release osu.Android/osu.Android.csproj -f net10.0-android -r android-arm64 --self-contained true \
             -p:Version=${{ steps.version.outputs.version }} \
             -p:ApplicationDisplayVersion=${{ steps.version.outputs.version }} \
             -p:ApplicationVersion=${{ github.run_number }} \
+            -p:PublishTrimmed=true -p:TrimMode=link -p:AndroidLinkMode=SdkOnly \
+            -p:AndroidEnableResourceShrinking=true \
+            -p:MtouchLink=Full \
             -p:AndroidCreatePackagePerAbi=false"
 
           if [ "${{ steps.keystore.outputs.has_keystore }}" == "true" ]; then
@@ -114,11 +117,13 @@ jobs:
             APK=$(find osu.Android/bin/Release -name "*.apk" | head -1)
           fi
 
-
-          echo "Verifying APK signature..."
-          APKSIGNER=$(find $ANDROID_HOME/build-tools -name apksigner | sort -r | head -1)
-          if [ -n "$APKSIGNER" ]; then
-            $APKSIGNER verify --verbose "$APK"
+          echo "Optimizing APK using zipalign if available..."
+          # zipalign is usually in the build-tools directory of Android SDK
+          ZIPALIGN=$(find $ANDROID_HOME/build-tools -name zipalign | sort -r | head -1)
+          if [ -n "$ZIPALIGN" ]; then
+            $ZIPALIGN -v 4 "$APK" "${APK}.aligned"
+            mv "${APK}.aligned" "$APK"
+            echo "zipalign complete."
           fi
 
           echo "Final APK size: $(du -h $APK | cut -f1)"

HitErrorMeter_master.cs

@@ -0,0 +1,79 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play.HUD.HitErrorMeters
+{
+    public abstract partial class HitErrorMeter : CompositeDrawable, ISerialisableDrawable
+    {
+        protected HitWindows HitWindows { get; private set; }
+
+        [Resolved(canBeNull: true)]
+        private ScoreProcessor processor { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private GameplayClockContainer gameplayClockContainer { get; set; }
+
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(DrawableRuleset drawableRuleset)
+        {
+            HitWindows = drawableRuleset?.FirstAvailableHitWindows ?? HitWindows.Empty;
+
+            // This is to allow the visual state to be correct after HUD comes visible after being hidden.
+            AlwaysPresent = true;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            gameplayClockContainer?.OnSeek += Clear;
+
+            processor?.NewJudgement += processorNewJudgement;
+        }
+
+        // Scheduled as meter implementations are likely going to change/add drawables when reacting to this.
+        private void processorNewJudgement(JudgementResult j) => Schedule(() => OnNewJudgement(j));
+
+        /// <summary>
+        /// Fired when a new judgement arrives.
+        /// </summary>
+        /// <param name="judgement">The new judgement.</param>
+        protected abstract void OnNewJudgement(JudgementResult judgement);
+
+        protected Color4 GetColourForHitResult(HitResult result)
+        {
+            return colours.ForHitResult(result);
+        }
+
+        /// <summary>
+        /// Invoked by <see cref="GameplayClockContainer.OnSeek"/>.
+        /// Any inheritors of <see cref="HitErrorMeter"/> should have this method clear their container that displays the hit error results.
+        /// </summary>
+        public abstract void Clear();
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            processor?.NewJudgement -= processorNewJudgement;
+
+            gameplayClockContainer?.OnSeek -= Clear;
+        }
+    }
+}

NewDailyChallengeNotification_master.cs

@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps.Drawables.Cards;
+using osu.Game.Configuration;
+using osu.Game.Localisation;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Screens.OnlinePlay.DailyChallenge
+{
+    public partial class NewDailyChallengeNotification : SimpleNotification
+    {
+        private readonly Room room;
+
+        private BeatmapCardNano card = null!;
+
+        public NewDailyChallengeNotification(Room room)
+        {
+            this.room = room;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuGame? game, SessionStatics statics)
+        {
+            Text = DailyChallengeStrings.ChallengeLiveNotification;
+            var playlistItem = room.Playlist.FirstOrDefault();
+            if (playlistItem?.Beatmap.BeatmapSet is APIBeatmapSet beatmapSet)
+                Content.Add(card = new BeatmapCardNano(beatmapSet));
+            Activated = () =>
+            {
+                if (statics.Get<bool>(Static.DailyChallengeIntroPlayed))
+                    game?.PerformFromScreen(s => s.Push(new DailyChallenge(room)), [typeof(MainMenu)]);
+                else
+                    game?.PerformFromScreen(s => s.Push(new DailyChallengeIntro(room)), [typeof(MainMenu)]);
+
+                return true;
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            card.Width = Content.DrawWidth;
+        }
+    }
+}

final_fix.py

@@ -0,0 +1,44 @@
+import os
+
+def fix_loc():
+    path = 'osu.Game/Localisation/GraphicsSettingsStrings.cs'
+    with open(path, 'r') as f:
+        content = f.read()
+
+    # Correct insertion before Resolution
+    insertion = '\n        /// <summary>\n        /// "Refresh rate"\n        /// </summary>\n        public static LocalisableString RefreshRate => new TranslatableString(getKey(@"refresh_rate"), @"Refresh rate");\n'
+
+    # We use replace with exact match to ensure indentation is correct (8 spaces)
+    old_text = '        public static LocalisableString ScreenMode => new TranslatableString(getKey(@"screen_mode"), @"Screen mode");'
+    new_text = old_text + insertion
+
+    if old_text in content and 'RefreshRate' not in content:
+        with open(path, 'w') as f:
+            f.write(content.replace(old_text, new_text))
+        print("Fixed Localisation")
+
+def fix_results():
+    path = 'osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/ResultsScreen.cs'
+    with open(path, 'r') as f:
+        content = f.read()
+
+    # Fix the if-null patterns using regex to preserve indentation exactly
+    import re
+
+    # if (x != null) x.Looping = false; -> x?.Looping = false;
+    content = re.sub(r'if \((playerScoreTickChannel|opponentScoreTickChannel) != null\) \1\.Looping = false;', r'\1?.Looping = false;', content)
+
+    # if (x != null && condition) -> if (condition) \n x?.Looping = false;
+    # Wait, the original was:
+    # if (playerScoreTickChannel != null && playerScoreBar.Height >= playerScorePercent)
+    #    playerScoreTickChannel.Looping = false;
+
+    content = re.sub(r'if \((playerScoreTickChannel|opponentScoreTickChannel) != null && (.*?)\)\s+(.*?)\.Looping = false;',
+                     r'if (\2)\n                            \1?.Looping = false;', content)
+
+    with open(path, 'w') as f:
+        f.write(content)
+    print("Fixed ResultsScreen")
+
+fix_loc()
+fix_results()

fix_final_v4.py

@@ -0,0 +1,55 @@
+import os
+
+def fix_localisation():
+    path = 'osu.Game/Localisation/GraphicsSettingsStrings.cs'
+    with open(path, 'r') as f:
+        lines = f.readlines()
+
+    new_lines = []
+    skip = False
+    for i, line in enumerate(lines):
+        if 'public static LocalisableString ScreenMode' in line:
+            new_lines.append(line)
+            new_lines.append('\n')
+            new_lines.append('        /// <summary>\n')
+            new_lines.append('        /// "Refresh rate"\n')
+            new_lines.append('        /// </summary>\n')
+            new_lines.append('        public static LocalisableString RefreshRate => new TranslatableString(getKey(@"refresh_rate"), @"Refresh rate");\n')
+            new_lines.append('\n')
+            skip = True
+            continue
+
+        if skip:
+            if 'public static LocalisableString Resolution' in line:
+                new_lines.append('        /// <summary>\n')
+                new_lines.append('        /// "Resolution"\n')
+                new_lines.append('        /// </summary>\n')
+                new_lines.append(line)
+                skip = False
+            continue
+
+        new_lines.append(line)
+
+    with open(path, 'w') as f:
+        f.writelines(new_lines)
+
+def fix_results():
+    path = 'osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/ResultsScreen.cs'
+    with open(path, 'r') as f:
+        content = f.read()
+
+    # Identify the block to replace
+    import re
+    # We want to replace from "// safety timeout" to the end of the scoreBarProgress block
+    pattern = re.compile(r'// safety timeout to ensure scoreTicks don\'t play forever\s+Scheduler\.AddDelayed\(\(\) =>\s+\{.*?\}\s+scoreBarProgress\.BindValueChanged\(e =>\s+\{.*?\}\);\s+\}\);', re.DOTALL)
+
+    # That's too complex. Let's just target the specific lines.
+
+    fixed_content = re.sub(r'Scheduler\.AddDelayed\(\(\) =>\s+\{\s+playerScoreTickChannel\?\.Looping = false;\s+opponentScoreTickChannel\?\.Looping = false;\s+opponentScoreTickChannel\?\.Looping = false;\s+scoreBarProgress\.BindValueChanged',
+                           r'Scheduler.AddDelayed(() =>\n                    {\n                        playerScoreTickChannel?.Looping = false;\n                        opponentScoreTickChannel?.Looping = false;\n                    }, score_text_duration + 500);\n\n                    scoreBarProgress.BindValueChanged', content)
+
+    with open(path, 'w') as f:
+        f.write(fixed_content)
+
+fix_localisation()
+fix_results()

osu.Android.props

@@ -3,7 +3,7 @@
     <SupportedOSPlatformVersion>33.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>android-arm64</RuntimeIdentifiers>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
-    <MandroidI18n>CJK;West;</MandroidI18n>
+    <MandroidI18n>CJK;Mideast;Rare;West;Other;</MandroidI18n>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidMessageHandler</AndroidHttpClientHandlerType>
     <!-- NullabilityInfoContextSupport is disabled by default for Android -->
     <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
@@ -15,18 +15,19 @@
   </PropertyGroup>
   <!-- Patch NuGet-provided .so files that ship with 4 KB ELF alignment to 16 KB.
        See build/PatchElfPageSize.targets for details.
+       TODO: Remove once ppy.Veldrid.SPIRV ships 16 KB-aligned native libraries. -->
   <Import Project="$(MSBuildThisFileDirectory)build\PatchElfPageSize.targets" />
   <!-- Release-only optimisations: AOT for low-latency gameplay, trimming for smaller APK.
        Suppress trim analysis warnings because the project uses reflection extensively
        (Newtonsoft.Json, Realm, AutoMapper, RuntimeBinder). -->
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
+    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
     <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>partial</TrimMode>
+    <TrimMode>link</TrimMode>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidEnableResourceShrinking>true</AndroidEnableResourceShrinking>
-    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
   </PropertyGroup>
   <ItemGroup>
     <!-- IMPORTANT: ppy.osu.Framework.Android v2026.318.0 only ships net8.0-android34.0 assets.
@@ -41,17 +42,4 @@
          Since Realm objects are not declared directly in Android projects, simply disable Fody. -->
     <DisableFody>true</DisableFody>
   </PropertyGroup>
-
-  <!-- WORKAROUND: Fix NativeAOT ILC failure on .NET 10 Android (early 2026 regression).
-       The SDK incorrectly stamps AssetType="runtime" on non-DLL files (pdb, so, dbg)
-       in the runtime pack, causing the AOT compiler to fail with BadImageFormatException.
-       This target fixes the metadata before the SDK uses it.
-       See: https://github.com/dotnet/runtime/pull/126214 -->
-  <Target Name="FixRuntimePackAssetTypes" AfterTargets="_AddRuntimeLibsToPublishAssets" BeforeTargets="ComputeManagedAssembliesToCompileToNative">
-    <ItemGroup>
-      <RuntimePackAsset Condition="'%(Extension)' != '.dll'">
-        <AssetType>native</AssetType>
-      </RuntimePackAsset>
-    </ItemGroup>
-  </Target>
 </Project>

osu.Android/OboeAudioRedirector.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -102,8 +101,6 @@ public void RefreshMixers(int hardwareSampleRate)
             Console.WriteLine($"[osu!] Oboe redirector initialized successfully: master={masterMixer}, sources={string.Join(',', mixerHandles)}");
         }
 
-        // Trimming warnings suppressed because AudioManager.ActiveMixers and related types are manually preserved in Linker.xml.
-        [UnconditionalSuppressMessage("Trimming", "IL2026, IL2067, IL2070, IL2072, IL2075, IL2080, IL2106", Justification = "Preserved in Linker.xml")]
         private IEnumerable<AudioMixer> getActiveMixers()
         {
             Type type = typeof(AudioManager);
@@ -126,24 +123,6 @@ private IEnumerable<AudioMixer> getActiveMixers()
                         }
                     }
                 }
-
-                foreach (var prop in type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
-                {
-                    if (prop.CanRead && prop.PropertyType.IsGenericType && prop.PropertyType.GetGenericArguments().Contains(typeof(AudioMixer)))
-                    {
-                        object? val = prop.GetValue(audioManager);
-                        if (val is IEnumerable enumerable)
-                        {
-                            foreach (var item in enumerable)
-                            {
-                                if (item is AudioMixer mixer)
-                                    yield return mixer;
-                            }
-                            yield break;
-                        }
-                    }
-                }
-
                 type = type.BaseType!;
             }
         }
@@ -298,8 +277,6 @@ private void addMixer(AudioMixer? mixer)
                 mixerHandles.Add(handle);
         }
 
-        // Trimming warnings suppressed because source handles (BASS mixer/stream/channel) are identified via reflection over types preserved in Linker.xml.
-        [UnconditionalSuppressMessage("Trimming", "IL2026, IL2067, IL2070, IL2072, IL2075, IL2080, IL2106", Justification = "Preserved in Linker.xml")]
         private int findHandle(object obj)
         {
             Type? type = obj.GetType();

osu.Android/OsuGameActivity.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Diagnostics.CodeAnalysis;
 using Android.App;
 using Android.Content.PM;
 using Android.Content;
@@ -74,20 +73,7 @@ protected override osu.Framework.Game CreateGame()
             return game;
         }
 
-
         public OsuGameActivity()
-        {
-            initialise();
-        }
-
-        protected OsuGameActivity(IntPtr handle, JniHandleOwnership transfer)
-            : base()
-        {
-            initialise();
-        }
-
-        [UnconditionalSuppressMessage("Trimming", "IL2026, IL2067, IL2070, IL2072, IL2075, IL2080, IL2106", Justification = "Preserved in Linker.xml")]
-        private void initialise()
         {
             game = new OsuGameAndroid(this);