From dfd205d60e96a4ae0c91902f3db7b1b82a939707 Mon Sep 17 00:00:00 2001
From: amos <amos@gitea.kg8.net>
Date: Tue, 2 Jun 2026 12:03:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=85=8D=E7=BD=AE=20ARM64=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20aapt2=EF=BC=8C=E6=94=AF=E6=8C=81=E5=9C=A8=20ARM=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=BC=96=E8=AF=91=20Android?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/android-build.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/android-build.yml b/.gitea/workflows/android-build.yml
index 050b022..2e95e4f 100644
--- a/.gitea/workflows/android-build.yml
+++ b/.gitea/workflows/android-build.yml
@@ -35,7 +35,12 @@ jobs:
         export ANDROID_SDK_ROOT=$ANDROID_HOME
         export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/34.0.0:$PATH
         
-        # 直接使用系统 Gradle 8.14.4 编译（避免 Gradle 8.2 wrapper 在 Alpine 上的 JVM 崩溃问题）
+        # 创建 gradle.properties 配置自定义 aapt2（ARM64 版本）
+        echo "android.aapt2FromMavenOverride=/usr/bin/aapt2" >> gradle.properties
+        echo "org.gradle.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m" >> gradle.properties
+        echo "org.gradle.daemon=false" >> gradle.properties
+        
+        # 直接使用系统 Gradle 8.14.4 编译（使用 ARM64 aapt2）
         echo "=== 开始编译 ==="
         gradle assembleDebug \
           --no-daemon \
@@ -43,9 +48,6 @@ jobs:
           --no-watch-fs \
           --no-configuration-cache \
           --no-build-cache \
-          -Dorg.gradle.daemon=false \
-          -Dorg.gradle.jvmargs="-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m" \
-          -Dorg.gradle.internal.native.headers.unresolved.dependencies.ignore=true \
           -Dfile.encoding=UTF-8
         
         # 验证输出