Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
-p:AndroidSigningKeyPass=${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
-p:AndroidSigningStorePass=${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}

- name: Build Android APK (unsigned)
- name: Build Android APK (signed with default debug key)
if: steps.keystore.outputs.has_keystore != 'true'
run: >
dotnet publish -c Release -p:PublishTrimmed=false -p:AndroidLinkMode=None
Expand All @@ -113,7 +113,6 @@ jobs:
-p:Version=${{ steps.version.outputs.version }}
-p:ApplicationDisplayVersion=${{ steps.version.outputs.version }}
-p:ApplicationVersion=${{ github.run_number }}
-p:AndroidKeyStore=false

- name: Find APK
id: find_apk
Expand Down
7 changes: 4 additions & 3 deletions build/PatchElfPageSize.targets
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,11 @@ finally
Patches any 64-bit .so in the NuGet cache that has sub-16 KB LOAD alignment.
The patch is idempotent — already-aligned files are skipped.
-->
<Target Name="PatchAndroidNativeLibPageSize" BeforeTargets="Build">
<Target Name="PatchAndroidNativeLibPageSize" BeforeTargets="Build">
<ItemGroup>
<_NuGetNativeLibs Include="$(NuGetPackageRoot)/**/runtimes/android-*/native/*.so" />
<_NativeLibs Include="$(NuGetPackageRoot)/**/*.so" />
<_NativeLibs Include="$(MSBuildThisFileDirectory)../osu.Android/libs/**/*.so" />
</ItemGroup>
<PatchElfPageSize FilePath="%(Identity)" Condition="'@(_NuGetNativeLibs)' != ''" />
<PatchElfPageSize FilePath="%(Identity)" Condition="'@(_NativeLibs)' != ''" />
</Target>
</Project>
8 changes: 6 additions & 2 deletions osu.Android.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,16 @@
<DisableFody>true</DisableFody>
</PropertyGroup>

<!-- Fix for .NET 10 Android AOT misclassifying non-managed assets in runtime pack -->
<Target Name="FixRuntimePackAssetTypes" AfterTargets="ResolveRuntimePackAssets">
<!-- Fix for .NET 10 Android AOT misclassifying non-managed assets in runtime pack.
This is critical for Android 16 (API 36) which has stricter manifest/parsing rules. -->
<Target Name="FixRuntimePackAssetTypes" AfterTargets="ResolveRuntimePackAssets;ComputeFilesToPublish">
<ItemGroup>
<RuntimePackAsset Update="@(RuntimePackAsset)" Condition="'%(Extension)' != '.dll'">
<AssetType>native</AssetType>
</RuntimePackAsset>
<ResolvedFileToPublish Update="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll' and '%(ResolvedFileToPublish.AssetType)' == ''">
<AssetType>native</AssetType>
</ResolvedFileToPublish>
</ItemGroup>
</Target>
</Project>
Loading