aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-10 23:13:21 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-10 23:13:21 +0000
commit78f454b06a886ca69fe1cba1bad8aabdc4a01e34 (patch)
tree24a423aebfde2bc9e465dc44127aaa0c55a3c610
parent0525ee86f1605b61101dd427fb89a2f5fe5c8dfb (diff)
parent5d0ba4fb1c0b2ab1a712a881579f9e8420fc665c (diff)
downloadzeroize-78f454b06a886ca69fe1cba1bad8aabdc4a01e34.tar.gz
Snap for 10929834 from 5d0ba4fb1c0b2ab1a712a881579f9e8420fc665c to sdk-release
Change-Id: I1942fddc8c5bbace2d202964dd85a24461a732be
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json6
2 files changed, 8 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 157f1ab..e56d529 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,7 +60,10 @@ rust_library_rlib {
cargo_pkg_version: "1.6.0",
srcs: ["src/lib.rs"],
edition: "2021",
- features: ["zeroize_derive"],
+ features: [
+ "alloc",
+ "zeroize_derive",
+ ],
proc_macros: ["libzeroize_derive"],
apex_available: [
"//apex_available:platform",
@@ -69,6 +72,7 @@ rust_library_rlib {
prefer_rlib: true,
no_stdlibs: true,
stdlibs: [
+ "liballoc.rust_sysroot",
"libcompiler_builtins.rust_sysroot",
"libcore.rust_sysroot",
],
diff --git a/cargo2android.json b/cargo2android.json
index b6a9107..9ae6cab 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,17 +3,17 @@
"run": true,
"min_sdk_version": "Tiramisu",
"vendor-available": true,
+ "features": "alloc,zeroize_derive",
"variants": [
{
- "features": "alloc,zeroize_derive",
"tests": true
},
{
- "features": "zeroize_derive",
"force-rlib": true,
"no-host": true,
"suffix": "_nostd",
- "no-std": true
+ "no-std": true,
+ "alloc": true
}
]
}