From 21a4f6e8944ca933f95bf10b86771a8e7bc1bc35 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 6 Feb 2023 20:48:15 +0100 Subject: [PATCH 1/2] Using Android NDK r25c on CI --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 07c4d98..9e10b84 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=linux/amd64 ubuntu:22.04 # Arguments that can be overridden in 'docker build' command: # Versions of Android SDK and NDK. The CMake is installed via NDK. ARG VERSION_SDK=8512546 -ARG VERSION_NDK=25.0.8775105 +ARG VERSION_NDK=25.2.9519653 ARG VERSION_CMAKE=3.22.1 # Package to install via pip3 From 43dc062b3d6ba491fd00f18dd195e0d2018918d8 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 6 Feb 2023 20:52:23 +0100 Subject: [PATCH 2/2] Using Android SDK tools v9.0 --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 9e10b84..5883d2a 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ FROM --platform=linux/amd64 ubuntu:22.04 # Arguments that can be overridden in 'docker build' command: # Versions of Android SDK and NDK. The CMake is installed via NDK. -ARG VERSION_SDK=8512546 +ARG VERSION_SDK=9477386 ARG VERSION_NDK=25.2.9519653 ARG VERSION_CMAKE=3.22.1