From d49653e4a34432a8547ff2d099c6de1413202b0c Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Fri, 6 Jun 2025 09:32:15 +0200 Subject: [PATCH] ci/android: trust system GLES if ANGLE_TAG is not specified In commit c99c67c4908 (ci/android: Only replace ANGLE if needed, 2025-06-05) ANGLE is replaced in the Android device only when ANGLE_TAG is specified. However it can still happen that the device was using ANGLE all along, and not replacing it means that the original version would not match the one built by mesa-ci, making the GLES version check fail unnecessarily. In case ANGLE_TAG is not specified the GLES version check can be skipped altogether, the rationale for this approach is that ANGLE can be considered the default GLES implementation for Android going forward, so if android-runner.sh has not replaced it we can just trust that the original one is in place. There might still be some fancy setups in the wild where the GLES implementation is mesa and not ANGLE, but we are not testing those in mesa-ci for now, so skipping the test for non-ANGLE GLES too is acceptable. Part-of: --- .gitlab-ci/android-runner.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh index 0b751722042..d10ed14e04b 100755 --- a/.gitlab-ci/android-runner.sh +++ b/.gitlab-ci/android-runner.sh @@ -122,12 +122,8 @@ if [ -n "${ANGLE_TAG:-}" ]; then echo "Fatal: Android is loading a wrong version of the ANGLE libs: ${ANGLE_HASH}" 1>&2 exit 1 fi -else - if ! printf "%s" "$GLES_RUNTIME_VERSION" | grep -Fq -- "${MESA_BUILD_VERSION}"; then - echo "Fatal: Android is loading a wrong version of the Mesa3D GLES libs: ${GLES_RUNTIME_VERSION}" 1>&2 - exit 1 - fi fi + if ! printf "%s" "$VK_RUNTIME_VERSION" | grep -Fq -- "${MESA_BUILD_VERSION}"; then echo "Fatal: Android is loading a wrong version of the Mesa3D Vulkan libs: ${VK_RUNTIME_VERSION}" 1>&2 exit 1