d173ce4a67
I could probably break this commit into more pieces.
---
This patch adds libc++ support for Android L (Android 5.0+) and up,
tested using the Android team's current compiler, a recent version of
the AOSP sysroot, and the x86[-64] Android Emulator.
CMake and Lit Configuration:
Add runtimes/cmake/android/Arch-${ARCH}.cmake files that configure CMake
to cross-compile to Android without using CMake's built-in NDK support
(which only works with an actual packaged NDK).
Add libcxx/cmake/caches/AndroidNDK.cmake that builds and tests libc++
(and libc++abi) for Android. This file configures libc++ to match what
the NDK distributes, e.g.:
- libc++_shared.so (includes libc++abi objects, there is no
libc++abi.so). libunwind is linked statically but not exported.
- libc++_static.a (does not include libc++abi) and libc++abi.a
- `std::__ndk1` namespace
- All the libraries are built with `__ANDROID_API__=21`, even when they
are linked to something targeting a higher API level.
(However, when the Android LLVM team builds these components, they do
not use these CMake cache files. Instead they use Python scripts to
configure the builds. See
https://android.googlesource.com/toolchain/llvm_android/.)
Add llvm-libc++[abi].android-ndk.cfg.in files that test the Android
NDK's libc++_shared.so. These files can target old or new Android
devices. The Android LLVM team uses these test files to test libc++ for
both arm/arm64 and x86/x86_64 architectures.
The Android testing mode works by setting %{executor} to adb_run.py,
which uses `adb push` and `adb shell` to run tests remotely. adb_run.py
always runs tests as the "shell" user even on an old emulator where "adb
unroot" doesn't work. The script has workarounds for old Android
devices. The script uses a Unix domain socket on the host
(--job-limit-socket) to restrict concurrent adb invocations. Compiling
the tests is a major part of libc++ testing run-time, so it's desirable
to exploit all the host cores without overburdening the test devices,
which can have far fewer cores.
BuildKite CI:
Add a builder to run-buildbot, `android-ndk-*`, that uses Android Clang
and an Android sysroot to build libc++, then starts an Android emulator
container to run tests.
Run the emulator and an adb server in a separate Docker container
(libcxx-ci-android-emulator), and create a separate Docker image for
each emulator OS system image. Set ADB_SERVER_SOCKET to connect to the
container's adb server. Running the only adb server inside the container
makes cleanup more reliable between test runs, e.g. the adb client
doesn't create a `~/.android` directory and the adb server can be
restarted along with the emulator using docker stop/run. (N.B. The
emulator insists on connecting to an adb server and will start one
itself if it can't connect to one.)
The suffix to the android-ndk-* job is a label that concisely specifies
an Android SDK emulator image. e.g.:
- "system-images;android-21;default;x86" ==> 21-def-x86
- "system-images;android-33;google_apis;x86_64" ==> 33-goog-x86_64
Fixes: https://github.com/llvm/llvm-project/issues/69270
Differential Revision: https://reviews.llvm.org/D139147
60 lines
2.0 KiB
Docker
60 lines
2.0 KiB
Docker
#===----------------------------------------------------------------------===##
|
|
#
|
|
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
# See https://llvm.org/LICENSE.txt for license information.
|
|
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
#
|
|
#===----------------------------------------------------------------------===##
|
|
|
|
FROM ubuntu:jammy
|
|
|
|
RUN apt-get update && apt-get install -y \
|
|
curl \
|
|
netcat-openbsd \
|
|
openjdk-11-jdk \
|
|
sudo \
|
|
unzip \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
ENV ANDROID_HOME /opt/android/sdk
|
|
|
|
RUN curl -sL https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -o cmdline-tools.zip && \
|
|
mkdir -p ${ANDROID_HOME} && \
|
|
unzip cmdline-tools.zip -d ${ANDROID_HOME}/cmdline-tools && \
|
|
mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest && \
|
|
rm cmdline-tools.zip
|
|
ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${PATH}"
|
|
|
|
RUN yes | sdkmanager --licenses
|
|
RUN sdkmanager --install emulator
|
|
ENV PATH="${ANDROID_HOME}/emulator:${PATH}"
|
|
|
|
ARG API # e.g. 21
|
|
RUN sdkmanager --install "platforms;android-${API}"
|
|
|
|
ARG TYPE # one of: default, google_apis, or google_apis_playstore
|
|
ARG ABI # e.g. armeabi-v7a, x86
|
|
ENV EMU_PACKAGE_NAME="system-images;android-${API};${TYPE};${ABI}"
|
|
RUN sdkmanager --install "${EMU_PACKAGE_NAME}"
|
|
|
|
COPY ./emulator-entrypoint.sh /opt/emulator/bin/emulator-entrypoint.sh
|
|
COPY ./emulator-wait-for-ready.sh /opt/emulator/bin/emulator-wait-for-ready.sh
|
|
ENV PATH="/opt/emulator/bin:${PATH}"
|
|
ENV PATH="${ANDROID_HOME}/platform-tools:${PATH}"
|
|
|
|
# Setup password-less sudo so that /dev/kvm permissions can be changed. Run the
|
|
# emulator in an unprivileged user for reliability (and it might require it?)
|
|
RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
|
|
RUN useradd --create-home emulator
|
|
USER emulator
|
|
WORKDIR /home/emulator
|
|
|
|
# Size of emulator /data partition in megabytes.
|
|
ENV EMU_PARTITION_SIZE=8192
|
|
|
|
EXPOSE 5037
|
|
|
|
HEALTHCHECK CMD emulator-wait-for-ready.sh 5
|
|
|
|
ENTRYPOINT ["emulator-entrypoint.sh"]
|