From c6d819462ef9f2ab4ba10b670015a9b28e64b104 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Mon, 20 Mar 2023 03:35:11 +0000 Subject: [PATCH] Support system_dlkm modules.blocklist from kernel side assign system_dlkm.modules.blocklist to BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE located from kernel prebuilts folder Bug: 267429528 Bug: 322457552 Change-Id: I912f1a8e0df12e4614c74b870921ca0b47b8383e Signed-off-by: Robin Peng --- BoardConfig-common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 8c52a207..4e34ea20 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -381,6 +381,9 @@ BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR) KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) +ifneq ($(wildcard $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist),) +BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist +endif BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist # Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load