Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the Android NDK script to r25b #1337

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update the Android NDK script to r25b #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64ae0b2
Update the Android NDK script to r25b
chriswailes Sep 28, 2022
9ae7b7d
Remove bench_black_box from the list of unstable features
chriswailes Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions ci/android-install-ndk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,7 @@
set -ex

curl --retry 5 -O \
https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
unzip -q android-ndk-r15b-linux-x86_64.zip

case "${1}" in
aarch64)
arch=arm64
;;

i686)
arch=x86
;;

*)
arch="${1}"
;;
esac;

android-ndk-r15b/build/tools/make_standalone_toolchain.py \
--unified-headers \
--install-dir "/android/ndk-${1}" \
--arch "${arch}" \
--api 24

rm -rf ./android-ndk-r15b-linux-x86_64.zip ./android-ndk-r15b
https://dl.google.com/android/repository/android-ndk-r25b-linux.zip
unzip -q android-ndk-r25b-linux.zip
mv android-ndk-r25b "/android/ndk-${1}"
rm -rf ./android-ndk-r25b-linux.zip
9 changes: 4 additions & 5 deletions ci/docker/x86_64-linux-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
COPY android-sysimage.sh /android/
RUN bash /android/android-sysimage.sh x86_64 x86_64-24_r07.zip

ENV PATH=$PATH:/rust/bin:/android/ndk-$ANDROID_ARCH/bin \
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
CC_x86_64_linux_android=x86_64-linux-android-gcc \
CXX_x86_64_linux_android=x86_64-linux-android-g++ \
OBJDUMP=x86_64-linux-android-objdump \
ENV PATH=$PATH:/rust/bin:/android/ndk-$ANDROID_ARCH/toolchains/llvm/prebuilt/linux-x86_64/bin/ \
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang \
CC_x86_64_linux_android=x86_64-linux-android21-clang \
CXX_x86_64_linux_android=x86_64-linux-android21-clang++ \
HOME=/tmp
6 changes: 4 additions & 2 deletions ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ case ${TARGET} in
;;
#Unoptimized build uses fast-isel which breaks with msa
mips-* | mipsel-*)
export RUSTFLAGS="${RUSTFLAGS} -C llvm-args=-fast-isel=false"
;;
export RUSTFLAGS="${RUSTFLAGS} -C llvm-args=-fast-isel=false"
;;
# Some of our test dependencies use the deprecated `gcc` crates which is
# missing a fix from https://github.com/alexcrichton/cc-rs/pull/627. Apply
# the workaround manually here.
Expand All @@ -49,6 +49,8 @@ case ${TARGET} in
riscv64*)
export TARGET_CC="riscv64-linux-gnu-gcc"
;;
*android*)
export LD="${TARGET}-clang"
esac

echo "RUSTFLAGS=${RUSTFLAGS}"
Expand Down
1 change: 0 additions & 1 deletion crates/core_arch/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
f16c_target_feature,
allow_internal_unstable,
decl_macro,
bench_black_box,
asm_const,
target_feature_11
)]
Expand Down
1 change: 0 additions & 1 deletion crates/stdarch-test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//! This basically just disassembles the current executable and then parses the
//! output once globally and then provides the `assert` function which makes
//! assertions about the disassembly of a function.
#![feature(bench_black_box)] // For black_box
#![deny(rust_2018_idioms)]
#![allow(clippy::missing_docs_in_private_items, clippy::print_stdout)]

Expand Down