From 85e14851edd39c3e47fe5e4c303a6fbf61c68e37 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 21 Jan 2022 18:08:36 +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: I9f556178f882dc15cc7066df16dd59e1da86091b
---
 BoardConfig-common.mk |  4 ++--
 vendor_dlkm.blocklist | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 vendor_dlkm.blocklist

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index f775fcc8..1113b588 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -345,11 +345,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/gs101/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 4f7b6fdd..00000000
--- a/vendor_dlkm.blocklist
+++ /dev/null
@@ -1,16 +0,0 @@
-blocklist bcmdhd43752
-blocklist synadhd43752
-blocklist bcmdhd4389
-blocklist cl_dsp
-blocklist drv2624
-blocklist ftm5
-blocklist input-cs40l26-i2c
-blocklist pktgen
-blocklist sec_touch
-blocklist snd-soc-cs35l41-i2c
-blocklist snd-soc-cs35l41-spi
-blocklist st33spi
-blocklist st54spi
-blocklist uwb_desense.ko
-blocklist uwb-hal.ko
-blocklist uwbcore.ko