diff options
author | Alan Stokes <alanstokes@google.com> | 2023-04-25 17:49:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-25 17:49:36 +0000 |
commit | ff4927e06300aa0316dfced442e0dc07e3b68a8b (patch) | |
tree | 2d41440de78728e182162a06c9cfff7b380c164d | |
parent | efa7aa47fdcc6211dc06ee417c7c74157567bf30 (diff) | |
parent | 903858f9df2f725d4a8c104900b21b918c268151 (diff) | |
download | half-ff4927e06300aa0316dfced442e0dc07e3b68a8b.tar.gz |
Create no_std builds of ciborium and dependencies am: 03842cff6f am: 2263cfa5fc am: e75ca0f5ad am: 903858f9df
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/half/+/2557333
Change-Id: I777fa695af23cabc012aa052e2c8915940b36036
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 | 7 | ||||
-rw-r--r-- | cargo2android_nostd.bp | 22 |
3 files changed, 48 insertions, 6 deletions
@@ -52,8 +52,31 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.virt", + "//apex_available:anyapex", ], product_available: true, vendor_available: true, } + +rust_library_rlib { + name: "libhalf_nostd", + crate_name: "half", + cargo_env_compat: true, + cargo_pkg_version: "2.2.1", + srcs: ["src/lib.rs"], + edition: "2021", + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "liballoc.rust_sysroot", + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], + features: [ + "alloc", + ], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], +} diff --git a/cargo2android.json b/cargo2android.json index 84618e2..2f73971 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,9 +1,6 @@ { - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], + "add-toplevel-block": "cargo2android_nostd.bp", "device": true, "run": true, "vendor-available": true -}
\ No newline at end of file +} diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp new file mode 100644 index 0000000..db81b1a --- /dev/null +++ b/cargo2android_nostd.bp @@ -0,0 +1,22 @@ +rust_library_rlib { + name: "libhalf_nostd", + crate_name: "half", + cargo_env_compat: true, + cargo_pkg_version: "2.2.1", + srcs: ["src/lib.rs"], + edition: "2021", + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "liballoc.rust_sysroot", + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], + features: [ + "alloc", + ], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], +} |