Merge "Convert to `cargo_embargo`" into main am: 9409581c44 am: 7b61d28776
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3094237
Change-Id: Ic5f6fea20bb96c8125e5e476bd32060c0c646ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/mls/mls-rs-crypto-boringssl/Android.bp b/mls/mls-rs-crypto-boringssl/Android.bp
index b363640..b7843c8 100644
--- a/mls/mls-rs-crypto-boringssl/Android.bp
+++ b/mls/mls-rs-crypto-boringssl/Android.bp
@@ -1,16 +1,7 @@
-// Copyright 2024, The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// This file is generated by cargo_embargo.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
package {
default_applicable_licenses: ["platform_system_security_mls_rs_crypto_boringssl_license"],
@@ -32,7 +23,10 @@
name: "libmls_rs_crypto_boringssl",
host_supported: true,
crate_name: "mls_rs_crypto_boringssl",
- srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.0",
+ crate_root: "src/lib.rs",
+ edition: "2021",
cfgs: ["mls_build_async"],
rustlibs: [
"libbssl_crypto",
@@ -47,8 +41,8 @@
"libmaybe_async",
],
apex_available: [
- "//apex_available:anyapex",
"//apex_available:platform",
+ "//apex_available:anyapex",
],
product_available: true,
vendor_available: true,
diff --git a/mls/mls-rs-crypto-boringssl/Cargo.toml b/mls/mls-rs-crypto-boringssl/Cargo.toml
new file mode 100644
index 0000000..8468df5
--- /dev/null
+++ b/mls/mls-rs-crypto-boringssl/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "mls-rs-crypto-boringssl"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bssl-crypto = { path = "../../../../external/boringssl/src/rust/bssl-crypto" }
+mls-rs-codec = "0.5.3"
+mls-rs-core = "0.18.0"
+mls-rs-crypto-traits = "0.10.0"
+thiserror = "1.0.49"
+zeroize = { version = "1.6.0", features = ["zeroize_derive"] }
+maybe-async = "0.2.10"
+
+[target.'cfg(mls_build_async)'.dependencies]
+async-trait = "0.1.74"
+
diff --git a/mls/mls-rs-crypto-boringssl/cargo_embargo.json b/mls/mls-rs-crypto-boringssl/cargo_embargo.json
new file mode 100644
index 0000000..de66107
--- /dev/null
+++ b/mls/mls-rs-crypto-boringssl/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "extra_cfg": ["mls_build_async"],
+ "run_cargo": false
+}