From 5ffad0addc7e4464ee6671d32eb007ec32982db5 Mon Sep 17 00:00:00 2001 From: rami3l Date: Mon, 27 Jul 2026 10:34:40 +0200 Subject: [PATCH 1/2] DROP ME --- .github/workflows/ci.yaml | 3 ++- ci/actions-templates/linux-builds-template.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f57ca6d789..b3ba06ef8d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -641,6 +641,7 @@ jobs: - armv7-unknown-linux-gnueabihf - aarch64-linux-android - aarch64-unknown-linux-gnu + - x86_64-linux-android # skip-main include: - target: x86_64-unknown-linux-gnu run_tests: YES @@ -1001,7 +1002,7 @@ jobs: - sparcv9-sun-solaris # skip-pr skip-main - arm-linux-androideabi # skip-pr skip-main - armv7-linux-androideabi # skip-pr skip-main - - x86_64-linux-android # skip-pr skip-main + - x86_64-linux-android # skip-main - riscv64gc-unknown-linux-gnu # skip-pr skip-main - riscv64gc-unknown-linux-musl # skip-pr skip-main - loongarch64-unknown-linux-gnu # skip-pr skip-main diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml index cf6730e66a..7e310f975c 100644 --- a/ci/actions-templates/linux-builds-template.yaml +++ b/ci/actions-templates/linux-builds-template.yaml @@ -42,7 +42,7 @@ jobs: # skip-main skip-pr skip-stable - sparcv9-sun-solaris # skip-pr skip-main - arm-linux-androideabi # skip-pr skip-main - armv7-linux-androideabi # skip-pr skip-main - - x86_64-linux-android # skip-pr skip-main + - x86_64-linux-android # skip-main - riscv64gc-unknown-linux-gnu # skip-pr skip-main - riscv64gc-unknown-linux-musl # skip-pr skip-main - loongarch64-unknown-linux-gnu # skip-pr skip-main From f3775149b83d9cf5da829a6f44b60e23d4728e4a Mon Sep 17 00:00:00 2001 From: rami3l Date: Mon, 27 Jul 2026 10:35:49 +0200 Subject: [PATCH 2/2] ci(docker/android): make `as` recognize SM3/SM4 insts --- ci/docker/android/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/android/Dockerfile b/ci/docker/android/Dockerfile index 77dc569ee5..33cee42307 100644 --- a/ci/docker/android/Dockerfile +++ b/ci/docker/android/Dockerfile @@ -4,7 +4,7 @@ FROM rust-android # See: https://aws.github.io/aws-lc-rs/requirements/linux RUN apt-get update && apt-get install -qy gcc-multilib libclang-dev -ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \ +ENV PATH=/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \ ANDROID_NDK=/android/ndk/ \ AR_arm_linux_androideabi=llvm-ar \ AR_armv7_linux_androideabi=llvm-ar \