From 17aa2be4c9c8c83470b73ea1eacacb47ab898f8e Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Wed, 15 Sep 2021 21:20:47 +0200 Subject: [PATCH] ci: Add RADV to Android CI. Reviewed-by: Samuel Pitoiset Reviewed-by: Eric Engestrom Reviewed-by: Emma Anholt Part-of: --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af39d76..9836763 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -879,9 +879,10 @@ debian-android: - PKG_CONFIG_PATH=/usr/local/lib/aarch64-linux-android/pkgconfig/:/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/pkgconfig/ CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio-experimental .gitlab-ci/meson/build.sh # x86_64 build: # Can't do Intel because gen_decoder.c currently requires libexpat, which - # is not a dependency that AOSP wants to accept. Can't do Radeon because - # it requires LLVM, which we don't have an Android build of. - - PKG_CONFIG_PATH=/usr/local/lib/x86_64-linux-android/pkgconfig/:/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/pkgconfig/ CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris VULKAN_DRIVERS=intel .gitlab-ci/meson/build.sh + # is not a dependency that AOSP wants to accept. Can't do Radeon Gallium + # drivers because they requires LLVM, which we don't have an Android build + # of. + - PKG_CONFIG_PATH=/usr/local/lib/x86_64-linux-android/pkgconfig/:/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/pkgconfig/ CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris VULKAN_DRIVERS=amd,intel .gitlab-ci/meson/build.sh .meson-cross: extends: -- 2.7.4