diff options
| author | Frances Wingerter <wingerter@google.com> | 2024-02-16 05:13:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 05:13:51 +0000 |
| commit | 0762a562cf03127e9306100d4de5d831ac1d7862 (patch) | |
| tree | 9468f3d302caea94f64db2b8712dc27ae3f0a460 | |
| parent | 1f431c5144ce5525949228dd98cbfc6db22e5ec4 (diff) | |
| parent | 74ed0f4bf0a9e8869a3832126122e109730ff8bf (diff) | |
| download | common-0762a562cf03127e9306100d4de5d831ac1d7862.tar.gz | |
build: include MODULE_LIBRARY_EXPORTED_DEPS in deps for kernel rust am: 74ed0f4bf0
Original change: https://android-review.googlesource.com/c/trusty/lk/common/+/2940505
Change-Id: I3e2f0a977843b3c38379c7495a18cec51be62f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | make/module.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/make/module.mk b/make/module.mk index 23d85f0d..e9c626b4 100644 --- a/make/module.mk +++ b/make/module.mk @@ -229,9 +229,10 @@ ifeq ($(MODULE_CRATE_NAME),) $(error rust module $(MODULE) does not set MODULE_CRATE_NAME. It must be set with a simple assignment, i.e. "MODULE_CRATE_NAME := foo") endif -# if specific kernel rust deps not specified, rust modules use other deps. only -# one of these two should be set, so this just uses the non-empty one -MODULE_KERNEL_RUST_DEPS := $(MODULE_LIBRARY_DEPS) $(MODULE_DEPS) +# if specific kernel rust deps not specified, rust modules use other deps. +# library and module deps are set mutually exclusively, so it's safe to simply +# concatenate them to use whichever is set +MODULE_KERNEL_RUST_DEPS := $(MODULE_LIBRARY_DEPS) $(MODULE_LIBRARY_EXPORTED_DEPS) $(MODULE_DEPS) define READ_CRATE_INFO QUERY_MODULE := $1 |