Mesa (main): ci: Build ANV on Android

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0bbc3afb9ae169d50237017bd0db1fd4db03dd63
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bbc3afb9ae169d50237017bd0db1fd4db03dd63

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Aug 10 10:51:08 2021 -0500

ci: Build ANV on Android

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5211
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12308>

---

 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb4e04c6666..9bd7ddd125a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -876,7 +876,7 @@ debian-android:
     # 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/ CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris VULKAN_DRIVERS=intel .gitlab-ci/meson/build.sh
+    - 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
 
 .meson-cross:
   extends: