From 49b70b67ce491c2bcdd65e5b17c3b4cb3c2d640e Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Thu, 1 Dec 2022 00:55:10 +0000 Subject: [PATCH] system_dlkm: Remove manual module copy Rather than copying GKI modules from source folder pointed by BOARD_SYSTEM_DLKM_SRC; use core build macro BOARD_SYSTEM_KERNEL_MODULES as list of GKI modules to be copied on the system_dlkm partition. This leverages core infrastructre already present for the kernel modules for vendor_dlkm, odm_dlkm, etc. Bug: 232430739 Test: TH Change-Id: Ic53f450eb426dc4ec38fc80b7ceaa625c8ab206b Signed-off-by: Ramji Jiyani --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 8bd6796a26..756304ed74 100644 --- a/core/Makefile +++ b/core/Makefile @@ -547,6 +547,7 @@ $(foreach kmd,$(BOARD_KERNEL_MODULE_DIRS), \ $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,VENDOR,$(if $(filter true,$(BOARD_USES_VENDOR_DLKMIMAGE)),$(TARGET_OUT_VENDOR_DLKM),$(TARGET_OUT_VENDOR)),vendor,modules.load,$(VENDOR_STRIPPED_MODULE_STAGING_DIR),$(kmd))) \ $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-vendor-charger-load,$(kmd))) \ $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,ODM,$(if $(filter true,$(BOARD_USES_ODM_DLKMIMAGE)),$(TARGET_OUT_ODM_DLKM),$(TARGET_OUT_ODM)),odm,modules.load,,$(kmd))) \ + $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,SYSTEM,$(if $(filter true,$(BOARD_USES_SYSTEM_DLKMIMAGE)),$(TARGET_OUT_SYSTEM_DLKM),$(TARGET_OUT_SYSTEM)),system,modules.load,,$(kmd))) \ $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\ $(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))))) @@ -3848,7 +3849,6 @@ $(INSTALLED_FILES_FILE_SYSTEM_DLKM): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES $(INSTALLED_FILES_FILE_SYSTEM_DLKM): $(INTERNAL_SYSTEM_DLKMIMAGE_FILES) $(FILESLIST) $(FILESLIST_UTIL) @echo Installed file list: $@ mkdir -p $(dir $@) - if [ -d "$(BOARD_SYSTEM_DLKM_SRC)" ]; then rsync -rupE $(BOARD_SYSTEM_DLKM_SRC)/ $(TARGET_OUT_SYSTEM_DLKM); fi rm -f $@ $(FILESLIST) $(TARGET_OUT_SYSTEM_DLKM) > $(@:.txt=.json) $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@