diff options
| author | David Drysdale <drysdale@google.com> | 2023-10-05 10:39:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 10:39:38 +0000 |
| commit | 27a32e1c00aa79852983c2e367eeb89eabc4612b (patch) | |
| tree | d290dbfaac85e9a8d75225a8b8eb1417c00131b5 | |
| parent | b37641f1bf0ced3956f17d1e3bee414cf1750fe0 (diff) | |
| parent | 2fb72059298326f1d530b8b5317080acfc1eb928 (diff) | |
| download | pkcs1-27a32e1c00aa79852983c2e367eeb89eabc4612b.tar.gz | |
Add baremetal _nostd variant am: 9581b421cc am: fc8029adde am: 2e8633ae34 am: 2fb7205929
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pkcs1/+/2768061
Change-Id: I060e522fc31fd13165f09a038668d9b30d82d4ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 34 | ||||
| -rw-r--r-- | cargo2android.json | 15 | ||||
| -rw-r--r-- | cargo2android_viz.bp | 3 |
3 files changed, 51 insertions, 1 deletions
@@ -49,6 +49,40 @@ rust_library_host { "libspki", "libzeroize", ], +} + +rust_library_rlib { + name: "libpkcs1_nostd", + crate_name: "pkcs1", + cargo_env_compat: true, + cargo_pkg_version: "0.4.1", + srcs: ["src/lib.rs"], + edition: "2021", + features: [ + "alloc", + "pkcs8", + "zeroize", + ], + rustlibs: [ + "libder_nostd", + "libpkcs8_nostd", + "libspki_nostd", + "libzeroize_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: [ + "//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..6912520 --- /dev/null +++ b/cargo2android_viz.bp @@ -0,0 +1,3 @@ +visibility: [ + "//system/keymint:__subpackages__", +] |