aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2024-01-05 18:52:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-01-05 18:52:29 +0000
commitb503156a30853f0e66be818e1dd8df7d6bcb459a (patch)
tree2378a1c91e19eb2dfab7395706cb97408815b1af
parent4e0d9324cb514706c4c820d39406200887a7d033 (diff)
parent446c795a7e4abd244689c36254ccac649663ba1f (diff)
downloadbeto-rust-b503156a30853f0e66be818e1dd8df7d6bcb459a.tar.gz
Switch beto-rust to using bssl-crypto am: 446c795a7e
Original change: https://android-review.googlesource.com/c/platform/external/rust/beto-rust/+/2880480 Change-Id: Id9dbf55186680418a8852c341688bcf54023a275 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--nearby/Android.bp14
1 files changed, 6 insertions, 8 deletions
diff --git a/nearby/Android.bp b/nearby/Android.bp
index 9237aac..1739424 100644
--- a/nearby/Android.bp
+++ b/nearby/Android.bp
@@ -76,11 +76,11 @@ rust_library_rlib {
cargo_pkg_version: "0.1.0",
srcs: ["crypto/crypto_provider_default/src/lib.rs"],
edition: "2021",
- features: ["opensslbssl"],
+ features: ["boringssl"],
rustlibs: [
"libcfg_if",
"libcrypto_provider",
- "libcrypto_provider_openssl",
+ "libcrypto_provider_boringssl",
],
apex_available: [
"//apex_available:platform",
@@ -89,20 +89,18 @@ rust_library_rlib {
}
rust_library_rlib {
- name: "libcrypto_provider_openssl",
+ name: "libcrypto_provider_boringssl",
host_supported: true,
- crate_name: "crypto_provider_openssl",
+ crate_name: "crypto_provider_boringssl",
cargo_env_compat: true,
cargo_pkg_version: "0.1.0",
- cfgs: ["soong"],
- srcs: ["crypto/crypto_provider_openssl/src/lib.rs"],
+ srcs: ["crypto/crypto_provider_boringssl/src/lib.rs"],
edition: "2021",
- features: ["boringssl"],
rustlibs: [
"libcfg_if",
"libcrypto_provider",
"libcrypto_provider_stubs",
- "libopenssl",
+ "libbssl_crypto",
"librand",
],
apex_available: [