Using CMake 3.30.5 from Android SDK

Javernaut · Oct 16, 2024 · 0a259ae · 0a259ae
1 parent eea133b
commit 0a259ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/export-host-variables.sh b/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=${ANDROID_SDK_HOME}/cmake/3.30.4/bin/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

diff --git a/tools/docker/Dockerfile b/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