Skip to content

[libc++][Android] Update compiler and sysroot #148998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2025
Merged

[libc++][Android] Update compiler and sysroot #148998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca6a515
[libc++][Android] Update compiler and sysroot
rprichard Jul 15, 2025
4af6cb7
Restore Android test markers, but use UNSUPPORTED instead of XFAIL
rprichard Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17

// The Clang version that Android currently uses in the CI is too old.
// XFAIL: LIBCXX-ANDROID-FIXME
// UNSUPPORTED: LIBCXX-ANDROID-FIXME

// type_traits

Expand Down
2 changes: 1 addition & 1 deletion ...lities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// UNSUPPORTED: c++03, c++11, c++14

// The Clang version that Android currently uses in the CI is too old.
// XFAIL: LIBCXX-ANDROID-FIXME
// UNSUPPORTED: LIBCXX-ANDROID-FIXME

// type_traits

Expand Down
21 changes: 10 additions & 11 deletions libcxx/utils/ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ FROM ubuntu:jammy AS android-builder-base

ARG ANDROID_CLANG_VERSION
ARG ANDROID_CLANG_PREBUILTS_COMMIT
ARG ANDROID_SYSROOT_BID
ARG ANDROID_SYSROOT_COMMIT

RUN apt-get update && apt-get install -y curl bzip2 git unzip

Expand Down Expand Up @@ -217,19 +217,18 @@ RUN <<EOF
ls /opt/android/clang/clang-current/bin/clang
EOF

# Install an Android sysroot. New AOSP sysroots are available at
# https://ci.android.com/builds/branches/aosp-main/grid, the "ndk" target. The
# NDK also makes its sysroot prebuilt available at
# https://android.googlesource.com/platform/prebuilts/ndk/+/refs/heads/dev/platform/sysroot.
# Install an Android sysroot. New Android sysroots are available at
# https://android.googlesource.com/platform/prebuilts/ndk/+/refs/heads/mirror-goog-main-ndk/platform/sysroot.

ENV ANDROID_SYSROOT_BID=$ANDROID_SYSROOT_BID
ENV ANDROID_SYSROOT_COMMIT=$ANDROID_SYSROOT_COMMIT
RUN <<EOF
set -e
cd /opt/android
curl -L -o ndk_platform.tar.bz2 \
https://androidbuildinternal.googleapis.com/android/internal/build/v3/builds/${ANDROID_SYSROOT_BID}/ndk/attempts/latest/artifacts/ndk_platform.tar.bz2/url
tar xf ndk_platform.tar.bz2
rm ndk_platform.tar.bz2
mkdir -p /opt/android/ndk
cd /opt/android/ndk
git clone --filter=blob:none https://android.googlesource.com/platform/prebuilts/ndk tmp
git -C tmp checkout ${ANDROID_SYSROOT_COMMIT}
mv tmp/platform/sysroot .
rm -rf tmp
EOF

# ===----------------------------------------------------------------------===##
Expand Down
6 changes: 3 additions & 3 deletions libcxx/utils/ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
target: android-buildkite-builder
args:
BASE_IMAGE: ubuntu:noble
ANDROID_CLANG_VERSION: r536225
ANDROID_CLANG_PREBUILTS_COMMIT: 3f67b93ee7a50ae2a3cb34cc32d0589415cc0a9c
ANDROID_SYSROOT_BID: 12644632
ANDROID_CLANG_VERSION: r563880
ANDROID_CLANG_PREBUILTS_COMMIT: 6ae4184bb8706f9731569b9a0a82be3fcdcb951c
ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f
<<: *compiler_versions
Loading