Add a no_std variant of libzeroize am: 34a3955d94 am: 87e6e6cc58
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zeroize/+/2280690
Change-Id: Ia957427f4ed54afece1adeeb94566f82fffd899f
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index c0c8306..bd184d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -90,3 +90,25 @@
unit_test: true,
},
}
+
+rust_library_rlib {
+ name: "libzeroize_nostd",
+ crate_name: "zeroize",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.7",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ proc_macros: ["libzeroize_derive"],
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ features: [
+ "zeroize_derive",
+ ],
+ vendor_available: true,
+ min_sdk_version: "Tiramisu",
+}
+
diff --git a/cargo2android.json b/cargo2android.json
index 29e5445..d05dd9f 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,5 @@
{
+ "add-toplevel-block": "cargo2android_nostd.bp",
"apex-available": [
"//apex_available:platform",
"com.android.uwb",
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..d7f5eb2
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,20 @@
+rust_library_rlib {
+ name: "libzeroize_nostd",
+ crate_name: "zeroize",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.7",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ proc_macros: ["libzeroize_derive"],
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ features: [
+ "zeroize_derive",
+ ],
+ vendor_available: true,
+ min_sdk_version: "Tiramisu",
+}
