From 8aac90d32a6d77439398a4af300bd6c7a1888a67 Mon Sep 17 00:00:00 2001
From: littlecodedragon <253116839+littlecodedragon@users.noreply.github.com>
Date: Thu, 7 May 2026 05:15:06 +0200
Subject: [PATCH] CI: ensure build-tools 35 and verify aidl before build

---
 .forgejo/workflows/build_release.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.forgejo/workflows/build_release.yml b/.forgejo/workflows/build_release.yml
index 01d7ffa66..d53739f65 100755
--- a/.forgejo/workflows/build_release.yml
+++ b/.forgejo/workflows/build_release.yml
@@ -122,6 +122,18 @@ jobs:
           export ANDROID_SDK_ROOT="$sdk_dir"
           echo "ANDROID_HOME=$ANDROID_HOME" >> "$GITHUB_ENV"
           echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> "$GITHUB_ENV"
+          sdkmanager_bin="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
+          if [ -x "$sdkmanager_bin" ]; then
+            yes | "$sdkmanager_bin" --licenses >/dev/null || true
+            yes | "$sdkmanager_bin" "platform-tools" "build-tools;35.0.0"
+          else
+            echo "sdkmanager not found at $sdkmanager_bin"
+          fi
+          if [ ! -x "$ANDROID_HOME/build-tools/35.0.0/aidl" ]; then
+            echo "Expected executable missing: $ANDROID_HOME/build-tools/35.0.0/aidl"
+            ls -la "$ANDROID_HOME/build-tools" || true
+            exit 1
+          fi
           printf 'sdk.dir=%s\n' "$ANDROID_HOME" > local.properties
           chmod +x ./gradlew
           export GRADLE_USER_HOME="${PWD}/.gradle-ci"