From e12aa9a49ec46e69ced7baba133995cd99ab9052 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Wed, 4 Jun 2025 10:21:02 +0200
Subject: [PATCH] ci/android: fix printing the original GLES and Vulkan
 versions

New mechanisms to retrieve the GLES and Vulkan driver versions have been
introduced in

  - 3029fdde65a (ci/android: Switch to using eglinfo to check GLES implementation, 2025-05-28)
  - 3ba90386483 (ci/android: Check Vulkan driver using vulkaninfo, 2025-05-28)

These mechanisms are more robust than the previous one but they do
change the behavior in that the version is not retrieved by an already
running process (e.g. SurfaceFlinger), but by creating new processes
that load the libraries available on the filesystem.

Because of this change of behavior the original version should be
printed **before** pushing the new libraries to the Android guest, so
that developers are able to compare the old and new versions in the logs.

Moreover, the runtime checks do not answer the original question anymore:

  "what GLES/VK libraries is surfaceflinger currently using?"

but rather new question:

  "what GLES/VK libraries are services going to use when they load?"

So the shell start/stop can very well performed after the version check,
accompanied by a new check on the PID of SurfaceFlinger to be sure that
it has reloaded consequently picking up the new libraries.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35335>
---
 .gitlab-ci/android-runner.sh | 58 +++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
index 5aad67fc7bf..b6be4b77ac3 100755
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -32,6 +32,22 @@ done
 
 $ADB shell setenforce 0
 
+$ADB push /android-tools/eglinfo /data
+$ADB push /android-tools/vulkaninfo /data
+
+get_gles_runtime_version() {
+  while [ "$($ADB shell /data/eglinfo | grep 'OpenGL ES profile version:')" = "" ] ; do sleep 1; done
+  $ADB shell /data/eglinfo | grep 'OpenGL ES profile version:'
+}
+
+get_vk_runtime_version() {
+  $ADB shell /data/vulkaninfo | grep driverInfo
+}
+
+# Check what GLES & VK implementation is used before uploading the new libraries
+get_gles_runtime_version
+get_vk_runtime_version
+
 # download Android Mesa from S3
 MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${S3_ANDROID_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
@@ -78,33 +94,14 @@ $ADB push /angle/libEGL_angle.so "$ANGLE_DEST_PATH/libEGL_angle.so"
 $ADB push /angle/libGLESv1_CM_angle.so "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so"
 $ADB push /angle/libGLESv2_angle.so "$ANGLE_DEST_PATH/libGLESv2_angle.so"
 
-$ADB push /android-tools/eglinfo /data
-$ADB push /android-tools/vulkaninfo /data
-
-get_gles_runtime_version() {
-  while [ "$($ADB shell /data/eglinfo | grep 'OpenGL ES profile version':)" = "" ] ; do sleep 1; done
-  $ADB shell /data/eglinfo | grep 'OpenGL ES profile version'
-}
-get_vk_runtime_version() {
-  $ADB shell /data/vulkaninfo | grep driverInfo
-}
-
-# Check what GLES & VK implementation is used before loading the new libraries
-get_gles_runtime_version
-get_vk_runtime_version
-
-# restart Android shell, so that services use the new libraries
-$ADB shell stop
-$ADB shell start
-
-# Check what GLES & VK implementation is used after loading the new libraries
+# Check what GLES & VK implementation is used after uploading the new libraries
 MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
 GLES_RUNTIME_VERSION="$(get_gles_runtime_version)"
 VK_RUNTIME_VERSION="$(get_vk_runtime_version)"
 
 if [ -n "$ANGLE_TAG" ]; then
   # Note: we are injecting the ANGLE libs too, so we need to check if the
-  #       ANGLE libs are being used after the shell restart.
+  #       new ANGLE libs are being used.
   ANGLE_HASH=$(head -c 12 /angle/version)
   if ! printf "%s" "$GLES_RUNTIME_VERSION" | grep --quiet "${ANGLE_HASH}"; then
     echo "Fatal: Android is loading a wrong version of the ANGLE libs: ${ANGLE_HASH}" 1>&2
@@ -121,6 +118,25 @@ if ! printf "%s" "$VK_RUNTIME_VERSION" | grep -Fq -- "${MESA_BUILD_VERSION}"; th
      exit 1
 fi
 
+get_surfaceflinger_pid() {
+  while [ "$($ADB shell dumpsys -l | grep 'SurfaceFlinger$')" = "" ] ; do sleep 1; done
+  $ADB shell ps -A | grep -i surfaceflinger | tr -s ' ' | cut -d ' ' -f 2
+}
+
+OLD_SF_PID=$(get_surfaceflinger_pid)
+
+# restart Android shell, so that services use the new libraries
+$ADB shell stop
+$ADB shell start
+
+# Check that SurfaceFlinger restarted, to ensure that new libraries have been picked up
+NEW_SF_PID=$(get_surfaceflinger_pid)
+
+if [ "$OLD_SF_PID" == "$NEW_SF_PID" ]; then
+     echo "Fatal: check that SurfaceFlinger restarted" 1>&2
+     exit 1
+fi
+
 if [ -n "${USE_ANDROID_CTS:-}" ]; then
   # The script sets EXIT_CODE
   . "$(dirname "$0")/android-cts-runner.sh"