fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 03:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci/android: Use aapt from Debian packages again

Browse source 
The package in trixie is new enough to use again.

This reverts commit c9a8e1f49a.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35853>
This commit is contained in:
Valentine Burley 2025-07-01 08:35:24 +02:00 • committed by Marge Bot
parent 8803388d15
commit 2260681572
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/android-cts-runner.sh
View file

@ -6,7 +6,7 @@
ci_tag_test_time_check "ANDROID_CTS_TAG" ci_tag_test_time_check "ANDROID_CTS_TAG"
export PATH=/android-tools/build-tools:/android-cts/jdk/bin/:$PATH export PATH=/android-cts/jdk/bin/:$PATH
export JAVA_HOME=/android-cts/jdk export JAVA_HOME=/android-cts/jdk
# Wait for the appops service to show up # Wait for the appops service to show up

7
.gitlab-ci/container/debian/x86_64_test-android.sh
View file

@ -30,6 +30,7 @@ EPHEMERAL=(
) )
DEPS=( DEPS=(
aapt
iproute2 iproute2
) )
apt-get install -y --no-remove --no-install-recommends \ apt-get install -y --no-remove --no-install-recommends \
@ -56,12 +57,6 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-x86_64" -o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-x86_64"
chmod +x vulkaninfo chmod +x vulkaninfo
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-o "build-tools_r${ANDROID_SDK_VERSION}-linux.zip" "https://dl.google.com/android/repository/build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
unzip "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
rm "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
mv "android-$ANDROID_VERSION" build-tools
popd popd
section_end android-tools section_end android-tools