From 0c19abc894fdf57d2aa42fd3a1f74fe567703130 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Fri, 25 Mar 2022 20:58:27 +0100
Subject: [PATCH] berlin: Replace AndroidBoard.mk modules copy with
 BOOT_KERNEL_MODULES

Hacky copy rules were prone to fail because of some kind of race
condition.

Change-Id: I30d50a9dd87de9d57a583968f9936b84ac16cfca
---
 AndroidBoard.mk       | 35 -----------------------------------
 BoardConfig.mk        |  4 ++++
 modules.load.recovery |  7 +++++++
 3 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 AndroidBoard.mk
 create mode 100644 modules.load.recovery

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
deleted file mode 100644
index 4e6ba20..0000000
--- a/AndroidBoard.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2017-2021 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
-recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio
-
-RECOVERY_KMOD_TARGETS := \
-    exfat.ko \
-    mmi_annotate.ko \
-    mmi_info.ko \
-    mmi_relay.ko \
-    sensors_class.ko \
-    stmicro_mmi.ko \
-    touchscreen_mmi.ko
-
-INSTALLED_RECOVERY_KMOD_TARGETS := $(RECOVERY_KMOD_TARGETS:%=$(TARGET_RECOVERY_ROOT_OUT)/lib/modules/%)
-$(INSTALLED_RECOVERY_KMOD_TARGETS): $(INSTALLED_KERNEL_TARGET)
-	echo -e ${CL_GRN}"Copying kernel modules to recovery"${CL_RST}
-	@mkdir -p $(dir $@)
-	cp $(@F:%=$(TARGET_OUT_VENDOR)/lib/modules/%) $(TARGET_RECOVERY_ROOT_OUT)/lib/modules/
-
-$(recovery_uncompressed_ramdisk): $(INSTALLED_RECOVERY_KMOD_TARGETS)
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 49bd2c7..3bf802f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,6 +31,10 @@ DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 # Kernel
 TARGET_KERNEL_CONFIG += vendor/lineage_berlin.config
 
+# Kernel Modules
+BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery))
+BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)
+
 # Partitions
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 102247673856
 ifneq ($(WITH_GMS),true)
diff --git a/modules.load.recovery b/modules.load.recovery
new file mode 100644
index 0000000..2d76c67
--- /dev/null
+++ b/modules.load.recovery
@@ -0,0 +1,7 @@
+msm_drm.ko
+mmi_relay.ko
+sensors_class.ko
+touchscreen_mmi.ko
+mmi_annotate.ko
+mmi_info.ko
+stmicro_mmi.ko