From 711c9adb30d68accf87e8fdaf26ae557d226b968 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Tue, 11 Jun 2024 15:53:56 +0200
Subject: [PATCH] ci/android: update version of cuttlefish host tools

Update the version of cuttlefish host tools.

In particular the new version includes the change to be able to increase
the file number limit to 32k, as explained in
https://github.com/google/android-cuttlefish/pull/675

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 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index 8f76e61a335..41f82e53585 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -95,7 +95,7 @@ popd
 
 ############### Building and installing Debian package ...
 
-ANDROID_CUTTLEFISH_VERSION=f6494d9fbeaa9974b56923e3029909e5d5f440dd
+ANDROID_CUTTLEFISH_VERSION=v1.0.1
 
 mkdir android-cuttlefish
 pushd android-cuttlefish
@@ -104,11 +104,9 @@ git remote add origin https://github.com/google/android-cuttlefish.git
 git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION"
 git checkout FETCH_HEAD
 
-pushd base
-dpkg-buildpackage -uc -us
-popd
+./tools/buildutils/build_packages.sh
 
-apt-get install -y ./cuttlefish-base_*.deb
+apt-get install -y ./cuttlefish-base_*.deb ./cuttlefish-user_*.deb
 
 popd
 rm -rf android-cuttlefish