aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stokes <alanstokes@google.com>2023-05-02 12:39:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-02 12:39:21 +0000
commit6f3cb28eedce7520b22bb199b67de33c3b329272 (patch)
tree31ad1d3e82d4db3b019aa81fa63e3c71786ca8e7
parent589d4ff722feffad83dffb1f4553755909131412 (diff)
parentf9bf3de0f31c2c4cf257c99b570fa79b8373c0cc (diff)
downloadciborium-io-6f3cb28eedce7520b22bb199b67de33c3b329272.tar.gz
Add alloc to ciborium-io no_std am: 2756462777 am: f9bf3de0f3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ciborium-io/+/2574598 Change-Id: Ie4c4a2d082e1be0d4afa38fc1b69e4174049eca5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android_nostd.bp2
2 files changed, 4 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 156a5cc..1610254 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,9 +45,11 @@ rust_library_rlib {
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 @@ rust_library_rlib {
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",
],