From ae2ce8736fd9024eba7cdbfac64e8e64bb462eca Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Mon, 20 Mar 2023 03:18:58 +0000 Subject: [PATCH 1/2] Revert "disable BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE" This reverts commit 3d63c9d44ec8cd52aa5406ca1d42bab0a65db292. Bug: 267429528 Change-Id: I357d6f89ba91e2c20183e7eef9707c889aefac72 --- BoardConfig-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 716f4384..3bf1ddb8 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -384,7 +384,7 @@ BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR) KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) -# BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist +BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load)) ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD From 0c8c6397c2d6c2a7a192c37e8cf07b0fae6540ca Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Mon, 20 Mar 2023 03:35:11 +0000 Subject: [PATCH 2/2] 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 Change-Id: I912f1a8e0df12e4614c74b870921ca0b47b8383e --- BoardConfig-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 3bf1ddb8..7d29e356 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -384,6 +384,7 @@ BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR) KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) +BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load))