From e6ddb291354f0f40499c0dbe7f881e1c66111e6d Mon Sep 17 00:00:00 2001 From: CloudWebRTC Date: Tue, 23 Apr 2024 20:47:37 +0800 Subject: [PATCH] Set up webpki-roots for android only (#327) * Conditionally compile native or webpki roots. * revert changes. * Update ffi-builds.yml --- .github/workflows/ffi-builds.yml | 3 +++ livekit-ffi/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ffi-builds.yml b/.github/workflows/ffi-builds.yml index 941fbb0fb..356f0027d 100644 --- a/.github/workflows/ffi-builds.yml +++ b/.github/workflows/ffi-builds.yml @@ -81,16 +81,19 @@ jobs: dylib: liblivekit_ffi.so target: aarch64-linux-android name: ffi-android-arm64 + buildargs: --no-default-features --features "rustls-tls-webpki-roots" - os: ubuntu-20.04 platform: android dylib: liblivekit_ffi.so target: armv7-linux-androideabi name: ffi-android-armv7 + buildargs: --no-default-features --features "rustls-tls-webpki-roots" - os: ubuntu-20.04 platform: android dylib: liblivekit_ffi.so target: x86_64-linux-android name: ffi-android-x86_64 + buildargs: --no-default-features --features "rustls-tls-webpki-roots" name: Build (${{ matrix.target }}) runs-on: ${{ matrix.os }} diff --git a/livekit-ffi/Cargo.toml b/livekit-ffi/Cargo.toml index 68ec5dc1f..e05d53592 100644 --- a/livekit-ffi/Cargo.toml +++ b/livekit-ffi/Cargo.toml @@ -7,7 +7,7 @@ description = "FFI interface for bindings in other languages" repository = "https://github.com/livekit/rust-sdks" [features] -default = ["rustls-tls-webpki-roots"] +default = ["rustls-tls-native-roots"] native-tls = ["livekit/native-tls"] native-tls-vendored = ["livekit/native-tls-vendored"] rustls-tls-native-roots = ["livekit/rustls-tls-native-roots"]