Using CMake from the system

Author: Javernaut

scripts/export-host-variables.sh

@@ -26,7 +26,7 @@ export HOST_TAG=$HOST_TAG
 export HOST_NPROC=$HOST_NPROC
 
 # Using CMake from the Android SDK
-export CMAKE_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.22.1/bin/cmake
+export CMAKE_EXECUTABLE=$(which cmake)
 # Using Make from the Android SDK
 export MAKE_EXECUTABLE=${ANDROID_NDK_HOME}/prebuilt/${HOST_TAG}/bin/make
 # Using Build machine's Ninja. It is used for libdav1d building. Needs to be installed

tools/docker/Dockerfile

@@ -4,7 +4,7 @@ FROM --platform=linux/amd64 ubuntu:22.04
 # Versions of Android SDK and NDK. The CMake is installed via NDK.
 ARG VERSION_SDK=11076708
 ARG VERSION_NDK=27.1.12297006
-ARG VERSION_CMAKE=3.22.1
+ARG VERSION_CMAKE=3.30.4
 
 # Package to install via pip3
 ARG VERSION_MESON=1.5.2
@@ -28,6 +28,7 @@ RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install
   openjdk-17-jdk-headless \
   curl \
   unzip \
+  cmake \
   bash \
   nasm \
   pkg-config \