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

Commit 8ad929c3 authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Fix the read on a closed zipfile" am: b5b25409 am: 916b0cc0 am:... 

Merge "Fix the read on a closed zipfile" am: b5b25409 am: 916b0cc0 am: 31f2d571 am: e9170431 am: 6c4c0799

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

Change-Id: I0940646d279b6f1f60c089aa42a548fccd21ed6a
parents 8b015bd0 6c4c0799

tools/releasetools/ota_from_target_files.py

+10 −3
Original line number Original line Diff line number Diff line
@@ -2012,9 +2012,16 @@ def CalculateRuntimeDevicesAndFingerprints(build_info, boot_variable_values): 
    info_dict = copy.deepcopy(build_info.info_dict)

    info_dict = copy.deepcopy(build_info.info_dict)

    for partition in common.PARTITIONS_WITH_CARE_MAP:

    for partition in common.PARTITIONS_WITH_CARE_MAP:

      partition_prop_key = "{}.build.prop".format(partition)

      partition_prop_key = "{}.build.prop".format(partition)

      old_props = info_dict[partition_prop_key]

      input_file = info_dict[partition_prop_key].input_file

      info_dict[partition_prop_key] = common.PartitionBuildProps.FromInputFile(

      if isinstance(input_file, zipfile.ZipFile):

          old_props.input_file, partition, placeholder_values)

        with zipfile.ZipFile(input_file.filename) as input_zip:

          info_dict[partition_prop_key] = \

              common.PartitionBuildProps.FromInputFile(input_zip, partition,

                                                       placeholder_values)

      else:

        info_dict[partition_prop_key] = \

            common.PartitionBuildProps.FromInputFile(input_file, partition,

                                                     placeholder_values)

    info_dict["build.prop"] = info_dict["system.build.prop"]

    info_dict["build.prop"] = info_dict["system.build.prop"]





    new_build_info = common.BuildInfo(info_dict, build_info.oem_dicts)

    new_build_info = common.BuildInfo(info_dict, build_info.oem_dicts)