From ad1167aeb572d439619d77e09b20a7d91e5349ad Mon Sep 17 00:00:00 2001
From: Hansong <107070759+kirklandsign@users.noreply.github.com>
Date: Thu, 27 Mar 2025 11:17:04 -0700
Subject: [PATCH 1/2] Update install_android.sh

---
 .ci/docker/common/install_android.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.ci/docker/common/install_android.sh b/.ci/docker/common/install_android.sh
index e990bc6933f..2948e496a68 100755
--- a/.ci/docker/common/install_android.sh
+++ b/.ci/docker/common/install_android.sh
@@ -76,7 +76,23 @@ install_sdk() {
   yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root="${SDK_INSTALLATION_DIR}" --install "tools"
 }
 
+function write_android_sccache_stub() {
+  BINARY=$1
+  mv "/opt/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$1" "/opt/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/.$1"
+  cat >"/opt/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$1" <<EOF
+#!/bin/sh
+if [ command -v sccache && \$(env -u LD_PRELOAD ps -p \$PPID -o comm=) != sccache ]; then
+  exec sccache /opt/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/.$1 "\$@"
+else
+  exec /opt/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/.$1 "\$@"
+fi
+EOF
+  chmod a+x "/opt/toolchains/llvm/prebuilt/linux-x86_64/bin/${BINARY}"
+}
+
 install_prerequiresites
 install_ndk
 install_cmdtools
 install_sdk
+write_android_sccache_stub clang++
+write_android_sccache_stub clang

From d0b9f27a97946cad3b8f9e12d9f9d3cde02bce9b Mon Sep 17 00:00:00 2001
From: Hansong <107070759+kirklandsign@users.noreply.github.com>
Date: Thu, 27 Mar 2025 12:41:27 -0700
Subject: [PATCH 2/2] Update install_android.sh

---
 .ci/docker/common/install_android.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/docker/common/install_android.sh b/.ci/docker/common/install_android.sh
index 2948e496a68..32629b1f24c 100755
--- a/.ci/docker/common/install_android.sh
+++ b/.ci/docker/common/install_android.sh
@@ -87,7 +87,7 @@ else
   exec /opt/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/.$1 "\$@"
 fi
 EOF
-  chmod a+x "/opt/toolchains/llvm/prebuilt/linux-x86_64/bin/${BINARY}"
+  chmod a+x "/opt/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${BINARY}"
 }
 
 install_prerequiresites