From 0c0e268761dbdcd765e315a135e84f391a257287 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Tue, 27 Aug 2024 18:29:06 +0200
Subject: [PATCH] ci/android: make cuttlefish-runner.sh more robust against
 different Android images

Different Android images may contain different graphic libraries, for
example images from Google using an old mesa version may have
libGLES_mesa.so, while newer Android images built with mesa from
upstream have libGLESv1_CM_mesa.so, etc.

Use `rm -f` instead of just `rm` to avoid running into errors when
a file does not exist, resulting in a failing job.

Reviewed-by: Eric Engestrom <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30895>
---
 .gitlab-ci/cuttlefish-runner.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 8ed3af7b829..89bb4cc18ac 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -85,15 +85,15 @@ $ADB push install/deqp-$DEQP_SUITE.toml /data/.
 
 # remove 32 bits libs from /vendor/lib
 
-$ADB shell rm /vendor/lib/libglapi.so
-$ADB shell rm /vendor/lib/egl/libGLES_mesa.so
+$ADB shell rm -f /vendor/lib/libglapi.so
+$ADB shell rm -f /vendor/lib/egl/libGLES_mesa.so
 
-$ADB shell rm /vendor/lib/egl/libEGL_angle.so
-$ADB shell rm /vendor/lib/egl/libEGL_emulation.so
-$ADB shell rm /vendor/lib/egl/libGLESv1_CM_angle.so
-$ADB shell rm /vendor/lib/egl/libGLESv1_CM_emulation.so
-$ADB shell rm /vendor/lib/egl/libGLESv2_angle.so
-$ADB shell rm /vendor/lib/egl/libGLESv2_emulation.so
+$ADB shell rm -f /vendor/lib/egl/libEGL_angle.so
+$ADB shell rm -f /vendor/lib/egl/libEGL_emulation.so
+$ADB shell rm -f /vendor/lib/egl/libGLESv1_CM_angle.so
+$ADB shell rm -f /vendor/lib/egl/libGLESv1_CM_emulation.so
+$ADB shell rm -f /vendor/lib/egl/libGLESv2_angle.so
+$ADB shell rm -f /vendor/lib/egl/libGLESv2_emulation.so
 
 # replace on /vendor/lib64
 
@@ -103,12 +103,12 @@ $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 /vendor/lib64/egl/libEGL_angle.so
-$ADB shell rm /vendor/lib64/egl/libEGL_emulation.so
-$ADB shell rm /vendor/lib64/egl/libGLESv1_CM_angle.so
-$ADB shell rm /vendor/lib64/egl/libGLESv1_CM_emulation.so
-$ADB shell rm /vendor/lib64/egl/libGLESv2_angle.so
-$ADB shell rm /vendor/lib64/egl/libGLESv2_emulation.so
+$ADB shell rm -f /vendor/lib64/egl/libEGL_angle.so
+$ADB shell rm -f /vendor/lib64/egl/libEGL_emulation.so
+$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_angle.so
+$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_emulation.so
+$ADB shell rm -f /vendor/lib64/egl/libGLESv2_angle.so
+$ADB shell rm -f /vendor/lib64/egl/libGLESv2_emulation.so
 
 # Check what GLES implementation Surfaceflinger is using before copying the new mesa libraries
 while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done