From 92488c459886da211e6396d8ad372937c91eae16 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Tue, 27 Aug 2024 10:52:36 +0200
Subject: [PATCH] ci/android: add sudo to EPHEMERAL deps for
 debian/x86_64_test-android.sh

The ./tools/buildutils/build_packages.sh script used by the
android-cuttlefish project built in debian/x86_64_test-android.sh uses
sudo, so install that as an EPHEMERAL dependency.

Also set SUDO_FORCE_REMOVE=yes when removing sudo to avoid some errors.

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

diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index 41f82e53585..6a1e602762e 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -19,6 +19,7 @@ EPHEMERAL=(
    debhelper-compat
    dpkg-dev
    ninja-build
+   sudo
    unzip
 )
 
@@ -118,6 +119,7 @@ usermod -a -G kvm,cvdnetwork root
 
 rm -rf "/${ndk:?}"
 
+export SUDO_FORCE_REMOVE=yes
 apt-get purge -y "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_post_build.sh