[libcxx] Do not use libcxx-builder-base image for Android image

boomanaiden154 · boomanaiden154 · commit 75cbb94d0d08 · 2025-11-19T19:24:14.000Z
The Android image did not use this prior to bf07226 and this will significantly increase the size of the container image for dependencies we do not need.
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@`
`27`	`27`	`#`
`28`	`28`	`# BUILDKITE_AGENT_TOKEN=<token>`
`29`	`29`
`30`		`-ARG BASE_IMAGE_VERSION`
`31`		`-FROM ghcr.io/llvm/libcxx-linux-builder-base:${BASE_IMAGE_VERSION}`
	`30`	`+FROM docker.io/library/ubuntu:jammy AS android-builder-base`
`32`	`31`
`33`	`32`	`ARG ANDROID_CLANG_VERSION`
`34`	`33`	`ARG ANDROID_CLANG_PREBUILTS_COMMIT`