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

boomanaiden154 · boomanaiden154 · commit cbad68a66d6e · 2025-11-19T18:49:34.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

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`