[libcxx-commits] [libcxx] [libcxx] Do not use libcxx-builder-base image for Android image (PR #168756)

[Louis Dionne via libcxx-commits]

https://github.com/ldionne updated https://github.com/llvm/llvm-project/pull/168756

>From 75cbb94d0d086e87579b8495c921bea2561ecaca Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Wed, 19 Nov 2025 18:49:34 +0000
Subject: [PATCH] [libcxx] Do not use libcxx-builder-base image for Android
 image

The Android image did not use this prior to
bf07226c6d6aaf3b8f230e4e36e8aac8e40d8c4d and this will significantly
increase the size of the container image for dependencies we do not
need.
---
 libcxx/utils/ci/docker/android-builder.dockerfile | 3 +--
 libcxx/utils/ci/docker/docker-compose.yml         | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index 9c5d5047dbb86..e0eef49a8987d 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -27,8 +27,7 @@
 #
 #   BUILDKITE_AGENT_TOKEN=<token>
 
-ARG BASE_IMAGE_VERSION
-FROM ghcr.io/llvm/libcxx-linux-builder-base:${BASE_IMAGE_VERSION}
+FROM docker.io/library/ubuntu:jammy AS android-builder-base
 
 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 74df3e4949b2f..b24f1fe33a90f 100644
--- a/libcxx/utils/ci/docker/docker-compose.yml
+++ b/libcxx/utils/ci/docker/docker-compose.yml
@@ -32,7 +32,6 @@ services:
       context: ../../../.. # monorepo root
       dockerfile: libcxx/utils/ci/docker/android-builder.dockerfile
       args:
-        BASE_IMAGE_VERSION: 825943e06f840710177e5514c4f61c9e73660c44
         ANDROID_CLANG_VERSION: r563880
         ANDROID_CLANG_PREBUILTS_COMMIT: 6ae4184bb8706f9731569b9a0a82be3fcdcb951c
         ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f