Fix bass DllNotFoundException + harden APK verification + merge upstream master

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/1e7cb6f9-16ce-458e-921d-22823a0b1260

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>

Author: Copilot

.github/workflows/release.yml

@@ -280,8 +280,48 @@ jobs:
             exit 1
           fi
 
+          # Architecture sanity check: a previous build packaged the Linux-glibc
+          # libbass.so from ppy.osu.Framework.NativeLibs into lib/arm64-v8a/, which
+          # passed the name check above but failed at runtime with
+          # System.DllNotFoundException: bass because Android's bionic linker cannot
+          # resolve glibc-only symbols. Both Linux and Android builds report
+          # identically as "ELF 64-bit LSB shared object, ARM aarch64, version 1 (SYSV)"
+          # via file(1), so we rely on the presence of GLIBC_ versioned symbols
+          # (which exist only in glibc-linked binaries) to distinguish them.
           echo ""
-          echo "All required native libraries present ✓"
+          echo "Verifying native library architectures (must be Android arm64, not Linux glibc)..."
+          TMPDIR=$(mktemp -d)
+          trap 'rm -rf "$TMPDIR"' EXIT
+          BAD=0
+          for LIB in libbass.so libbass_fx.so libbassmix.so; do
+            unzip -p "$APK" "lib/arm64-v8a/$LIB" > "$TMPDIR/$LIB"
+            FILE_INFO=$(file "$TMPDIR/$LIB")
+            echo "  $LIB: $FILE_INFO"
+            # Must be a 64-bit aarch64 ELF shared object.
+            if ! echo "$FILE_INFO" | grep -qE "ELF 64-bit.*aarch64|ELF 64-bit.*ARM aarch64"; then
+              echo "::error::$LIB is not a 64-bit aarch64 ELF — runtime DllNotFoundException will occur."
+              BAD=1
+              continue
+            fi
+            # Reliable Linux-vs-Android distinguisher: GLIBC_ versioned symbols
+            # (e.g. memcpy@@GLIBC_2.17) appear only in glibc-linked Linux binaries.
+            # Android's bionic libc uses no symbol versioning.
+            if strings "$TMPDIR/$LIB" | grep -q "^GLIBC_"; then
+              echo "::error::$LIB references GLIBC_ versioned symbols — this is the Linux ELF from ppy.osu.Framework.NativeLibs runtimes/linux-arm64/native/, not the Android ELF from ppy.osu.Framework.Android. Android's bionic linker cannot load it; the app will crash at startup with System.DllNotFoundException: bass."
+              BAD=1
+              continue
+            fi
+            echo "    ✅ $LIB is a valid Android arm64 ELF"
+          done
+
+          if [ "$BAD" -ne 0 ]; then
+            echo ""
+            echo "::error::One or more native libraries in the APK are NOT valid Android arm64 binaries. This usually means desktop runtime .so files (e.g. from ppy.osu.Framework.NativeLibs runtimes/linux-arm64/native/) leaked into lib/arm64-v8a/ during packaging. See osu.Android.props FixRuntimePackAssetTypes target."
+            exit 1
+          fi
+
+          echo ""
+          echo "All required native libraries present and valid ✓"
 
       - name: Upload APK artifact
         uses: actions/upload-artifact@v7

osu.Android.props

@@ -82,13 +82,46 @@
        Only .so files need the AssetType override — the previous broader filter
        (all non-DLL, non-PDB) incorrectly reclassified signing metadata and config
        files, which corrupted the APK signature (INSTALL_PARSE_FAILED_NO_CERTIFICATES).
-       Scoped to Release only to avoid interfering with Debug builds. -->
+       Scoped to Release only to avoid interfering with Debug builds.
+
+       IMPORTANT: only Android-runtime .so files may be marked as native and packaged
+       into the APK. ppy.osu.Framework transitively depends on ppy.osu.Framework.NativeLibs
+       which ships desktop-only natives under runtimes/linux-arm64/native/, runtimes/osx/native/,
+       runtimes/win-*/native/ etc. — including a bare libbass.so, libbass_fx.so, libbassmix.so
+       for Linux. If any of those are marked AssetType=native, the .NET Android SDK packs them
+       into lib/arm64-v8a/ of the APK, racing with (and replacing) the proper Android arm64
+       libbass*.so coming from ppy.osu.Framework.Android's AAR (jni/arm64-v8a/). The Linux ELF
+       is linked against glibc and cannot be loaded by Android's bionic dynamic linker, which
+       surfaces at startup as System.DllNotFoundException: bass from AudioManager..ctor →
+       ManagedBass.Bass.get_DeviceCount, immediately crashing the app. -->
   <Target Name="FixRuntimePackAssetTypes" AfterTargets="ResolveRuntimePackAssets;ComputeFilesToPublish;ComputeResolvedFilesToPublishList"
           Condition="'$(Configuration)' == 'Release'">
     <ItemGroup>
-      <RuntimePackAsset Update="@(RuntimePackAsset)" Condition="'%(Extension)' == '.so'">
+      <!-- Strip desktop/iOS runtime .so files from the Android publish set entirely.
+           Match path components for any non-Android RID known to ship .so files.
+           Path normalisation handles both Windows (\) and Unix (/) separators. -->
+      <ResolvedFileToPublish Remove="@(ResolvedFileToPublish)"
+                             Condition="'%(Extension)' == '.so'
+                                        AND ($([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/linux-'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/linux/'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/osx-'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/osx/'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/ios-'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/ios/'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/maccatalyst-'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/win-'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/win/'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/browser-'))
+                                             OR $([System.String]::Copy('%(Identity)').Replace('\','/').Contains('/runtimes/freebsd-')))" />
+      <!-- Only mark Android-RID runtime pack assets as native. RuntimePackAsset items carry
+           an explicit RuntimeIdentifier metadata, so this filter is exact. -->
+      <RuntimePackAsset Update="@(RuntimePackAsset)"
+                        Condition="'%(Extension)' == '.so'
+                                   AND $([System.String]::Copy('%(RuntimeIdentifier)').StartsWith('android'))">
         <AssetType>native</AssetType>
       </RuntimePackAsset>
+      <!-- Mark the surviving (Android-only after the Remove above) publish .so files as native
+           so the Android SDK packs them into lib/<abi>/ rather than dropping them as data. -->
       <ResolvedFileToPublish Update="@(ResolvedFileToPublish)" Condition="'%(Extension)' == '.so'">
         <AssetType>native</AssetType>
       </ResolvedFileToPublish>