From 38fd03cb57e16baf2b3d2ce1743f7a745a6416c3 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Tue, 5 May 2026 00:02:49 -0700 Subject: [PATCH] fix(android): also pin openssl-sys to <=0.9.114 for rustc 1.71 The previous fix capped openssl at <=0.10.78 but openssl-sys 0.9.115 was still resolved transitively, and it bumped MSRV to 1.80. Cap openssl-sys at <=0.9.114 (MSRV 1.70) in the same injection. --- .github/workflows/release.yml | 2 +- scripts/android/build_all.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae95fe9..6353051 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,7 +77,7 @@ jobs: ANDROID_NDK_ROOT: /opt/android-ndk-r28 run: | cd src/serai/hrf - sed -i 's/\[dependencies\]/[dependencies]\nopenssl = { version = "<=0.10.78", features = ["vendored"] }/' Cargo.toml + sed -i 's/\[dependencies\]/[dependencies]\nopenssl = { version = "<=0.10.78", features = ["vendored"] }\nopenssl-sys = "<=0.9.114"/' Cargo.toml cargo +1.71.0 ndk --target ${{ matrix.target }} --platform 21 build --release cp ../target/${{ matrix.target }}/release/libhrf_api.so \ ../../../frostdart-android-${{ matrix.abi }}.so diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh index 93a6e48..1acf207 100755 --- a/scripts/android/build_all.sh +++ b/scripts/android/build_all.sh @@ -43,7 +43,8 @@ cd build/serai/hrf || exit # inject vendored openssl required for android cross compilation sed -i "s/\[dependencies\]/\[dependencies\]\\ -openssl = { version = \"<=0.10.78\", features = [\"vendored\"] }/" Cargo.toml +openssl = { version = \"<=0.10.78\", features = [\"vendored\"] }\\ +openssl-sys = \"<=0.9.114\"/" Cargo.toml rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android cargo ndk \