mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 20:24:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci/deqp: only apply the android patches to the android build

Browse Source 
They are unnecessary otherwise, so let's skip them

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27465>
This commit is contained in:
Eric Engestrom 2024-02-05 15:20:47 +00:00 committed by Marge Bot
parent d63e7b4403
commit 07b8b410a8
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab-ci/container/build-deqp.sh
View File

@ -36,10 +36,6 @@ vk_cts_commits_to_backport=(
# shellcheck disable=SC2034
vk_cts_patch_files=(
# Android specific patches.
build-deqp_Allow-running-on-Android-from-the-command-line.patch
build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
# Change zlib URL because the one from zlib.net requires a human-verification
# Forward-port of b61f15f09adb6b7c9eefc7f7c44612c0c390abe5 into modern dEQP codebase
build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch
@ -50,21 +46,31 @@ vk_cts_patch_files=(
build-deqp_Add-missing-subgroup-support-checks-for-linear-derivate-tests.patch
)
if [ "${DEQP_TARGET}" = 'android' ]; then
vk_cts_patch_files+=(
build-deqp_Allow-running-on-Android-from-the-command-line.patch
build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
)
fi
# shellcheck disable=SC2034
gl_cts_commits_to_backport=(
)
# shellcheck disable=SC2034
gl_cts_patch_files=(
# Android specific patches.
build-deqp_Allow-running-on-Android-from-the-command-line.patch
build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
# Change zlib URL because the one from zlib.net requires a human-verification
# Forward-port of b61f15f09adb6b7c9eefc7f7c44612c0c390abe5 into modern dEQP codebase
build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch
)
if [ "${DEQP_TARGET}" = 'android' ]; then
gl_cts_patch_files+=(
build-deqp_Allow-running-on-Android-from-the-command-line.patch
build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
)
fi
### Careful editing anything below this line