commit acf7138e366b9270f021f9a9a014d1f34473e213
author Jacky Liu <qsliu@google.com> Mon Aug 05 11:59:57 2024 +0800
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Aug 05 05:06:51 2024 +0000
tree 8718a1d5cf108a9034707e4b06b91825a2e7d22a
parent 79cb51273a9c163effe521911b0cb37810dfc5c3

Use modules.load for vendor ramdisk modules

vendor_boot.img is no longer built on 6.1 kernel codebase hence
vendor_boot.modules.load no longer exists. We can use modules.load
instead which is same as vendor_boot.modules.load but always exist.

Flag: EXEMPT build file update
Bug: 343042291
Test: build oriole-zvs1-userdebug
      build oriole-trunk_pixel_kernel_61-userdebug
Change-Id: I7e5028ca4cc710367ddc5b161e006b8e7c25de80

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a5e752d..08b3a73 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -366,7 +366,12 @@
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
 
 # Kernel modules that are listed in vendor_boot.modules.load
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
+# Starting from 6.1, use modules.load instead. It lists modules for vendor ramdisk regardless of the partition name.
+ifneq ($(wildcard $(KERNEL_MODULE_DIR)/modules.load),)
+    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/modules.load))
+else
+    BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
+endif
 ifndef BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE
 $(error vendor_boot.modules.load not found or empty)
 endif