Skip to content

Commit

Permalink
Set up webpki-roots for android only (#327)
Browse files Browse the repository at this point in the history
* Conditionally compile native or webpki roots.

* revert changes.

* Update ffi-builds.yml
  • Loading branch information
cloudwebrtc authored Apr 23, 2024
1 parent 8244963 commit e6ddb29
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/ffi-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion livekit-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit e6ddb29

Please sign in to comment.