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

[Sharjeel Khan via libcxx-commits]

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

>From c555f2bb1463c6b80187033be88ba79db176249e 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 1/2] 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 9c5d5047dbb86f..b5ccbc036d53c9 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

>From bc0e96881f42a0e42e26af73a2d49c2c6ecbb401 Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Tue, 20 Oct 2026 14:12:06 -0700
Subject: [PATCH 2/2] [libcxx][docker] Update android libc++ builder base image
 and user

---
 libcxx/utils/ci/docker/android-builder.dockerfile | 4 +++-
 libcxx/utils/ci/docker/docker-compose.yml         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index b5ccbc036d53c9..88a1eec9bb2422 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -28,7 +28,9 @@
 #   BUILDKITE_AGENT_TOKEN=<token>
 
 ARG BASE_IMAGE_VERSION
-FROM ghcr.io/llvm/libcxx-linux-builder-base:${BASE_IMAGE_VERSION}
+FROM ghcr.io/llvm/libcxx-linux-builder:${BASE_IMAGE_VERSION}
+
+USER root
 
 ARG ANDROID_CLANG_VERSION
 ARG ANDROID_CLANG_PREBUILTS_COMMIT
diff --git a/libcxx/utils/ci/docker/docker-compose.yml b/libcxx/utils/ci/docker/docker-compose.yml
index dd6743b0a5d87a..3df2298e6bc4ef 100644
--- a/libcxx/utils/ci/docker/docker-compose.yml
+++ b/libcxx/utils/ci/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       context: ../../../.. # monorepo root
       dockerfile: libcxx/utils/ci/docker/android-builder.dockerfile
       args:
-        BASE_IMAGE_VERSION: 8ece73c9f8b54fea6a98e9e4c55f9a2e6ccc9b3c
+        BASE_IMAGE_VERSION: 5e1edea790610e7ef8c5e06b6e5185fe5dd1c830
         ANDROID_CLANG_VERSION: r584948b
         ANDROID_CLANG_PREBUILTS_COMMIT: 2b062008b0a7be59ad85f012cfeee60f052808f1
         ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f