commit fa7113c6963b214eb9f48e074f31659402c6adfa
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 11 09:25:04 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 11 09:25:04 2023 +0000
tree 5852822ca576f6c2bdf7edbd1d85ecea2b97374a
parent 3743f684e08dd11f2628b3d863635a6238d1eb6c
parent 0dbfd709633639ea83530729ee78a58fd04e44e0

Merge "Support BOARD_SYSTEM_DLKM_SRC build config"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 305488f..f9f0b4a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -596,6 +596,19 @@
     $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-recovery-as-boot-load,$(kmd))),\
     $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,GENERIC_RAMDISK,$(TARGET_RAMDISK_OUT),,modules.load,,$(kmd)))))
 
+ifeq ($(BOARD_SYSTEM_KERNEL_MODULES),)
+ifneq ($(BOARD_SYSTEM_DLKM_SRC),)
+ifneq ($(wildcard $(BOARD_SYSTEM_DLKM_SRC)/*),)
+  SYSTEM_KERNEL_MODULES := $(call find-files-in-subdirs,$(BOARD_SYSTEM_DLKM_SRC),*.ko,.)
+  SRC_SYSTEM_KERNEL_MODULES := $(patsubst %,$(BOARD_SYSTEM_DLKM_SRC)/%,$(SYSTEM_KERNEL_MODULES))
+  DST_SYSTEM_KERNEL_MODULES := $(patsubst %,:$(TARGET_OUT_SYSTEM_DLKM)/%,$(SYSTEM_KERNEL_MODULES))
+  SYSTEM_KERNEL_MODULE_COPY_PAIRS := $(join $(SRC_SYSTEM_KERNEL_MODULES),$(DST_SYSTEM_KERNEL_MODULES))
+  ALL_DEFAULT_INSTALLED_MODULES += $(call copy-many-files,$(SYSTEM_KERNEL_MODULE_COPY_PAIRS))
+endif
+endif
+endif
+
+
 # -----------------------------------------------------------------
 # Cert-to-package mapping.  Used by the post-build signing tools.
 # Use a macro to add newline to each echo command