From 09c38c14ef1f1bcd982c75f77494cc2d4d9fd697 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 10 Feb 2025 10:49:58 +0000 Subject: [PATCH] ci: Build libdrm for Android host builds Signed-off-by: Daniel Stone Acked-by: Mary Guillemard Part-of: --- .gitlab-ci/container/debian/android_build.sh | 6 ++++++ .gitlab-ci/image-tags.yml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh index d087701296e..9e3f5e084e3 100755 --- a/.gitlab-ci/container/debian/android_build.sh +++ b/.gitlab-ci/container/debian/android_build.sh @@ -38,6 +38,12 @@ 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 +# Build libdrm for the host (Debian) environment, so it's available for +# binaries we'll run as part of the build process +. .gitlab-ci/container/build-libdrm.sh + +# Build libdrm for the NDK environment, so it's available when building for +# the Android target for arch in \ x86_64-linux-android \ i686-linux-android \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 20b7bc4fed9..b1a500713a1 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,7 +16,7 @@ variables: DEBIAN_BASE_TAG: "20250204-arm32" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "20250128-llvm19-up" + DEBIAN_BUILD_TAG: "20250210-android-drm" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_ARM32_TEST_BASE_IMAGE: "debian/arm32_test-base" @@ -30,7 +30,7 @@ variables: DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_TEST_ANDROID_TAG: "20250206-right-angle" + DEBIAN_TEST_ANDROID_TAG: "20250210-libdrm" DEBIAN_TEST_GL_TAG: "20250204-fix-deqp" DEBIAN_TEST_VK_TAG: "20250204-fix-deqp" KERNEL_ROOTFS_TAG: "20250206-right-angle"