OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Bump libdrm for the android image.

Browse Source 
Seems I bumped the tag previously but not the script. Let us do
better this time.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13164>
This commit is contained in:
Bas Nieuwenhuizen
2021-10-03 15:04:11 +02:00
committed by Marge Bot
parent fde36d7992
commit 1b945a695a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -376,7 +376,7 @@ debian/android_build:
extends: extends:
- .use-debian/x86_build-base - .use-debian/x86_build-base
variables: 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: .use-debian/android_build:
extends: extends:

5
.gitlab-ci/container/debian/android_build.sh
View File

@@ -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 # Not using build-libdrm.sh because we don't want its cleanup after building
# each arch. Fetch and extract now. # 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 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
@@ -50,7 +50,8 @@ for arch in \
-Detnaviv=false \ -Detnaviv=false \
-Dfreedreno=false \ -Dfreedreno=false \
-Dintel=false \ -Dintel=false \
-Dcairo-tests=false -Dcairo-tests=false \
-Dvalgrind=false
ninja -C build-$arch install ninja -C build-$arch install
cd .. cd ..
done done