From b1eb93eac0cafa0901efb56417596abdf0309d16 Mon Sep 17 00:00:00 2001
From: n3t1zen <boringssl@proton.me>
Date: Mon, 4 May 2026 15:49:37 +0800
Subject: [PATCH] cache and fix android env

---
 .gitlab-ci.yml | 6 +++++-
 setup-ndk.sh   | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a10eb20..03807dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,13 @@ build-android:
     apt update && apt install -y openjdk-17-jdk-headless unzip curl rsync patch
     /usr/lib/jvm/java-17-openjdk-amd64/bin/java --version
     mkdir -p ~/.ssh && ssh-keyscan -p 22 -t rsa,ed25519 git.inker.bot >> ~/.ssh/known_hosts
+  cache:
+    - paths:
+        - $HOME/.gradle
+        - $HOME/go
   script: |
     export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version"
-    bash ./setup-ndk.sh
+    bash ./setup-ndk.sh && source ./android.env
     bin/update && bin/apply-ci && cd works/core
     git submodule update --init --recursive
     git tag v$version -f
diff --git a/setup-ndk.sh b/setup-ndk.sh
index 59b793c..93ff03c 100644
--- a/setup-ndk.sh
+++ b/setup-ndk.sh
@@ -21,4 +21,10 @@ sdkmanager \
   "build-tools;34.0.0" \
   "ndk;28.0.12433566"
 
-export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566"
\ No newline at end of file
+export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566"
+
+echo "
+ANDROID_HOME=$ANDROID_HOME
+ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
+ANDROID_NDK_HOME=$ANDROID_NDK_HOME
+" > android.env
\ No newline at end of file