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

Commit 0edf9bf0 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f... 

Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f am: 192130b7 am: 605baddf

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

Change-Id: I56b81e196e1f749e7b2a2c41d00c993cd4d8dcc2
parents e4814b89 605baddf

tools/releasetools/common.py

+3 −2
Original line number Diff line number Diff line
@@ -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.