From 9d11a8304e31eb94b3e1d5796f57231393489f28 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 1 Apr 2025 13:27:43 +0200
Subject: [PATCH] ci/android: Remove platform-tools from test-android container

Cuttlefish comes with the required tools (under /cuttlefish/bin),
downloading platform-tools isn't necessary.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34320>
---
 .gitlab-ci/android-runner.sh                       | 2 --
 .gitlab-ci/container/debian/x86_64_test-android.sh | 7 +------
 .gitlab-ci/image-tags.yml                          | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
index 45a2de0f548..275b5e72063 100755
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -2,8 +2,6 @@
 # shellcheck disable=SC2086 # we want word splitting
 # shellcheck disable=SC1091 # paths only become valid at runtime
 
-export PATH=/android-tools/platform-tools:$PATH
-
 # Set default ADB command if not set already
 
 : "${ADB:=adb}"
diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index 9dc3c15e196..279ae54dfc8 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -138,7 +138,7 @@ rm -rf android-cuttlefish
 addgroup --system kvm
 usermod -a -G kvm,cvdnetwork root
 
-############### Downloading Android CTS - Build tools - Platform tools ...
+############### Downloading Android CTS tools
 
 ANDROID_CTS_VERSION="${ANDROID_VERSION}_r1"
 ANDROID_CTS_DEVICE_ARCH="x86"
@@ -163,11 +163,6 @@ unzip "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
 rm "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
 mv "android-$ANDROID_VERSION" build-tools
 
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o "platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip" "https://dl.google.com/android/repository/platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip"
-unzip "platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip"
-rm "platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip"
-
 popd
 
 ############### Uninstall the build software
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 94da4c923d2..682e37198f9 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -37,7 +37,7 @@ variables:
    DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_TEST_ANDROID_TAG: "20250330-angle-1b"
+   DEBIAN_TEST_ANDROID_TAG: "20250401-plattools"
    DEBIAN_TEST_GL_TAG: "20250330-angle-1b"
    DEBIAN_TEST_VK_TAG: "20250327-apitrace"
    KERNEL_ROOTFS_TAG: "20250402-overlay"