diff options
| author | David Drysdale <drysdale@google.com> | 2023-10-05 10:08:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 10:08:20 +0000 |
| commit | a3ce211f336c328dfa79fc49b83ef448d81eb73b (patch) | |
| tree | 3c1913610ce1b45448be0a6f581d93babaec072c | |
| parent | b402eaf9d46f986b9b14b556ebd4f8ab7527e0c8 (diff) | |
| parent | d81c7a9fc22db95e41d60e806e984455a6f60dd9 (diff) | |
| download | spki-a3ce211f336c328dfa79fc49b83ef448d81eb73b.tar.gz | |
Add baremetal _nostd variant am: f931d5da30 am: 50cabfce04 am: d81c7a9fc2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spki/+/2769784
Change-Id: I89a2514c42addca07e1e1058907db34097377b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 31 | ||||
| -rw-r--r-- | cargo2android.json | 16 | ||||
| -rw-r--r-- | cargo2android_viz.bp | 6 |
3 files changed, 52 insertions, 1 deletions
@@ -42,6 +42,37 @@ rust_library_host { rustlibs: [ "libder", ], +} + +rust_library_rlib { + name: "libspki_nostd", + crate_name: "spki", + cargo_env_compat: true, + cargo_pkg_version: "0.6.0", + srcs: ["src/lib.rs"], + edition: "2021", + features: ["alloc"], + rustlibs: [ + "libder_nostd", + ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "liballoc.rust_sysroot", + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], product_available: true, vendor_available: true, + visibility: [ + "//external/rust/crates/pkcs1:__subpackages__", + "//external/rust/crates/pkcs8:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + "//system/keymint:__subpackages__", + ] + , } diff --git a/cargo2android.json b/cargo2android.json index e26e552..602fbb5 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,5 +5,19 @@ ], "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", + "alloc": true, + "no-std": true + } + ] } diff --git a/cargo2android_viz.bp b/cargo2android_viz.bp new file mode 100644 index 0000000..f9ef72a --- /dev/null +++ b/cargo2android_viz.bp @@ -0,0 +1,6 @@ +visibility: [ + "//external/rust/crates/pkcs1:__subpackages__", + "//external/rust/crates/pkcs8:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + "//system/keymint:__subpackages__", +] |