StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6 am: 16db047f9e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314

Change-Id: Iad2f8eda2602f805b897d36173be39c5000e31cc
This commit is contained in:
Tianjie Xu
2020-06-17 00:37:46 +00:00
committed by Automerger Merge Worker
parent be74a37f2c 16db047f9e
commit 89bec0265f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/ota_from_target_files.py
View File

@@ -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)