summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/android-install-ndk.sh6
-rw-r--r--ci/docker/aarch64-linux-android/Dockerfile2
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