[libcxx-commits] [libcxx] Testing Android Runner for Clang-21 (PR #192181)

[Sharjeel Khan via libcxx-commits]

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

>From 5096fa19b16b3778897f129191445f43745802ca Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Wed, 15 Apr 2026 04:52:23 +0000
Subject: [PATCH 1/3] Temp

---
 libcxx/include/__configuration/compiler.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcxx/include/__configuration/compiler.h b/libcxx/include/__configuration/compiler.h
index 7cd81e03b05ba..6ee7400cd1755 100644
--- a/libcxx/include/__configuration/compiler.h
+++ b/libcxx/include/__configuration/compiler.h
@@ -33,8 +33,8 @@
 // Warn if a compiler version is used that is not supported anymore
 // LLVM RELEASE Update the minimum compiler versions
 #  if defined(_LIBCPP_CLANG_VER)
-#    if _LIBCPP_CLANG_VER < 2001
-#      warning "Libc++ only supports Clang 20 and later"
+#    if _LIBCPP_CLANG_VER < 2101
+#      warning "Libc++ only supports Clang 21 and later"
 #    endif
 #  elif defined(_LIBCPP_APPLE_CLANG_VER)
 #    if _LIBCPP_APPLE_CLANG_VER < 1700

>From 29d0a248eb462efd9d8392148ee34a3a28676980 Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Wed, 15 Apr 2026 06:27:18 +0000
Subject: [PATCH 2/3] Echo for test

---
 libcxx/utils/ci/docker/android-builder.dockerfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index 9c5d5047dbb86..b1f1f39db9577 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -34,6 +34,11 @@ ARG ANDROID_CLANG_VERSION
 ARG ANDROID_CLANG_PREBUILTS_COMMIT
 ARG ANDROID_SYSROOT_COMMIT
 
+RUN echo "The base image version is: ${BASE_IMAGE_VERSION}"
+RUN echo "The clang version is: ${ANDROID_CLANG_VERSION}"
+RUN echo "The clang prebuilts commit's sha is: ${ANDROID_CLANG_PREBUILTS_COMMIT}"
+RUN echo "The sysroot commit's sha is: ${ANDROID_SYSROOT_COMMIT}"
+
 # Install the Android platform tools (e.g. adb) into /opt/android/sdk.
 RUN <<EOF
   set -e
@@ -48,6 +53,10 @@ EOF
 # this compiler version even after it's removed from HEAD.
 ENV ANDROID_CLANG_VERSION=$ANDROID_CLANG_VERSION
 ENV ANDROID_CLANG_PREBUILTS_COMMIT=$ANDROID_CLANG_PREBUILTS_COMMIT
+RUN echo "The base image version is: ${BASE_IMAGE_VERSION again"
+RUN echo "The clang version is: ${ANDROID_CLANG_VERSION} again"
+RUN echo "The clang prebuilts commit's sha is: ${ANDROID_CLANG_PREBUILTS_COMMIT} again"
+RUN echo "The sysroot commit's sha is: ${ANDROID_SYSROOT_COMMIT} again"
 RUN <<EOF
     set -e
     git clone --filter=blob:none --sparse \

>From 5673903489c031ff6007cafe1080a05bd06c8e06 Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Wed, 15 Apr 2026 16:41:21 +0000
Subject: [PATCH 3/3] Unfix

---
 libcxx/utils/ci/docker/android-builder.dockerfile | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index b1f1f39db9577..9c5d5047dbb86 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -34,11 +34,6 @@ ARG ANDROID_CLANG_VERSION
 ARG ANDROID_CLANG_PREBUILTS_COMMIT
 ARG ANDROID_SYSROOT_COMMIT
 
-RUN echo "The base image version is: ${BASE_IMAGE_VERSION}"
-RUN echo "The clang version is: ${ANDROID_CLANG_VERSION}"
-RUN echo "The clang prebuilts commit's sha is: ${ANDROID_CLANG_PREBUILTS_COMMIT}"
-RUN echo "The sysroot commit's sha is: ${ANDROID_SYSROOT_COMMIT}"
-
 # Install the Android platform tools (e.g. adb) into /opt/android/sdk.
 RUN <<EOF
   set -e
@@ -53,10 +48,6 @@ EOF
 # this compiler version even after it's removed from HEAD.
 ENV ANDROID_CLANG_VERSION=$ANDROID_CLANG_VERSION
 ENV ANDROID_CLANG_PREBUILTS_COMMIT=$ANDROID_CLANG_PREBUILTS_COMMIT
-RUN echo "The base image version is: ${BASE_IMAGE_VERSION again"
-RUN echo "The clang version is: ${ANDROID_CLANG_VERSION} again"
-RUN echo "The clang prebuilts commit's sha is: ${ANDROID_CLANG_PREBUILTS_COMMIT} again"
-RUN echo "The sysroot commit's sha is: ${ANDROID_SYSROOT_COMMIT} again"
 RUN <<EOF
     set -e
     git clone --filter=blob:none --sparse \