From ae574a08c6f7153f7a574e9b5979ec960ab45ba9 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Mon, 17 Feb 2025 17:44:17 +0100
Subject: [PATCH] ci/android: use an x86_64_only cuttlefish image

In .gitlab-ci/cuttlefish-runner.sh 32bit libraries were removed but they
were not being replaced with newer ones, however this caused some
problems because by default the x86_64 target in AOSP is still
multi-library and for example the 32bit zygote process ended up crashing
because of the missing 32bit libraries, causing a general system
instability.

Since the CI is only building 64bit libraries for the android target,
use an x86_64_only cuttlefish product which only has components and
libraries built for the 64bit target, this avoids dealing with 32bit
EGL/Vulkan libraries at all, preventing any possible cause of
instability.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33499>
---
 .gitlab-ci/container/debian/x86_64_test-android.sh |  6 +++---
 .gitlab-ci/cuttlefish-runner.sh                    | 13 -------------
 .gitlab-ci/image-tags.yml                          |  2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index 067ce20e58e..a93085342f9 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -93,10 +93,10 @@ mkdir /cuttlefish
 pushd /cuttlefish
 
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip"
+  -o aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip"
 
-unzip aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
-rm aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
+unzip aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
+rm aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
 ls -lhS ./*
 
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index c0131f2347d..f4f03ab1d82 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -122,19 +122,6 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
 fi
 $ADB push "$INSTALL/deqp-$DEQP_SUITE.toml" /data/deqp
 
-# remove 32 bits libs from /vendor/lib
-
-$ADB shell rm -f /vendor/lib/egl/libGLES_mesa.so
-
-$ADB shell rm -f /vendor/lib/egl/libEGL_angle.so
-$ADB shell rm -f /vendor/lib/egl/libEGL_emulation.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv1_CM_angle.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv1_CM_emulation.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv2_angle.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv2_emulation.so
-
-$ADB shell rm -f /vendor/lib/hw/vulkan.*
-
 # replace on /vendor/lib64
 
 $ADB push "$INSTALL/lib/libgallium_dri.so" /vendor/lib64/libgallium_dri.so
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 36939ff6895..1209c83d04a 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: "20250215-cuttlefish"
+   DEBIAN_TEST_ANDROID_TAG: "20250218-cuttlefish"
    DEBIAN_TEST_GL_TAG: "20250307-piglit-70"
    DEBIAN_TEST_VK_TAG: "20250307-piglit-70"
    KERNEL_ROOTFS_TAG: "20250307-piglit-70"