[libcxx-commits] [libcxx] Fix for Android Dockerfile (PR #195615)

[Sharjeel Khan via libcxx-commits]

https://github.com/Sharjeel-Khan created https://github.com/llvm/llvm-project/pull/195615

It seems the Android dockerfile did not change to libcxx-builder when installing buildkite-agent causing the buildkite-agent not to be at the correct place. This specific change was causing the issue for Android GCE VM not being registered on Buildkite.

>From 8b6961e8b136556d1db070fd9f51f71ceeb325b6 Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Mon, 4 May 2026 08:06:01 +0000
Subject: [PATCH] Fix for Android Dockerfile

It seems the Android dockerfile did not change to libcxx-builder when
installing buildkite-agent causing the buildkite-agent not to be at the
correct place. This specific change was causing the issue for Android
GCE VM not being registered on Buildkite.
---
 libcxx/utils/ci/docker/android-builder.dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index 9c5d5047dbb86..b5ccbc036d53c 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -77,6 +77,7 @@ EOF
 
 # Create the libcxx-builder user
 RUN sudo useradd --create-home libcxx-builder
+USER libcxx-builder
 WORKDIR /home/libcxx-builder
 
 # Install the Buildkite agent and dependencies. This must be done as non-root
@@ -94,6 +95,7 @@ EOF
 ENV PATH="${PATH}:/home/libcxx-builder/.buildkite-agent/bin"
 
 # Install Docker
+USER root
 RUN <<EOF
   set -e
   curl -fsSL https://get.docker.com -o /tmp/get-docker.sh