Module: Mesa Branch: main Commit: 61eba809745e29d77e430f49bc0c45008b179081 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61eba809745e29d77e430f49bc0c45008b179081
Author: Eric Engestrom <[email protected]> Date: Mon Feb 6 18:47:45 2023 +0000 ci/android: move virgl-specific so lib name to virgl-defined variables Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Helen Koike <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21157> --- .gitlab-ci/cuttlefish-runner.sh | 4 ++-- src/gallium/drivers/virgl/ci/gitlab-ci.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index c547c47f476..d81f55ff62f 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -60,7 +60,7 @@ $ADB push install/deqp-$DEQP_SUITE.toml /data/. # remove 32 bits libs from /vendor/lib -$ADB shell rm /vendor/lib/dri/virtio_gpu_dri.so +$ADB shell rm /vendor/lib/dri/${ANDROID_DRIVER}_dri.so $ADB shell rm /vendor/lib/libglapi.so $ADB shell rm /vendor/lib/egl/libEGL_mesa.so @@ -73,7 +73,7 @@ $ADB shell rm /vendor/lib/egl/libGLESv2_emulation.so # replace on /vendor/lib64 -$ADB push install/lib/dri/virtio_gpu_dri.so /vendor/lib64/dri/virtio_gpu_dri.so +$ADB push install/lib/dri/${ANDROID_DRIVER}_dri.so /vendor/lib64/dri/${ANDROID_DRIVER}_dri.so $ADB push install/lib/libglapi.so /vendor/lib64/libglapi.so $ADB push install/lib/libEGL.so /vendor/lib64/egl/libEGL_mesa.so diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index 0772383f339..50b0524ed39 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -111,5 +111,6 @@ android-virgl-llvmpipe: - .virgl-rules variables: ANDROID_GPU_MODE: drm_virgl + ANDROID_DRIVER: virtio_gpu GPU_VERSION: virgl-gl DEQP_SUITE: android-virgl
