From c99c67c490832400720ac4be951e19e0b767bd3d Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 5 Jun 2025 12:11:17 +0200 Subject: [PATCH] ci/android: Only replace ANGLE if needed Only replace the stock ANGLE libraries if the job inherits .test-angle. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/android-runner.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh index cc95de05b5f..eae635da066 100755 --- a/.gitlab-ci/android-runner.sh +++ b/.gitlab-ci/android-runner.sh @@ -92,19 +92,21 @@ $ADB shell rm -f /vendor/lib64/egl/libEGL_emulation.so* $ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_emulation.so* $ADB shell rm -f /vendor/lib64/egl/libGLESv2_emulation.so* -ANGLE_DEST_PATH=/vendor/lib64/egl -if [ "$ANDROID_VERSION" -ge 15 ]; then - ANGLE_DEST_PATH=/system/lib64 +if [ -n "${ANGLE_TAG:-}" ]; then + ANGLE_DEST_PATH=/vendor/lib64/egl + if [ "$ANDROID_VERSION" -ge 15 ]; then + ANGLE_DEST_PATH=/system/lib64 + fi + + $ADB shell rm -f "$ANGLE_DEST_PATH/libEGL_angle.so"* + $ADB shell rm -f "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so"* + $ADB shell rm -f "$ANGLE_DEST_PATH/libGLESv2_angle.so"* + + $ADB push /angle/libEGL_angle.so "$ANGLE_DEST_PATH/libEGL_angle.so" + $ADB push /angle/libGLESv1_CM_angle.so "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so" + $ADB push /angle/libGLESv2_angle.so "$ANGLE_DEST_PATH/libGLESv2_angle.so" fi -$ADB shell rm -f "$ANGLE_DEST_PATH/libEGL_angle.so"* -$ADB shell rm -f "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so"* -$ADB shell rm -f "$ANGLE_DEST_PATH/libGLESv2_angle.so"* - -$ADB push /angle/libEGL_angle.so "$ANGLE_DEST_PATH/libEGL_angle.so" -$ADB push /angle/libGLESv1_CM_angle.so "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so" -$ADB push /angle/libGLESv2_angle.so "$ANGLE_DEST_PATH/libGLESv2_angle.so" - # Check what GLES & VK implementation is used after uploading the new libraries MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION") get_gles_runtime_renderer