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 | 5a21faa844f7b89bc0324e996bd78c0e0cb9668e (patch) | |
| tree | d10102380c5b3815c994734b540bf1d68b959925 | |
| parent | 736688252da0750453104e2b3d13d2f6a596cd9d (diff) | |
| parent | 9eae81ffe75db60c97f9bb8bf4eab0c1ca7d6e49 (diff) | |
| download | x509-cert-5a21faa844f7b89bc0324e996bd78c0e0cb9668e.tar.gz | |
Add baremetal _nostd variant am: 17e0d735eb am: 5d5cc2b8b0 am: 091c876232 am: 9eae81ffe7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-cert/+/2769733
Change-Id: I781ce4c0a927859a3e54e9b983960bf5ea586c16
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__", +] |