aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhyber Sen <khyber@google.com>2024-02-02 02:20:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-02 02:20:11 +0000
commit8007ad3ae390a9584d89e1d263f42de8a1ce659f (patch)
tree906f9dd3bae52323bc6fde373383247e3f67f65a
parent0278168e45e786802dd9ec025a8bc99e543c034f (diff)
parentadfecb30ba9dc20ed624a80576a1a5aaad967491 (diff)
downloadzerocopy-8007ad3ae390a9584d89e1d263f42de8a1ce659f.tar.gz
Add alloc feature needed by virtio-drivers am: adfecb30baHEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zerocopy/+/2939479 Change-Id: Ie0aff742861fa8660e15aec49871df6fc5211406 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cargo2rulesmk.json2
-rw-r--r--rules.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json
index f305cd2..a9e982a 100644
--- a/cargo2rulesmk.json
+++ b/cargo2rulesmk.json
@@ -1,3 +1,3 @@
{
- "features": "default,derive"
+ "features": "default,derive,alloc"
}
diff --git a/rules.mk b/rules.mk
index e35717a..959d61c 100644
--- a/rules.mk
+++ b/rules.mk
@@ -9,12 +9,14 @@ MODULE_SRCS := \
MODULE_RUST_EDITION := 2018
MODULE_RUSTFLAGS += \
+ --cfg 'feature="alloc"' \
--cfg 'feature="byteorder"' \
--cfg 'feature="default"' \
--cfg 'feature="derive"' \
--cfg 'feature="zerocopy-derive"' \
MODULE_LIBRARY_DEPS := \
+ $(call FIND_CRATE,liballoc) \
external/rust/crates/byteorder \
external/rust/crates/zerocopy-derive \