From 2cdf87fb35173f45a91dc5a8db8f3ec5adf8bb9a Mon Sep 17 00:00:00 2001
From: amos <amos@gitea.kg8.net>
Date: Tue, 2 Jun 2026 12:33:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=20lzhiyong=20?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84=20ARM64=20aapt2=EF=BC=88Android=20S?=
 =?UTF-8?q?DK=2035.0.2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitea/workflows/android-build.yml b/.gitea/workflows/android-build.yml
index 2e95e4f..06ae5a4 100644
--- a/.gitea/workflows/android-build.yml
+++ b/.gitea/workflows/android-build.yml
@@ -35,10 +35,16 @@ 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.properties 配置自定义 aapt2（ARM64 版本）
-        echo "android.aapt2FromMavenOverride=/usr/bin/aapt2" >> gradle.properties
+        # 使用 ARM64 版本的 aapt2（来自 lzhiyong/android-sdk-tools）
+        export CUSTOM_AAPT2_PATH=/usr/bin/aapt2
+        echo "=== 使用 ARM64 aapt2 ==="
+        $CUSTOM_AAPT2_PATH 2>&1 | head -2
+        
+        # 创建 gradle.properties 配置
         echo "org.gradle.jvmargs=-Xmx2g -XX:+UseG1GC -XX:MaxMetaspaceSize=512m" >> gradle.properties
         echo "org.gradle.daemon=false" >> gradle.properties
+        # 使用自定义 aapt2 路径（Gradle 8.0+ 支持）
+        echo "android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH" >> gradle.properties
         
         # 直接使用系统 Gradle 8.14.4 编译（使用 ARM64 aapt2）
         echo "=== 开始编译 ==="