From 948f179f65cee466fab021f25a89ea7888b911f4 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Thu, 14 Nov 2024 16:54:03 +0100
Subject: [PATCH] ci/android: reorder PATH and LD_LIBRARY_PATH values to
 clarify priority

Prefer libraries from /cuttlefish when loading binaries, in particular
this solves some loading problem when launching
/cuttlefish/bin/virgl_render_server

Reviewed-by: Eric Engestrom <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30895>
---
 .gitlab-ci/cuttlefish-runner.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 95e6b41178d..45bdb9e6a36 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -8,8 +8,8 @@ section_start cuttlefish_setup "cuttlefish: setup"
 set -xe
 
 export HOME=/cuttlefish
-export PATH=$PATH:/cuttlefish/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${CI_PROJECT_DIR}/install/lib/:/cuttlefish/lib64
+export PATH=/cuttlefish/bin:$PATH
+export LD_LIBRARY_PATH=/cuttlefish/lib64:${CI_PROJECT_DIR}/install/lib:$LD_LIBRARY_PATH
 export EGL_PLATFORM=surfaceless
 
 syslogd