From e346b5786da2b60920b41c8a4fd7d69711ac38e5 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Tue, 18 Mar 2025 12:18:41 +0100
Subject: [PATCH] ci/android: remove old mesa and ANGLE libraries before
 pushing new ones

Remove old mesa and ANGLE libraries before pushing new ones, and do this
using a trailing wildcard, because some versions of Android might have
versioned libraries like /vendor/lib64/egl/libEGL_mesa.so.1 which should
also be removed to avoid any confusion when loading the freshly pushed
ones.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34111>
---
 .gitlab-ci/android-runner.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
index 826030d5308..a18fa4df6cc 100755
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -34,24 +34,32 @@ rm "${S3_ANDROID_ARTIFACT_NAME}.tar.zst" &
 
 INSTALL="/mesa-android/install"
 
-# replace on /vendor/lib64
+# replace libraries
+
+$ADB shell rm -f /vendor/lib64/libgallium_dri.so*
+$ADB shell rm -f /vendor/lib64/egl/libEGL_mesa.so*
+$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_mesa.so*
+$ADB shell rm -f /vendor/lib64/egl/libGLESv2_mesa.so*
 
 $ADB push "$INSTALL/lib/libgallium_dri.so" /vendor/lib64/libgallium_dri.so
 $ADB push "$INSTALL/lib/libEGL.so" /vendor/lib64/egl/libEGL_mesa.so
 $ADB push "$INSTALL/lib/libGLESv1_CM.so" /vendor/lib64/egl/libGLESv1_CM_mesa.so
 $ADB push "$INSTALL/lib/libGLESv2.so" /vendor/lib64/egl/libGLESv2_mesa.so
 
+$ADB shell rm -f /vendor/lib64/hw/vulkan.lvp.so*
+$ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
+
 $ADB push "$INSTALL/lib/libvulkan_lvp.so" /vendor/lib64/hw/vulkan.lvp.so
 $ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
 
-$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
+$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*
 
 # Remove built-in ANGLE, we'll supply our own if needed
-$ADB shell rm -f /vendor/lib64/egl/libEGL_angle.so
-$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_angle.so
-$ADB shell rm -f /vendor/lib64/egl/libGLESv2_angle.so
+$ADB shell rm -f /vendor/lib64/egl/libEGL_angle.so*
+$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_angle.so*
+$ADB shell rm -f /vendor/lib64/egl/libGLESv2_angle.so*
 
 if [ -n "$ANGLE_TAG" ]; then
   $ADB push /angle/libEGL_angle.so /vendor/lib64/egl/libEGL_angle.so