From 4c5cd385b756b743aac1ef69dba8861324d495ce Mon Sep 17 00:00:00 2001
From: Codex <codex@example.local>
Date: Sun, 5 Jul 2026 17:42:04 +0000
Subject: [PATCH] Use headless JDK in Gitea Android workflow

---
 .gitea/workflows/android.yaml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/android.yaml b/.gitea/workflows/android.yaml
index 0b7cc6f..9f242e2 100644
--- a/.gitea/workflows/android.yaml
+++ b/.gitea/workflows/android.yaml
@@ -5,8 +5,6 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/cirruslabs/android-sdk:35
     steps:
       - name: Build APK
         env:
@@ -18,8 +16,11 @@ jobs:
             apt-get update
             apt-get install -y git curl unzip
           fi
+          if ! command -v java >/dev/null 2>&1; then
+            apt-get update
+            apt-get install -y openjdk-17-jdk-headless
+          fi
           java -version
-          sdkmanager --version
 
           WORKDIR="${PWD}/source"
           rm -rf "${WORKDIR}"
@@ -38,10 +39,16 @@ jobs:
           fi
           export PATH="${GRADLE_HOME}/bin:${PATH}"
 
-          export ANDROID_HOME="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-/opt/android-sdk-linux}}"
+          export ANDROID_HOME="${PWD}/.ci/android-sdk"
           export ANDROID_SDK_ROOT="${ANDROID_HOME}"
           export CMDLINE_TOOLS="${ANDROID_HOME}/cmdline-tools/latest"
-          export PATH="${CMDLINE_TOOLS}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin:${PATH}"
+          if [ ! -x "${CMDLINE_TOOLS}/bin/sdkmanager" ]; then
+            mkdir -p "${ANDROID_HOME}/cmdline-tools"
+            curl -fsSL -o .ci/android-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
+            unzip -q .ci/android-tools.zip -d "${ANDROID_HOME}/cmdline-tools"
+            mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${CMDLINE_TOOLS}"
+          fi
+          export PATH="${CMDLINE_TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}"
 
           yes | sdkmanager --licenses >/dev/null || true
           sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools"