diff options
| author | David Drysdale <drysdale@google.com> | 2023-10-05 10:08:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 10:08:18 +0000 |
| commit | 05bd17152b2be585843a8c45c80d81cb0aae59ff (patch) | |
| tree | 4fc54d1ef877d65edb704b87c162a7a69eb31449 | |
| parent | f92892294400f09282fed7b5b3901447f928b385 (diff) | |
| parent | d3356b2597ded2068903737d1ce3f57200876a86 (diff) | |
| download | flagset-05bd17152b2be585843a8c45c80d81cb0aae59ff.tar.gz | |
Add baremetal _nostd variant am: 9e90425e46 am: a2705249ae am: d3356b2597
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/flagset/+/2769732
Change-Id: I75c3208aad7ac214e6871b7578b7ead8f79a8ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 25 | ||||
| -rw-r--r-- | cargo2android.json | 15 | ||||
| -rw-r--r-- | cargo2android_viz.bp | 5 |
3 files changed, 44 insertions, 1 deletions
@@ -25,6 +25,31 @@ rust_library_host { cargo_pkg_version: "0.4.3", srcs: ["src/lib.rs"], edition: "2018", +} + +rust_library_rlib { + name: "libflagset_nostd", + crate_name: "flagset", + cargo_env_compat: true, + cargo_pkg_version: "0.4.3", + srcs: ["src/lib.rs"], + edition: "2018", + 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: [ + "//external/rust/crates/der:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + "//system/keymint:__subpackages__", + ] + , } diff --git a/cargo2android.json b/cargo2android.json index 72a9a5a..dcfd6f1 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,5 +4,18 @@ "com.android.virt" ], "run": true, - "vendor-available": true + "vendor-available": true, + "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..f527f60 --- /dev/null +++ b/cargo2android_viz.bp @@ -0,0 +1,5 @@ +visibility: [ + "//external/rust/crates/der:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + "//system/keymint:__subpackages__", +] |