aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Drysdale <drysdale@google.com>2023-10-05 11:25:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-05 11:25:38 +0000
commit0cc13495b229572f30589910e6053b41b6e80603 (patch)
tree1a2b6ffa0faeb1aae62b1d041962704e69280b6d
parent86c7c94cca82c1098179622c76349c02dd72c234 (diff)
parent1c311d1dfa03f46bda7ba7f415e37610b502b4f4 (diff)
downloadhex-0cc13495b229572f30589910e6053b41b6e80603.tar.gz
Add baremetal _nostd variant am: 7b1a829642 am: 6ca237bf0b am: 07abcbf818 am: e6de483765 am: 1c311d1dfa
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hex/+/2770729 Change-Id: I8cf2bf73add33e484270a04737bea638c3b9c2a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp23
-rw-r--r--cargo2android.json16
2 files changed, 38 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 1638178..277e33f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,3 +58,26 @@ rust_library {
product_available: true,
vendor_available: true,
}
+
+rust_library_rlib {
+ name: "libhex_nostd",
+ crate_name: "hex",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.4.3",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ features: ["alloc"],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "liballoc.rust_sysroot",
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ product_available: true,
+ vendor_available: true,
+}
diff --git a/cargo2android.json b/cargo2android.json
index bf949e6..d3874c5 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,19 @@
{
"device": true,
"run": true,
- "vendor-available": true
+ "vendor-available": true,
+ "variants": [
+ {
+ },
+ {
+ "device": true,
+ "alloc": true,
+ "no-host": true,
+ "dependency_suffix": "_nostd",
+ "force-rlib": true,
+ "suffix": "_nostd",
+ "no-std": true,
+ "features" : "alloc"
+ }
+ ]
}