diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-10-17 02:49:18 +0900 |
|---|---|---|
| committer | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-10-17 04:41:00 +0900 |
| commit | e228df915d64451ea6634c53e0647b4cf953c18d (patch) | |
| tree | 952be5fd0c77d1a8431905bc5f6132e47bed4c22 /ci | |
| parent | c1b25a564a7cd3e9d58d795b3369d8118ec840f2 (diff) | |
| download | rust-libc-e228df915d64451ea6634c53e0647b4cf953c18d.tar.gz | |
Pin `cc` crate to fix AArch64-Android CI
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/android-install-ndk.sh | 6 | ||||
| -rw-r--r-- | ci/docker/aarch64-linux-android/Dockerfile | 2 |
2 files changed, 4 insertions, 4 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 |