diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/container/debian/android_build.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfcd679d1e8..360a53239c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -376,7 +376,7 @@ debian/android_build: extends: - .use-debian/x86_build-base variables: - MESA_IMAGE_TAG: &debian-android_build "2021-07-02-bump-libdrm" + MESA_IMAGE_TAG: &debian-android_build "2021-10-02-bump-libdrm-3" .use-debian/android_build: extends: diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh index 88c05af4ee2..45f75e1eb1f 100644 --- a/.gitlab-ci/container/debian/android_build.sh +++ b/.gitlab-ci/container/debian/android_build.sh @@ -29,7 +29,7 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi # Not using build-libdrm.sh because we don't want its cleanup after building # each arch. Fetch and extract now. -export LIBDRM_VERSION=libdrm-2.4.102 +export LIBDRM_VERSION=libdrm-2.4.107 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz @@ -50,7 +50,8 @@ for arch in \ -Detnaviv=false \ -Dfreedreno=false \ -Dintel=false \ - -Dcairo-tests=false + -Dcairo-tests=false \ + -Dvalgrind=false ninja -C build-$arch install cd .. done |