Skip to content

Commit 38fd03c

Browse files
committed
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.
1 parent 23c9369 commit 38fd03c

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
ANDROID_NDK_ROOT: /opt/android-ndk-r28
7878
run: |
7979
cd src/serai/hrf
80-
sed -i 's/\[dependencies\]/[dependencies]\nopenssl = { version = "<=0.10.78", features = ["vendored"] }/' Cargo.toml
80+
sed -i 's/\[dependencies\]/[dependencies]\nopenssl = { version = "<=0.10.78", features = ["vendored"] }\nopenssl-sys = "<=0.9.114"/' Cargo.toml
8181
cargo +1.71.0 ndk --target ${{ matrix.target }} --platform 21 build --release
8282
cp ../target/${{ matrix.target }}/release/libhrf_api.so \
8383
../../../frostdart-android-${{ matrix.abi }}.so

scripts/android/build_all.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ cd build/serai/hrf || exit
4343

4444
# inject vendored openssl required for android cross compilation
4545
sed -i "s/\[dependencies\]/\[dependencies\]\\
46-
openssl = { version = \"<=0.10.78\", features = [\"vendored\"] }/" Cargo.toml
46+
openssl = { version = \"<=0.10.78\", features = [\"vendored\"] }\\
47+
openssl-sys = \"<=0.9.114\"/" Cargo.toml
4748

4849
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
4950
cargo ndk \

0 commit comments

Comments
 (0)