commit 06ab519a4b6519a2c42d123acbb6ad77e1c92e61
author Spandan Das <spandandas@google.com> Mon Nov 11 17:18:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 11 17:18:23 2024 +0000
tree a7fd3c55a753dd9c0649f03620d175648d24f1e6
parent c4707d947346a32483f2f3f9d798b577b4647891
parent a4187a14603c1033e4dd0a02144fbe67423a50e9

Merge "Add dlkm related board config vars for soong migration" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 82be1f4..ae0ba56 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -451,6 +451,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))))