diff options
| -rw-r--r-- | ci/android-install-ndk.sh | 6 | ||||
| -rw-r--r-- | ci/docker/aarch64-linux-android/Dockerfile | 2 | ||||
| -rw-r--r-- | libc-test/Cargo.toml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ci/android-install-ndk.sh b/ci/android-install-ndk.sh index 7bc655ef69..4635651259 100644 --- a/ci/android-install-ndk.sh +++ b/ci/android-install-ndk.sh @@ -9,15 +9,15 @@ unzip -q ${NDK}-linux-x86_64.zip case "$1" in arm) arch=arm - api=24 + api=28 ;; armv7) arch=arm - api=24 + api=28 ;; aarch64) arch=arm64 - api=24 + api=28 ;; i686) arch=x86 diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile index 2c816c24f2..d5396a32e1 100644 --- a/ci/docker/aarch64-linux-android/Dockerfile +++ b/ci/docker/aarch64-linux-android/Dockerfile @@ -29,7 +29,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu RUN ls -a /android/sdk/platform-tools ENV PATH=$PATH:/rust/bin \ - CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \ + CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \ CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \ HOME=/tmp diff --git a/libc-test/Cargo.toml b/libc-test/Cargo.toml index 00e0b5407c..ae5bfe3933 100644 --- a/libc-test/Cargo.toml +++ b/libc-test/Cargo.toml @@ -9,7 +9,7 @@ path = ".." default-features = false [build-dependencies] -cc = "1.0" +cc = "=1.0.52" # FIXME: Use fork ctest until the maintainer gets back. ctest2 = "0.3" |