From cc8a53393cb6214e498b79b147b75df58dd4c839 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Wed, 10 Jun 2026 16:39:22 +0200 Subject: [PATCH] ci/android: Update Cuttlefish build - Switch 'drm_nctx_guest_angle' GPU mode to skiavk, as Turnip now supports multiple graphics queues - Update Mesa to latest main, 1a9a0a15f7c ("ir3: lower undef booleans to zero") - Update virglrenderer to latest main, d2357f2a ("amend missing line breaks") Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/container/debian/gitlab-ci.yml | 2 +- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/debian/gitlab-ci.yml b/.gitlab-ci/container/debian/gitlab-ci.yml index a044ba8abed..45d79d8ec88 100644 --- a/.gitlab-ci/container/debian/gitlab-ci.yml +++ b/.gitlab-ci/container/debian/gitlab-ci.yml @@ -185,7 +185,7 @@ debian/s390x_build: LLVM_VERSION: &debian-android-llvm 19 CUTTLEFISH_PROJECT_PATH: gfx-ci/android/aosp-manifest CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus - CUTTLEFISH_BUILD_NUMBER: 20260427.001 + CUTTLEFISH_BUILD_NUMBER: 20260610.001 # Android NDK cross-build image debian/android_build: diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index b819e6b5007..c7ba3212ae0 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,7 +23,7 @@ variables: DEBIAN_BUILD_TAG: "20260604-bindgen" DEBIAN_TEST_BASE_TAG: "20260604-rust196" - DEBIAN_TEST_ANDROID_TAG: "20260602-angle-19" + DEBIAN_TEST_ANDROID_TAG: "20260610-cuttlefish" DEBIAN_TEST_GL_TAG: "20260609-vvl-2a" DEBIAN_TEST_VIDEO_TAG: "20260512-vkuprev" DEBIAN_TEST_VK_TAG: "20260604-vkd3d"