commit 8ffc90d4e9854854eec07a90b82639c7a896f181
author Kelvin Zhang <zhangkelvin@google.com> Wed Feb 15 18:03:02 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 15 18:03:02 2023 +0000
tree 4a51e0b0da021aef94e4f400aab40c78a4c87f98
parent 249865de526b3551946241f87c3620f4cf749baf
parent 19961b53c4854c325dfb839c69909843703b8f96

Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index f9f0b4a..1130e88 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -599,9 +599,9 @@
 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_MODULES := $(shell find $(BOARD_SYSTEM_DLKM_SRC) -type f)
+  SRC_SYSTEM_KERNEL_MODULES := $(SYSTEM_KERNEL_MODULES)
+  DST_SYSTEM_KERNEL_MODULES := $(patsubst $(BOARD_SYSTEM_DLKM_SRC)/%,:$(TARGET_OUT_SYSTEM_DLKM)/%,$(SRC_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