Commit 8bf15ad
fix: suppress NuGet Linux native libs to bundle correct Android libbass.so
The ppy.osu.Framework.NativeLibs NuGet package ships Linux ARM64 native
libraries (libbass.so linking libc.so.6, libpthread.so.0). The .NET RID
fallback chain for android-arm64 resolves these Linux .so files into the
APK, overriding the correctly declared AndroidNativeLibrary items that
point to the Android-built versions (linking libOpenSLES.so, libandroid.so).
Fix: Add ExcludeAssets="native" PrivateAssets="all" to the NativeLibs
package reference in osu.Android.props to prevent NuGet from contributing
any native .so files. The correct Android libraries are supplied via
AndroidNativeLibrary from the framework submodule.
Also adds ABI verification to the release workflow to detect this class
of error (wrong platform .so in APK) in future builds.
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/9d91747c-8581-4e17-b3d8-a44994850fd3
Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>1 parent 78dbc42 commit 8bf15ad
2 files changed
Lines changed: 31 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| 221 | + | |
221 | 222 | | |
222 | 223 | | |
223 | 224 | | |
| |||
243 | 244 | | |
244 | 245 | | |
245 | 246 | | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
246 | 265 | | |
247 | 266 | | |
248 | 267 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
89 | 101 | | |
90 | 102 | | |
91 | 103 | | |
| |||
0 commit comments