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

Commit e99ec5be authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Export BOARD_VENDOR_RAMDISK_KERNEL_MODULES_OPTIONS_FILE to Soong" into...

Merge "Export BOARD_VENDOR_RAMDISK_KERNEL_MODULES_OPTIONS_FILE to Soong" into main am: b3118a1d am: bbcef280

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



Change-Id: I1ffdcc63464f00e263d5aad78511b5f52aafc348
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99a1add4 bbcef280
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse)
  $(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))
  $(call add_json_str, VendorRamdiskKernelOptionsFile, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_OPTIONS_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))))