aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhyber Sen <khyber@google.com>2024-02-15 00:23:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-15 00:23:12 +0000
commit903331405b5c0658fe8963abcb59bcf07bd84822 (patch)
tree441db0ef8e1c16d9c6bc6d0ed0760a8ea4c7a661
parentd0dc7241d1ea1d60168507fe6cf10279bccbfa82 (diff)
parent4494fd2edc3962b2a73265eb03dfeacbfc551e94 (diff)
downloadvirtio-drivers-903331405b5c0658fe8963abcb59bcf07bd84822.tar.gz
Add alloc dependency for #[no_std] use in the trusty kernel am: 4494fd2edcHEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/virtio-drivers/+/2963363 Change-Id: I15f8949ef9b0ec4a196996c060193f7f22317f24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cargo2rulesmk.json3
-rw-r--r--patches/rules.mk.diff12
-rw-r--r--rules.mk3
3 files changed, 17 insertions, 1 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json
new file mode 100644
index 0000000..5733757
--- /dev/null
+++ b/cargo2rulesmk.json
@@ -0,0 +1,3 @@
+{
+ "patch": "patches/rules.mk.diff"
+} \ No newline at end of file
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
new file mode 100644
index 0000000..17d1333
--- /dev/null
+++ b/patches/rules.mk.diff
@@ -0,0 +1,12 @@
+diff --git a/rules.mk b/rules.mk
+index fe61b75..f43c05b 100644
+--- a/rules.mk
++++ b/rules.mk
+@@ -13,6 +13,7 @@ MODULE_RUSTFLAGS += \
+ --cfg 'feature="default"' \
+
+ MODULE_LIBRARY_DEPS := \
++ trusty/user/base/lib/liballoc-rust \
+ external/rust/crates/bitflags \
+ external/rust/crates/log \
+ external/rust/crates/zerocopy \
diff --git a/rules.mk b/rules.mk
index fe61b75..7755d96 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,4 @@
-# This file is generated by cargo2rulesmk.py --run.
+# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json.
# Do not modify this file as changes will be overridden on upgrade.
LOCAL_DIR := $(GET_LOCAL_DIR)
@@ -13,6 +13,7 @@ MODULE_RUSTFLAGS += \
--cfg 'feature="default"' \
MODULE_LIBRARY_DEPS := \
+ trusty/user/base/lib/liballoc-rust \
external/rust/crates/bitflags \
external/rust/crates/log \
external/rust/crates/zerocopy \