From a3e444ff1d5cda4f894c178c6997d9feeea7b4cc Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Tue, 19 Nov 2024 13:14:22 +0100
Subject: [PATCH] ci/android: use a native adb connection

Use a "native" adb connection, it seems to have better stability,
especially when transferring a lot of files with `adb push`.

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

diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index c3e1a96f419..fef18e72128 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -63,10 +63,9 @@ sleep 1
 
 popd
 
-adb connect vsock:3:5555
-ADB="adb -s vsock:3:5555"
+ADB=adb
 
-$ADB root
+$ADB wait-for-device root
 sleep 1
 $ADB shell echo Hi from Android
 # shellcheck disable=SC2035