commit a4187a14603c1033e4dd0a02144fbe67423a50e9
author Spandan Das <spandandas@google.com> Thu Nov 07 20:42:39 2024 +0000
committer Spandan Das <spandandas@google.com> Fri Nov 08 18:15:27 2024 +0000
tree fdd427dd908740326c750de442306b789a655ce7
parent 66e0b243c5aa85bd9d61f349c628bde2b38b92bc

Add dlkm related board config vars for soong migration

This will be used to build system_dlkm.img, vendor_dlkm.img and
odm_dlkm.img with soong. Blocklist files are currently unsupported, but
they will be used in `prebuilt_kernel_modules` in a followup CL.

Bug: 377562851
Bug: 377563262
Test: presbumits
Change-Id: Ie191076a3ccaecb544a0d3f50425764250369667

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index c0641de..2e104e2 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -440,6 +440,14 @@
   # Used to generate _dlkm partitions
   $(call add_json_bool, BuildingSystemDlkmImage,               $(BUILDING_SYSTEM_DLKM_IMAGE))
   $(call add_json_list, SystemKernelModules, $(BOARD_SYSTEM_KERNEL_MODULES))
+  $(call add_json_str, SystemKernelBlocklistFile, $(BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE))
+  $(call add_json_list, SystemKernelLoadModules, $(BOARD_SYSTEM_KERNEL_MODULES_LOAD))
+  $(call add_json_bool, BuildingVendorDlkmImage,               $(BUILDING_VENDOR_DLKM_IMAGE))
+  $(call add_json_list, VendorKernelModules, $(BOARD_VENDOR_KERNEL_MODULES))
+  $(call add_json_str, VendorKernelBlocklistFile, $(BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE))
+  $(call add_json_bool, BuildingOdmDlkmImage,               $(BUILDING_ODM_DLKM_IMAGE))
+  $(call add_json_list, OdmKernelModules, $(BOARD_ODM_KERNEL_MODULES))
+  $(call add_json_str, OdmKernelBlocklistFile, $(BOARD_ODM_KERNEL_MODULES_BLOCKLIST_FILE))
 
   # Used to generate /vendor/build.prop
   $(call add_json_list, BoardInfoFiles, $(if $(TARGET_BOARD_INFO_FILES),$(TARGET_BOARD_INFO_FILES),$(firstword $(TARGET_BOARD_INFO_FILE) $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt))))