Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f38 am: 192130b75e

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

Change-Id: I6702eb56ac189329570981b93b10e205960c6e97
This commit is contained in:
Devin Moore 2022-02-14 17:54:23 +00:00 committed by Automerger Merge Worker
commit 605baddf83

View file

@ -498,8 +498,9 @@ class BuildInfo(object):
def GetPartitionBuildProp(self, prop, partition):
"""Returns the inquired build property for the provided partition."""
# Boot image uses ro.[product.]bootimage instead of boot.
prop_partition = "bootimage" if partition == "boot" else partition
# Boot image and init_boot image uses ro.[product.]bootimage instead of boot.
# This comes from the generic ramdisk
prop_partition = "bootimage" if partition == "boot" or partition == "init_boot" else partition
# If provided a partition for this property, only look within that
# partition's build.prop.