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

[Aiden Grossman via libcxx-commits]

https://github.com/boomanaiden154 created https://github.com/llvm/llvm-project/pull/168756

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.

>From cbad68a66d6ef6d6ee7f82fe3d0c4d52b07d0430 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 +--
 1 file changed, 1 insertion(+), 2 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