From 7d108c717a06903d0d87a0448bd9ee383a67afd5 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 7 Mar 2023 16:03:21 +0000 Subject: [PATCH] Assign system_dlkm.modules.load to BOARD_SYSTEM_KERNEL_MODULES_LOAD - BOARD_SYSTEM_KERNEL_MODULES_LOAD is for GKI modules - BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD should not contains GKI modules Bug: 267429528 Change-Id: Ib5da01f861a34edec07e2a958f153c876e5cef10 Signed-off-by: Robin Peng --- BoardConfig-common.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index f8da0246..716f4384 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -396,7 +396,13 @@ BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/ven ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD $(error vendor_dlkm.modules.load not found or empty) endif -BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES) +BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_MODULES_LOAD))) + +BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/system_dlkm.modules.load)) +ifndef BOARD_SYSTEM_KERNEL_MODULES_LOAD +$(error system_dlkm.modules.load not found or empty) +endif +BOARD_SYSTEM_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_SYSTEM_KERNEL_MODULES_LOAD))) # Using BUILD_COPY_HEADERS BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true