From 9ce3d9c933a1bd861e5f2277809e41c7b819e00f Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Tue, 18 Mar 2025 13:31:37 +0100 Subject: [PATCH] ci/android: always push ANGLE libraries Since ANGLE is always built for Android, always push it even if it is not going to be tested directly. Besides simplifying the script, this is also because ANGLE is going to be mandatory anyway starting from Android 15+ and not having it in the Android system might cause unexpected failures. Part-of: --- .gitlab-ci/android-runner.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh index a18fa4df6cc..31c9b4c69be 100755 --- a/.gitlab-ci/android-runner.sh +++ b/.gitlab-ci/android-runner.sh @@ -56,16 +56,13 @@ $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* -if [ -n "$ANGLE_TAG" ]; then - $ADB push /angle/libEGL_angle.so /vendor/lib64/egl/libEGL_angle.so - $ADB push /angle/libGLESv1_CM_angle.so /vendor/lib64/egl/libGLESv1_CM_angle.so - $ADB push /angle/libGLESv2_angle.so /vendor/lib64/egl/libGLESv2_angle.so -fi +$ADB push /angle/libEGL_angle.so /vendor/lib64/egl/libEGL_angle.so +$ADB push /angle/libGLESv1_CM_angle.so /vendor/lib64/egl/libGLESv1_CM_angle.so +$ADB push /angle/libGLESv2_angle.so /vendor/lib64/egl/libGLESv2_angle.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