From 666f27d228b6eadca4b9c0d0261a4cf91fbff3d3 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 27 Dec 2023 23:23:43 +0000
Subject: [PATCH] ci/containers: use build-libdrm.sh in debian/android

The extra complexity is not worth saving the 3x 468 KB of bandwidth
wasted every time we rebuild this container because we delete the
tarball inside the script.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26825>
---
 .gitlab-ci/container/debian/android_build.sh | 24 ++------------------
 .gitlab-ci/image-tags.yml                    |  2 +-
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh
index a2dc9b77401..25754d92b00 100644
--- a/.gitlab-ci/container/debian/android_build.sh
+++ b/.gitlab-ci/container/debian/android_build.sh
@@ -30,33 +30,13 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x8
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android aarch64 armv8 $ANDROID_SDK_VERSION
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl $ANDROID_SDK_VERSION armv7a-linux-androideabi
 
-# Not using build-libdrm.sh because we don't want its cleanup after building
-# each arch.  Fetch and extract now.
-export LIBDRM_VERSION=libdrm-2.4.114
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -O https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
-tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
-
 for arch in \
         x86_64-linux-android \
         i686-linux-android \
         aarch64-linux-android \
         arm-linux-androideabi ; do
-
-    cd $LIBDRM_VERSION
-    rm -rf build-$arch
-    meson setup build-$arch \
-          --cross-file=/cross_file-$arch.txt \
-          --libdir=lib/$arch \
-          -Dnouveau=disabled \
-          -Dvc4=disabled \
-          -Detnaviv=disabled \
-          -Dfreedreno=disabled \
-          -Dintel=disabled \
-          -Dcairo-tests=disabled \
-          -Dvalgrind=disabled
-    meson install -C build-$arch
-    cd ..
+    EXTRA_MESON_ARGS="--cross-file=/cross_file-$arch.txt --libdir=lib/$arch -Dnouveau=disabled -Dintel=disabled" \
+    . .gitlab-ci/container/build-libdrm.sh
 done
 
 rm -rf $LIBDRM_VERSION
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 3e923cc5a53..ad19f0d549a 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -10,7 +10,7 @@ variables:
    DEBIAN_BASE_TAG: "2023-11-18-deqp-runner"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "2023-12-05-directx-headers-dep-611"
+   DEBIAN_BUILD_TAG: "2023-12-27-libdrm"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"