Skip to content

Commit 89f1037

Browse files
0xPoe0xPoe
authored
Merge pull request #3282 from rust-lang/revert-3220-rustin-patch-android
Revert "Temporarily disable the android tests"
2 parents fcc973e + 4611014 commit 89f1037

File tree

5 files changed

+38
-36
lines changed

5 files changed

+38
-36
lines changed

‎.github/workflows/linux-builds-on-master.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ jobs:
2323
target:
2424
- x86_64-unknown-linux-gnu
2525
- armv7-unknown-linux-gnueabihf
26+
- aarch64-linux-android
2627
- aarch64-unknown-linux-gnu # skip-pr
2728
- powerpc64-unknown-linux-gnu # skip-pr
2829
- x86_64-unknown-linux-musl # skip-pr
29-
# Temporarily disabled due to https://github.com/rust-lang/rust/issues/103673.
30-
# FIXME(hi-rustin): Re-enable them after the issue is fixed.
31-
# - aarch64-linux-android
3230
include:
3331
- target: x86_64-unknown-linux-gnu
3432
run_tests: YES

‎.github/workflows/linux-builds-on-pr.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ jobs:
2222
target:
2323
- x86_64-unknown-linux-gnu
2424
- armv7-unknown-linux-gnueabihf
25-
# Temporarily disabled due to https://github.com/rust-lang/rust/issues/103673.
26-
# FIXME(hi-rustin): Re-enable them after the issue is fixed.
27-
# - aarch64-linux-android
25+
- aarch64-linux-android
2826
include:
2927
- target: x86_64-unknown-linux-gnu
3028
run_tests: YES

‎.github/workflows/linux-builds-on-stable.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
target:
2222
- x86_64-unknown-linux-gnu
2323
- armv7-unknown-linux-gnueabihf
24+
- aarch64-linux-android
2425
- aarch64-unknown-linux-gnu # skip-pr
2526
- aarch64-unknown-linux-musl # skip-pr skip-master
2627
- powerpc64-unknown-linux-gnu # skip-pr
@@ -38,13 +39,10 @@ jobs:
3839
- mipsel-unknown-linux-gnu # skip-pr skip-master
3940
- mips64el-unknown-linux-gnuabi64 # skip-pr skip-master
4041
- s390x-unknown-linux-gnu # skip-pr skip-master
41-
# Temporarily disabled due to https://github.com/rust-lang/rust/issues/103673.
42-
# FIXME(hi-rustin): Re-enable them after the issue is fixed.
43-
# - arm-linux-androideabi skip-pr skip-master
44-
# - armv7-linux-androideabi skip-pr skip-master
45-
# - i686-linux-android skip-pr skip-master
46-
# - x86_64-linux-android skip-pr skip-master
47-
# - aarch64-linux-android
42+
- arm-linux-androideabi # skip-pr skip-master
43+
- armv7-linux-androideabi # skip-pr skip-master
44+
- i686-linux-android # skip-pr skip-master
45+
- x86_64-linux-android # skip-pr skip-master
4846
- riscv64gc-unknown-linux-gnu # skip-pr skip-master
4947
include:
5048
- target: x86_64-unknown-linux-gnu

‎ci/actions-templates/linux-builds-template.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
target:
3131
- x86_64-unknown-linux-gnu
3232
- armv7-unknown-linux-gnueabihf
33+
- aarch64-linux-android
3334
- aarch64-unknown-linux-gnu # skip-pr
3435
- aarch64-unknown-linux-musl # skip-pr skip-master
3536
- powerpc64-unknown-linux-gnu # skip-pr
@@ -47,13 +48,10 @@ jobs:
4748
- mipsel-unknown-linux-gnu # skip-pr skip-master
4849
- mips64el-unknown-linux-gnuabi64 # skip-pr skip-master
4950
- s390x-unknown-linux-gnu # skip-pr skip-master
50-
# Temporarily disabled due to https://github.com/rust-lang/rust/issues/103673.
51-
# FIXME(hi-rustin): Re-enable them after the issue is fixed.
52-
# - arm-linux-androideabi skip-pr skip-master
53-
# - armv7-linux-androideabi skip-pr skip-master
54-
# - i686-linux-android skip-pr skip-master
55-
# - x86_64-linux-android skip-pr skip-master
56-
# - aarch64-linux-android
51+
- arm-linux-androideabi # skip-pr skip-master
52+
- armv7-linux-androideabi # skip-pr skip-master
53+
- i686-linux-android # skip-pr skip-master
54+
- x86_64-linux-android # skip-pr skip-master
5755
- riscv64gc-unknown-linux-gnu # skip-pr skip-master
5856
include:
5957
- target: x86_64-unknown-linux-gnu

‎ci/docker/android/Dockerfile

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
FROM rust-android
22

3-
ENV PATH=$PATH:/android/ndk/arm-21/bin:/android/ndk/arm64-21/bin:/android/ndk/x86-21/bin:/android/ndk/x86_64-21/bin \
4-
CC_arm_linux_androideabi=arm-linux-androideabi-clang \
5-
CC_armv7_linux_androideabi=arm-linux-androideabi-clang \
6-
CC_aarch64_linux_android=aarch64-linux-android-clang \
7-
CC_i686_linux_android=i686-linux-android-clang \
8-
CC_x86_64_linux_android=x86_64-linux-android-clang \
9-
CXX_arm_linux_androideabi=arm-linux-androideabi-clang++ \
10-
CXX_armv7_linux_androideabi=arm-linux-androideabi-clang++ \
11-
CXX_aarch64_linux_android=aarch64-linux-android-clang++ \
12-
CXX_i686_linux_android=i686-linux-android-clang++ \
13-
CXX_x86_64_linux_android=x86_64-linux-android-clang++ \
14-
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-clang \
15-
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-clang \
16-
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-clang \
17-
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-clang \
18-
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-clang
3+
ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
4+
AR_arm_linux_androideabi=llvm-ar \
5+
AR_armv7_linux_androideabi=llvm-ar \
6+
AR_aarch64_linux_android=llvm-ar \
7+
AR_i686_linux_android=llvm-ar \
8+
AR_x86_64_linux_android=llvm-ar \
9+
RANLIB_arm_linux_androideabi=llvm-ranlib \
10+
RANLIB_armv7_linux_androideabi=llvm-ranlib \
11+
RANLIB_aarch64_linux_android=llvm-ranlib \
12+
RANLIB_i686_linux_android=llvm-ranlib \
13+
RANLIB_x86_64_linux_android=llvm-ranlib \
14+
CC_arm_linux_androideabi=armv7a-linux-androideabi19-clang \
15+
CC_armv7_linux_androideabi=armv7a-linux-androideabi19-clang \
16+
CC_aarch64_linux_android=aarch64-linux-android21-clang \
17+
CC_i686_linux_android=i686-linux-android19-clang \
18+
CC_x86_64_linux_android=x86_64-linux-android21-clang \
19+
CXX_arm_linux_androideabi=armv7a-linux-androideabi19-clang++ \
20+
CXX_armv7_linux_androideabi=armv7a-linux-androideabi19-clang++ \
21+
CXX_aarch64_linux_android=aarch64-linux-android21-clang++ \
22+
CXX_i686_linux_android=i686-linux-android19-clang++ \
23+
CXX_x86_64_linux_android=x86_64-linux-android21-clang++ \
24+
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
25+
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
26+
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \
27+
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android19-clang \
28+
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang

0 commit comments

Comments
 (0)