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 | e0cbbff491f477a882815796e0b7d020ab81ecab (patch) | |
| tree | 918465fd5e6e4a5db8f8a36ff9b6512cc270aca3 | |
| parent | c611d753f7bd47786f907d10b8ad00473b5d236a (diff) | |
| parent | e589b6273c94e110ba5589c8b1924cb1aff443c5 (diff) | |
| download | const-oid-e0cbbff491f477a882815796e0b7d020ab81ecab.tar.gz | |
Add baremetal _nostd variant am: 8392c57c0e am: 292c93ea53 am: c2c746f810 am: e589b6273c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/const-oid/+/2769563
Change-Id: I72a9828c5a1aa0e7629c36c4b9f007f7141b05e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 26 | ||||
| -rw-r--r-- | cargo2android.json | 16 | ||||
| -rw-r--r-- | cargo2android_viz.bp | 4 |
3 files changed, 45 insertions, 1 deletions
@@ -39,6 +39,32 @@ rust_library_host { srcs: ["src/lib.rs"], edition: "2021", features: ["db"], +} + +rust_library_rlib { + name: "libconst_oid_nostd", + crate_name: "const_oid", + cargo_env_compat: true, + cargo_pkg_version: "0.9.2", + srcs: ["src/lib.rs"], + edition: "2021", + features: ["db"], + 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/der:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + ] + , } diff --git a/cargo2android.json b/cargo2android.json index 85e0927..95cb26f 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,5 +5,19 @@ ], "run": true, "vendor-available": true, - "features": "db" + "features": "db", + "variants": [ + { + }, + { + "device": true, + "alloc": 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..690c95c --- /dev/null +++ b/cargo2android_viz.bp @@ -0,0 +1,4 @@ +visibility: [ + "//external/rust/crates/der:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", +] |