From 52e7297f9c7927eb9d463b6976e394c760231310 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 22 Mar 2021 12:17:11 -0700 Subject: [PATCH] ci/android: Build the v3dv driver. We want to make sure that this keeps working on Android. Acked-by: Daniel Stone Reviewed-by: Jose Maria Casanova Crespo Part-of: --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f95369fc1ab..0c53499197f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -783,8 +783,7 @@ meson-android: LLVM_VERSION: "" PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files" script: - # arm64 build: Can't build v3d/vc4 because they require expat for v3d_decode. - - 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 VULKAN_DRIVERS=freedreno .gitlab-ci/meson/build.sh + - 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 .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