commit ac296d5cc6d8dae22e2eefa49b4646105c48851a
author Kelvin Zhang <zhangkelvin@google.com> Mon Dec 05 22:36:08 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 05 22:36:08 2022 +0000
tree dbd68b9109b118f5d42ea1d1e12595a119ceaa16
parent 056f6b2d468b7698d821dd41dacda2bda8e97af3
parent b66b11ec9a4e53f3e933616d7f6b3335bfdec8f2

Merge "Allow empty modules.load file to be generated"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 00fa5f4..062d0b5 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -447,6 +447,8 @@
 $(if $(strip $(BOARD_$(1)_KERNEL_MODULES$(_sep)$(_kver))$(BOARD_$(1)_KERNEL_MODULES_ARCHIVE$(_sep)$(_kver))),\
   $(if $(BOARD_$(1)_KERNEL_MODULES_LOAD$(_sep)$(_kver)),,\
     $(eval BOARD_$(1)_KERNEL_MODULES_LOAD$(_sep)$(_kver) := $(BOARD_$(1)_KERNEL_MODULES$(_sep)$(_kver)))) \
+  $(if $(filter false,$(BOARD_$(1)_KERNEL_MODULES_LOAD$(_sep)$(_kver))),\
+    $(eval BOARD_$(1)_KERNEL_MODULES_LOAD$(_sep)$(_kver) :=),) \
   $(call copy-many-files,$(call build-image-kernel-modules,$(BOARD_$(1)_KERNEL_MODULES$(_sep)$(_kver)),$(2),$(3),$(call intermediates-dir-for,PACKAGING,depmod_$(1)$(_sep)$(_kver)),$(BOARD_$(1)_KERNEL_MODULES_LOAD$(_sep)$(_kver)),$(4),$(BOARD_$(1)_KERNEL_MODULES_ARCHIVE$(_sep)$(_kver)),$(_stripped_staging_dir),$(_kver)))) \
 $(if $(_kver), \
   $(eval _dir := $(_kver)/), \