Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21bac8e3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Export vendor ramdisk kernel related variables to Soong" into main am: fafb83af 

Original change: https://android-review.googlesource.com/c/platform/build/+/3377860



Change-Id: I3c889f898bd580a927906feb7d067bb4884736d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 494499f4 fafb83af

core/soong_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -486,6 +486,9 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(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))

  $(call add_json_list, VendorRamdiskKernelModules, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES))

  $(call add_json_str, VendorRamdiskKernelBlocklistFile, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE))

  $(call add_json_list, VendorRamdiskKernelLoadModules, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD))



  # 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))))