From 555c37ca2cf9a6f2670e7bdd690c84611f21c90f Mon Sep 17 00:00:00 2001
From: Anton Afanasyeu <a.afanasieff@gmail.com>
Date: Sun, 9 Aug 2026 19:40:30 +0200
Subject: [PATCH] CI: put Android SDK cmake on PATH for native codec builds.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 Dockerfile.androidcast-ci   | 2 +-
 ci-build-and-publish-ota.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.androidcast-ci b/Dockerfile.androidcast-ci
index 72041d1..fcf8a8d 100644
--- a/Dockerfile.androidcast-ci
+++ b/Dockerfile.androidcast-ci
@@ -23,7 +23,7 @@ RUN mkdir -p "${ANDROID_HOME}/cmdline-tools" \
     && mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest" \
     && rm /tmp/cmdline-tools.zip
 
-ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}"
+ENV PATH="${ANDROID_HOME}/cmake/3.22.1/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}"
 
 RUN yes | sdkmanager --licenses >/dev/null \
     && sdkmanager --install \
diff --git a/ci-build-and-publish-ota.sh b/ci-build-and-publish-ota.sh
index 082552e..7edb5c6 100755
--- a/ci-build-and-publish-ota.sh
+++ b/ci-build-and-publish-ota.sh
@@ -67,6 +67,12 @@ fi
 source "$ROOT/scripts/android-ndk.sh"
 export ANDROID_NDK_HOME="$(androidcast_find_ndk_root "$ROOT")"
 export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
+if [[ -n "${ANDROID_SDK_ROOT:-}" ]]; then
+  _cmake_bin="$(find "${ANDROID_SDK_ROOT}/cmake" -path '*/bin/cmake' 2>/dev/null | head -1)"
+  if [[ -n "$_cmake_bin" ]]; then
+    export PATH="$(dirname "$_cmake_bin"):${PATH}"
+  fi
+fi
 if [[ -n "${ANDROID_SDK_ROOT:-}" ]]; then
   LOCAL_PROPS="$ROOT/local.properties"
   LOCAL_PROPS_BACKUP=""