[automerger skipped] Create no_std builds of ciborium and dependencies am: 28254c332d -s ours
am skip reason: Merged-In I3d2a1f4185a6ec41ba8205f2306e37e6823998b6 with SHA-1 6cb80b001e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/ciborium-io/+/23105755
Change-Id: I2bd604b54f34a8dba20461f8380cf353e4dc9302
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 156a5cc..1610254 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,9 +45,11 @@
cargo_pkg_version: "0.2.0",
srcs: ["src/lib.rs"],
edition: "2021",
+ features: ["alloc"],
prefer_rlib: true,
no_stdlibs: true,
stdlibs: [
+ "liballoc.rust_sysroot",
"libcompiler_builtins.rust_sysroot",
"libcore.rust_sysroot",
],
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
index 6ec59a8..9712ce9 100644
--- a/cargo2android_nostd.bp
+++ b/cargo2android_nostd.bp
@@ -5,9 +5,11 @@
cargo_pkg_version: "0.2.0",
srcs: ["src/lib.rs"],
edition: "2021",
+ features: ["alloc"],
prefer_rlib: true,
no_stdlibs: true,
stdlibs: [
+ "liballoc.rust_sysroot",
"libcompiler_builtins.rust_sysroot",
"libcore.rust_sysroot",
],
