Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0a1afdd authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4 

Original change: https://android-review.googlesource.com/c/platform/build/+/2435770



Change-Id: Ia538767800ec15b648b21ea84c215b28ccfa8ef3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af6394b6 8ffc90d4

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -599,9 +599,9 @@ $(foreach kmd,$(BOARD_KERNEL_MODULE_DIRS), \ 
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