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

Commit 7462cb69 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support BOARD_SYSTEM_DLKM_SRC build config" am: fa7113c6 am: 6dd3de71 am: 4b9bb421 

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



Change-Id: If07576b897ac968d8dcf0466cf0c44df07a10fa7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc7b3a0a 4b9bb421

core/Makefile

+13 −0
Original line number Diff line number Diff line
@@ -596,6 +596,19 @@ $(foreach kmd,$(BOARD_KERNEL_MODULE_DIRS), \ 
    $(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