diff options
| author | Helen Koike <helen.koike@collabora.com> | 2022-12-01 17:42:17 -0300 |
|---|---|---|
| committer | Helen Koike <helen.koike@collabora.com> | 2023-01-25 08:58:25 -0300 |
| commit | 388b49d150bf4f6b6cea0570221ed00bbb9d8f59 (patch) | |
| tree | ff3c04fbbe1969a5c816760ad16d77412f23908c /.gitlab-ci/build | |
| parent | 6c446377ff22d981191929de21cedecf519fe70f (diff) | |
| download | mesa-388b49d150bf4f6b6cea0570221ed00bbb9d8f59.tar.gz | |
ci/debian-android: move pkgconfig paths to the cross file
Move pkgconfig paths out of the job script into the cross file.
Use pkg_config_libdir on the cross file instead.
Which makes more sense and cleaner code.
Suggested-by: David Heidelberg <david.heidelberg@collabora.com>
Suggested-by: Roman Stratiienko <r.stratiienko@gmail.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Sergi Blanch Torné <sergi.blanch.torne@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20019>
Diffstat (limited to '.gitlab-ci/build')
| -rw-r--r-- | .gitlab-ci/build/gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 74160fc30c1..e5ccf1c8843 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -345,13 +345,13 @@ debian-android: LLVM_VERSION: "" PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files" script: - - 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 + - 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 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 + - CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris VULKAN_DRIVERS=amd,intel .gitlab-ci/meson/build.sh .meson-cross: extends: |