From b45ca7dcdd77da733a78e0963feaa076fd5e8669 Mon Sep 17 00:00:00 2001
From: k1ngsterr1 <ruslanmakhmatov@gmail.com>
Date: Fri, 27 Feb 2026 19:40:52 +0500
Subject: [PATCH] fix: streamline JDK 17 installation process in Android build
 workflow

---
 .gitea/workflows/android.yaml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/android.yaml b/.gitea/workflows/android.yaml
index 916889e..3bc45e4 100644
--- a/.gitea/workflows/android.yaml
+++ b/.gitea/workflows/android.yaml
@@ -33,16 +33,13 @@ jobs:
 
       - name: Install JDK 17
         run: |
-          if java -version 2>&1 | grep -q "17"; then
-            echo "JDK 17 is already installed"
-          elif command -v apt-get &> /dev/null; then
-            sudo apt-get update && sudo apt-get install -y openjdk-17-jdk
-            echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> $GITHUB_ENV
-          elif command -v brew &> /dev/null; then
-            brew install openjdk@17
-            sudo ln -sfn "$(brew --prefix openjdk@17)/libexec/openjdk.jdk" /Library/Java/JavaVirtualMachines/openjdk-17.jdk
-            echo "JAVA_HOME=$(/usr/libexec/java_home -v 17)" >> $GITHUB_ENV
+          if ! java -version 2>&1 | grep -q "17"; then
+            apt-get update && apt-get install -y openjdk-17-jdk
           fi
+          JAVA_DIR=$(dirname $(dirname $(readlink -f $(which java))))
+          echo "JAVA_HOME=$JAVA_DIR" >> $GITHUB_ENV
+          export JAVA_HOME="$JAVA_DIR"
+          echo "JAVA_HOME set to $JAVA_HOME"
 
       - name: Install Android SDK
         run: |