diff options
| author | Ryan Prichard <rprichard@google.com> | 2025-07-16 15:57:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-16 15:57:13 -0700 |
| commit | 038e80cfd37e948d78c70d5a258ffe424a438d51 (patch) | |
| tree | 2a304e62aea9ab358a8e8bc973c21f1244c1dbc5 /libcxx | |
| parent | 703501e66198c6d4be48773b617c784370e23d4a (diff) | |
| download | llvm-038e80cfd37e948d78c70d5a258ffe424a438d51.zip llvm-038e80cfd37e948d78c70d5a258ffe424a438d51.tar.gz llvm-038e80cfd37e948d78c70d5a258ffe424a438d51.tar.bz2 | |
[libc++][Android] Update compiler and sysroot (#148998)
* Upgrade from r536225 to r563880.
* Upgrade from ab/12644632 to f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f,
the current HEAD commit of
https://android.googlesource.com/platform/prebuilts/ndk/+/refs/heads/mirror-goog-main-ndk
The previous source of sysroots (ci.android.com), deleted its artifacts
after a short period of time, and is currently out-of-date because of
the aosp-main turndown.
Updating the Docker image also fixes two tests.
Diffstat (limited to 'libcxx')
4 files changed, 15 insertions, 16 deletions
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp index 09086a4..97e3afe 100644 --- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp @@ -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 diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.compile.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.compile.pass.cpp index 9aac871..ac63fec 100644 --- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.compile.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/has_unique_object_representations.compile.pass.cpp @@ -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 diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index 0a1985b..63cecea 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -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 @@ -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 # ===----------------------------------------------------------------------===## diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml index 2189a41..4efc6d2 100644 --- a/libcxx/utils/ci/docker-compose.yml +++ b/libcxx/utils/ci/docker-compose.yml @@ -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 |