diff options
| author | David Drysdale <drysdale@google.com> | 2023-10-05 10:08:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 10:08:19 +0000 |
| commit | ed8529a3e10dc926a74eee30b901ef7129acb625 (patch) | |
| tree | 24a423aebfde2bc9e465dc44127aaa0c55a3c610 | |
| parent | 7371d117e7bfdea272b2e4df378817f3f8bd5978 (diff) | |
| parent | 1eaced6becf00d807283b5999b2838bb5e1ed887 (diff) | |
| download | zeroize-ed8529a3e10dc926a74eee30b901ef7129acb625.tar.gz | |
Add alloc to _nostd variant am: a71b01282b am: 5d0ba4fb1c am: 1eaced6bec
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zeroize/+/2769342
Change-Id: Iaf97e82fc4fc80ae86ec8e7b05ad50a5578ac936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | cargo2android.json | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -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 } ] } |