From bf4d3bf612b8caf14a69a954c0603d247cce347c Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 21 Jan 2022 18:10:00 +0800
Subject: [PATCH] Migrate vendor_dlkm modules.blocklist from android side to
 kernel side

Moving vendor_dlkm.modules.blocklist to the source repo and picking to
/<DEVICE>-kernel, the development experience can be aligned between
Kernel and Android codebase.

Bug: 214017561
Change-Id: Ia9994121309a8a0e5a664b64c51ffb3ad9110747
---
 BoardConfig-common.mk | 4 ++--
 vendor_dlkm.blocklist | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 vendor_dlkm.blocklist

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 58cfbfbd..7e715814 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -344,11 +344,11 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
 # Vendor ramdisk image for kernel development
 BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true
 
-BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := device/google/gs201/vendor_dlkm.blocklist
-
 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_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
 ifndef BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD
 $(error vendor_boot.modules.load not found or empty)
diff --git a/vendor_dlkm.blocklist b/vendor_dlkm.blocklist
deleted file mode 100644
index ea20dc01..00000000
--- a/vendor_dlkm.blocklist
+++ /dev/null
@@ -1,6 +0,0 @@
-blocklist bcmdhd4389
-blocklist sec_touch
-blocklist uwb_desense.ko
-blocklist uwb-hal.ko
-blocklist uwbcore.ko
-blocklist gxp.ko