diff options
| author | Frances Wingerter <wingerter@google.com> | 2024-02-16 05:13:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 05:13:48 +0000 |
| commit | 1f431c5144ce5525949228dd98cbfc6db22e5ec4 (patch) | |
| tree | 6742f54d2d2dd5d57b5f2b28907ce9c751a4cc64 | |
| parent | d268f6896a586d8d3c66147dd141cfa6d5e70584 (diff) | |
| parent | c2b25bd45757c0689dae0fb4bf9b0a41f06e7822 (diff) | |
| download | common-1f431c5144ce5525949228dd98cbfc6db22e5ec4.tar.gz | |
build: accumulate ALLHOSTMODULES list of host modules am: c2b25bd457
Original change: https://android-review.googlesource.com/c/trusty/lk/common/+/2928671
Change-Id: I33a8dd1cce190b3641e82d529036b6807c9dade5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | make/module.mk | 1 | ||||
| -rw-r--r-- | make/recurse.mk | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/make/module.mk b/make/module.mk index 1f56eb28..23d85f0d 100644 --- a/make/module.mk +++ b/make/module.mk @@ -259,6 +259,7 @@ HOST_RUST_DEPS := $(foreach dep, $(MODULE_KERNEL_RUST_DEPS), $(if $(filter proc- # add kernel rust deps to the set of modules MODULES += $(KERNEL_RUST_DEPS) +HOST_MODULES += $(HOST_RUST_DEPS) # determine crate names of dependency modules so we can depend on their rlibs. # because of ordering, we cannot simply e.g. set/read MODULE_$(dep)_CRATE_NAME, diff --git a/make/recurse.mk b/make/recurse.mk index d4510906..bdeaf179 100644 --- a/make/recurse.mk +++ b/make/recurse.mk @@ -6,12 +6,20 @@ MODULES := $(sort $(MODULES)) MODULES := $(filter-out $(ALLMODULES),$(MODULES)) -ifneq ($(MODULES),) +HOST_MODULES := $(sort $(HOST_MODULES)) +HOST_MODULES := $(filter-out $(ALLHOSTMODULES),$(HOST_MODULES)) + +ifneq ($(MODULES)$(HOST_MODULES),) ALLMODULES += $(MODULES) ALLMODULES := $(sort $(ALLMODULES)) INCMODULES := $(MODULES) MODULES := + +ALLHOSTMODULES += $(HOST_MODULES) +ALLHOSTMODULES := $(sort $(ALLHOSTMODULES)) +HOST_MODULES := + $(info including $(INCMODULES)) include $(addsuffix /rules.mk,$(INCMODULES)) |