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 | 5d5cc2b8b005c210716caf849b2ab7a7624e9a49 (patch) | |
| tree | d10102380c5b3815c994734b540bf1d68b959925 | |
| parent | c3f0ffc94097d495f11ed1246e29eaa63485c397 (diff) | |
| parent | 17e0d735ebf09a7663026055a6505ae1731719dc (diff) | |
| download | x509-cert-5d5cc2b8b005c210716caf849b2ab7a7624e9a49.tar.gz | |
Add baremetal _nostd variant am: 17e0d735eb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-cert/+/2769733
Change-Id: I921683cb8a5b43f7573ad70f1384f23ee93d42a4
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 | 3 |
3 files changed, 47 insertions, 1 deletions
@@ -45,6 +45,36 @@ rust_library_host { "libflagset", "libspki", ], +} + +rust_library_rlib { + name: "libx509_cert_nostd", + crate_name: "x509_cert", + cargo_env_compat: true, + cargo_pkg_version: "0.1.1", + srcs: ["src/lib.rs"], + edition: "2021", + features: ["alloc"], + rustlibs: [ + "libconst_oid_nostd", + "libder_nostd", + "libflagset_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: [ + "//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__", +] |