From bdfa407ffe4c9f997295f3d51f4b21e9d8abbe2e Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 28 Oct 2023 12:06:13 +0100 Subject: [PATCH] rtwo: Replace board flag for building GKI modules Android 14 introduced BOARD_SYSTEM_KERNEL_MODULES and it conflicts with the currently implemented GKI handling setup, so workaround and migrate to SYSTEM_KERNEL_MODULES. Change-Id: I77798268c825a08761c103faaf3a38a9e086dad4 --- BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 219c01b..297801f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -37,7 +37,6 @@ TARGET_KERNEL_CONFIG += \ vendor/ext_config/moto-kalama-rtwo.config # Kernel Modules -BOARD_SYSTEM_KERNEL_MODULES := $(strip $(shell cat $(DEVICE_PATH)/modules.load.system_dlkm)) BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.system_dlkm)) BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load)) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist @@ -45,6 +44,7 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/m BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_boot BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery)) BOOT_KERNEL_MODULES := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery $(DEVICE_PATH)/modules.load.vendor_ramdisk)) +SYSTEM_KERNEL_MODULES := $(strip $(shell cat $(DEVICE_PATH)/modules.load.system_dlkm)) TARGET_KERNEL_EXT_MODULES := \ qcom/opensource/mmrm-driver \