[libcxx-commits] [libcxx] [libcxx][docker] Update android libc++ builders (PR #232887)

[Sharjeel Khan via libcxx-commits]

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

>From 038addf4b916c275ce60a9f1bd1d351530c58b33 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers at google.com>
Date: Fri, 16 Oct 2026 11:11:03 -0700
Subject: [PATCH 1/2] [libcxx][docker] Update android libc++ builders

The base images were consolidated in #225214. Move to the new base
image.

Ensure we run as root, since the new base image runs as `gha`.

To test:

    $ sudo docker compose --file \
      libcxx/utils/ci/docker/docker-compose.yml build \
      libcxx-android-builder

Link: #223854
---
 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 9c5d5047dbb86..57041d49b6c05 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 dd6743b0a5d87..fc4207051e496 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: d79f222aea61926e7c81fa8908b12f52ea70111f
         ANDROID_CLANG_VERSION: r584948b
         ANDROID_CLANG_PREBUILTS_COMMIT: 2b062008b0a7be59ad85f012cfeee60f052808f1
         ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f

>From 874266eccf53f99039d84031bd1eac33239c218f Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Tue, 20 Oct 2026 19:44:43 -0700
Subject: [PATCH 2/2] Fix buildkite-agent install user and bump base image to
 CMake 3.31

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

diff --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index 57041d49b6c05..88a1eec9bb242 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -79,6 +79,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
@@ -96,6 +97,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
diff --git a/libcxx/utils/ci/docker/docker-compose.yml b/libcxx/utils/ci/docker/docker-compose.yml
index fc4207051e496..3df2298e6bc4e 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: d79f222aea61926e7c81fa8908b12f52ea70111f
+        BASE_IMAGE_VERSION: 5e1edea790610e7ef8c5e06b6e5185fe5dd1c830
         ANDROID_CLANG_VERSION: r584948b
         ANDROID_CLANG_PREBUILTS_COMMIT: 2b062008b0a7be59ad85f012cfeee60f052808f1
         ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f