Merge pull request #158 from winnerspiros/fix/android-build-optimization-13159275510640310113

Fix Android build and optimize trimming

Author: winnerspiros

.github/workflows/release.yml

@@ -86,14 +86,11 @@ jobs:
 
       - name: Build Android APK
         run: |
-          # Use optimized publish command with aggressive trimming and RID-specific build
+          # Use optimized publish command with aggressive trimming (defined in project props)
           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
@@ -118,7 +115,6 @@ jobs:
           fi
 
           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"

osu.Android.props

@@ -25,8 +25,8 @@
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
     <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>link</TrimMode>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <TrimMode>full</TrimMode>
+    <AndroidLinkMode>Full</AndroidLinkMode>
     <AndroidEnableResourceShrinking>true</AndroidEnableResourceShrinking>
   </PropertyGroup>
   <ItemGroup>

osu.Android/Linker.xml

@@ -1,5 +1,13 @@
 <linker>
-  <assembly fullname="System.Private.CoreLib">
+  <assembly fullname="System.Runtime">
     <type fullname="System.Collections.Generic.PriorityQueue`2" preserve="all" />
   </assembly>
+  <assembly fullname="MessagePack">
+    <type fullname="MessagePack.Internal.PriorityQueue`1" preserve="all" />
+    <type fullname="MessagePack.Resolvers.DynamicUnionResolver" preserve="all" />
+    <type fullname="MessagePack.Resolvers.DynamicObjectResolver" preserve="all" />
+  </assembly>
+  <assembly fullname="AutoMapper">
+    <type fullname="AutoMapper.Configuration.ProxyBase" preserve="all" />
+  </assembly>
 </linker>