AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/android: always push ANGLE libraries

Browse Source 
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34111>
This commit is contained in:
Antonio Ospite
2025-03-18 13:31:37 +01:00
committed by Marge Bot
parent e346b5786d
commit 9ce3d9c933
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci/android-runner.sh
+3 -6
View File
@@ -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