From cda20467b5583c32bdaf128631be302adacf7e09 Mon Sep 17 00:00:00 2001 From: amos Date: Tue, 2 Jun 2026 12:36:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=20aapt2=20=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=91=BD=E4=BB=A4=EF=BC=88=E9=81=BF=E5=85=8D=E9=9D=9E?= =?UTF-8?q?=E9=9B=B6=E9=80=80=E5=87=BA=E7=A0=81=E5=AF=BC=E8=87=B4=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/android-build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/android-build.yml b/.gitea/workflows/android-build.yml index 06ae5a4..a33abce 100644 --- a/.gitea/workflows/android-build.yml +++ b/.gitea/workflows/android-build.yml @@ -37,13 +37,12 @@ jobs: # 使用 ARM64 版本的 aapt2(来自 lzhiyong/android-sdk-tools) export CUSTOM_AAPT2_PATH=/usr/bin/aapt2 - echo "=== 使用 ARM64 aapt2 ===" - $CUSTOM_AAPT2_PATH 2>&1 | head -2 + echo "=== 使用 ARM64 aapt2 (35.0.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+ 支持) + # 使用自定义 aapt2 路径 echo "android.aapt2FromMavenOverride=$CUSTOM_AAPT2_PATH" >> gradle.properties # 直接使用系统 Gradle 8.14.4 编译(使用 ARM64 aapt2)