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

Commit 7ceac730 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "releasetools: Include descriptor of `vbmeta_system.img` in `vbmeta.img`."

parents 1e0742e2 7106420a

tools/releasetools/add_img_to_target_files.py

+8 −3
Original line number Original line Diff line number Diff line
@@ -405,6 +405,9 @@ def AddVBMeta(output_zip, partitions, name, needed_partitions): 
    needed_partitions: Partitions whose descriptors should be included into the

    needed_partitions: Partitions whose descriptors should be included into the

        generated VBMeta image.

        generated VBMeta image.





  Returns:

    Path to the created image.



  Raises:

  Raises:

    AssertionError: On invalid input args.

    AssertionError: On invalid input args.

  """

  """
@@ -423,7 +426,8 @@ def AddVBMeta(output_zip, partitions, name, needed_partitions): 
  for partition, path in partitions.items():

  for partition, path in partitions.items():

    if partition not in needed_partitions:

    if partition not in needed_partitions:

      continue

      continue

    assert partition in common.AVB_PARTITIONS, \

    assert (partition in common.AVB_PARTITIONS or

            partition.startswith('vbmeta_')), \

        'Unknown partition: {}'.format(partition)

        'Unknown partition: {}'.format(partition)

    assert os.path.exists(path), \

    assert os.path.exists(path), \

        'Failed to find {} for {}'.format(path, partition)

        'Failed to find {} for {}'.format(path, partition)
@@ -458,6 +462,7 @@ def AddVBMeta(output_zip, partitions, name, needed_partitions): 
  assert proc.returncode == 0, \

  assert proc.returncode == 0, \

      "avbtool make_vbmeta_image failed:\n{}".format(stdoutdata)

      "avbtool make_vbmeta_image failed:\n{}".format(stdoutdata)

  img.Write()

  img.Write()

  return img.name









def AddPartitionTable(output_zip):

def AddPartitionTable(output_zip):
@@ -836,7 +841,7 @@ def AddImagesToTargetFiles(filename): 
    vbmeta_system = OPTIONS.info_dict.get("avb_vbmeta_system", "").strip()

    vbmeta_system = OPTIONS.info_dict.get("avb_vbmeta_system", "").strip()

    if vbmeta_system:

    if vbmeta_system:

      banner("vbmeta_system")

      banner("vbmeta_system")

      AddVBMeta(

      partitions["vbmeta_system"] = AddVBMeta(

          output_zip, partitions, "vbmeta_system", vbmeta_system.split())

          output_zip, partitions, "vbmeta_system", vbmeta_system.split())

      vbmeta_partitions = [

      vbmeta_partitions = [

          item for item in vbmeta_partitions

          item for item in vbmeta_partitions
@@ -846,7 +851,7 @@ def AddImagesToTargetFiles(filename): 
    vbmeta_vendor = OPTIONS.info_dict.get("avb_vbmeta_vendor", "").strip()

    vbmeta_vendor = OPTIONS.info_dict.get("avb_vbmeta_vendor", "").strip()

    if vbmeta_vendor:

    if vbmeta_vendor:

      banner("vbmeta_vendor")

      banner("vbmeta_vendor")

      AddVBMeta(

      partitions["vbmeta_vendor"] = AddVBMeta(

          output_zip, partitions, "vbmeta_vendor", vbmeta_vendor.split())

          output_zip, partitions, "vbmeta_vendor", vbmeta_vendor.split())

      vbmeta_partitions = [

      vbmeta_partitions = [

          item for item in vbmeta_partitions

          item for item in vbmeta_partitions