ci/android: don't copy the DRI drivers which are not needed anymore

For the current tests the DRI drivers do not seem to be needed on
Android, so remove the ANDROID_DRIVER variable and stop copying the DRI
libraries to the guest file system, only copy libgallium_dri.so which is
really needed.

While at it, also copy libGLESv1_CM.so and libGLESv2.so

Reviewed-by: Eric Engestrom <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30895>

.gitlab-ci/cuttlefish-runner.sh

@@ -66,7 +66,6 @@ $ADB push install/deqp-$DEQP_SUITE.toml /data/.
 
 # remove 32 bits libs from /vendor/lib
 
-$ADB shell rm /vendor/lib/dri/${ANDROID_DRIVER}_dri.so
 $ADB shell rm /vendor/lib/libglapi.so
 $ADB shell rm /vendor/lib/egl/libGLES_mesa.so
 
@@ -79,9 +78,11 @@ $ADB shell rm /vendor/lib/egl/libGLESv2_emulation.so
 
 # replace on /vendor/lib64
 
-$ADB push install/lib/dri/${ANDROID_DRIVER}_dri.so /vendor/lib64/dri/${ANDROID_DRIVER}_dri.so
+$ADB push install/lib/libgallium_dri.so /vendor/lib64/libgallium_dri.so
 $ADB push install/lib/libglapi.so /vendor/lib64/libglapi.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 /vendor/lib64/egl/libEGL_angle.so
 $ADB shell rm /vendor/lib64/egl/libEGL_emulation.so

src/gallium/drivers/virgl/ci/gitlab-ci.yml

@@ -73,6 +73,5 @@ virgl-iris-traces-performance:
     - .virgl-rules
   variables:
     ANDROID_GPU_MODE: drm_virgl
-    ANDROID_DRIVER: virtio_gpu
     GPU_VERSION: virgl-gl
     DEQP_SUITE: android-virgl