From 2a85675eff4d1d92daeecabfacfcc2de4b4018ff Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 14 Nov 2024 16:57:52 +0100 Subject: [PATCH] ci/android: also copy mesa vulkan libraries to the Android guest Also copy mesa vulkan libraries to the Android guest, this makes it possible to test venus with the latest upstream mesa build. While at it also keep the *_angle libraries as they will be used by the venus_guest_angle GPU_MODE. Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/cuttlefish-runner.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index 45bdb9e6a36..c9431a0ce00 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -115,6 +115,8 @@ $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 +$ADB shell rm -f /vendor/lib/hw/vulkan.* + # replace on /vendor/lib64 $ADB push /mesa-android/install/lib/libgallium_dri.so /vendor/lib64/libgallium_dri.so @@ -123,11 +125,11 @@ $ADB push /mesa-android/install/lib/libEGL.so /vendor/lib64/egl/libEGL_mesa.so $ADB push /mesa-android/install/lib/libGLESv1_CM.so /vendor/lib64/egl/libGLESv1_CM_mesa.so $ADB push /mesa-android/install/lib/libGLESv2.so /vendor/lib64/egl/libGLESv2_mesa.so -$ADB shell rm -f /vendor/lib64/egl/libEGL_angle.so +$ADB push /mesa-android/install/lib/libvulkan_lvp.so /vendor/lib64/hw/vulkan.lvp.so +$ADB push /mesa-android/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_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