diff options
| author | Maurice Lam <yukl@google.com> | 2024-01-05 19:53:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-05 19:53:28 +0000 |
| commit | 9f2a5e6eac0c9c55995f9b22e4c5b947714231d8 (patch) | |
| tree | 2378a1c91e19eb2dfab7395706cb97408815b1af | |
| parent | d66ef0cdfaae6168f04f7bf0e15e79ae41af849a (diff) | |
| parent | 9cb9ac223ef2b89e8ba2ced1f352a650fd77112b (diff) | |
| download | beto-rust-9f2a5e6eac0c9c55995f9b22e4c5b947714231d8.tar.gz | |
Switch beto-rust to using bssl-crypto am: 446c795a7e am: b503156a30 am: 9cb9ac223e
Original change: https://android-review.googlesource.com/c/platform/external/rust/beto-rust/+/2880480
Change-Id: Icbae57e6dda00e134810f9e7b82c10ba66fc337e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | nearby/Android.bp | 14 |
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: [ |