diff options
| author | David Drysdale <drysdale@google.com> | 2023-10-05 08:51:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 08:51:41 +0000 |
| commit | 51f88e96b24c7199454a7e51125c9b7941bef61f (patch) | |
| tree | 6aa8528344c6a6ed502b8f054341a31baa8ad140 | |
| parent | 17facfa2df4cb22693b9524756bfcd09e30bc5e9 (diff) | |
| parent | 3ce2d523649d3cb4224e6202cb712667be0f1b92 (diff) | |
| download | pkcs8-51f88e96b24c7199454a7e51125c9b7941bef61f.tar.gz | |
Add baremetal _nostd variant am: 3ce2d52364
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pkcs8/+/2769783
Change-Id: I0fb2f346c54d748807bc37bb41d69de011556efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 30 | ||||
| -rw-r--r-- | cargo2android.json | 15 | ||||
| -rw-r--r-- | cargo2android_viz.bp | 5 |
3 files changed, 49 insertions, 1 deletions
@@ -43,6 +43,36 @@ rust_library_host { "libder", "libspki", ], +} + +rust_library_rlib { + name: "libpkcs8_nostd", + crate_name: "pkcs8", + cargo_env_compat: true, + cargo_pkg_version: "0.9.0", + srcs: ["src/lib.rs"], + edition: "2021", + features: ["alloc"], + rustlibs: [ + "libder_nostd", + "libspki_nostd", + ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], product_available: true, vendor_available: true, + visibility: [ + "//external/rust/crates/pkcs1:__subpackages__", + "//external/rust/crates/sec1:__subpackages__", + "//system/keymint:__subpackages__", + ] + , } diff --git a/cargo2android.json b/cargo2android.json index e26e552..e6baa85 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,5 +5,18 @@ ], "run": true, "vendor-available": true, - "features": "alloc" + "features": "alloc", + "variants": [ + { + }, + { + "device": true, + "no-host": true, + "add-module-block": "cargo2android_viz.bp", + "dependency_suffix": "_nostd", + "force-rlib": true, + "suffix": "_nostd", + "no-std": true + } + ] } diff --git a/cargo2android_viz.bp b/cargo2android_viz.bp new file mode 100644 index 0000000..f7ced5f --- /dev/null +++ b/cargo2android_viz.bp @@ -0,0 +1,5 @@ +visibility: [ + "//external/rust/crates/pkcs1:__subpackages__", + "//external/rust/crates/sec1:__subpackages__", + "//system/keymint:__subpackages__", +] |