ci/android: update ANDROID_NDK and ANDROID_SDK_VERSION
Update ANDROID_NDK to the latest stable release 27c and bump
ANDROID_SDK_VERSION to API version 34 which matches the Android 14
release we are using for the cuttlefish images.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33188>
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index e85d75f..6521749 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -156,10 +156,10 @@
# Android NDK cross-build image
.android-variables:
variables:
- ANDROID_SDK_VERSION: 33
- ANDROID_NDK: android-ndk-r25b
+ ANDROID_SDK_VERSION: 34
+ ANDROID_NDK: android-ndk-r27c
ANDROID_LLVM_VERSION: llvmorg-18.1.8
- ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20241219
+ ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250103
debian/android_build:
extends:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 46a88da..b03c5ad 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -16,7 +16,7 @@
DEBIAN_BASE_TAG: "20250109-libubsan1"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
- DEBIAN_BUILD_TAG: "20241220-android"
+ DEBIAN_BUILD_TAG: "20250124-android"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
@@ -27,7 +27,7 @@
DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
- DEBIAN_TEST_ANDROID_TAG: "20241220-venus"
+ DEBIAN_TEST_ANDROID_TAG: "20250124-android"
DEBIAN_TEST_GL_TAG: "20250114-piglit-63"
DEBIAN_TEST_VK_TAG: "20250114-piglit-63"
KERNEL_ROOTFS_TAG: "20250116-kernel"
