p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Fix a mismatching close." am: 395bf274b8 

am: 06bc45b0c2

Change-Id: I5e9a7d4a74e476b1ed86a9f7bc06e515998f81e2
This commit is contained in:
Tao Bao 2018-03-02 23:59:22 +00:00 committed by android-build-merger
parent 501b84236f 06bc45b0c2
commit 6b93ed0c84
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/releasetools/ota_from_target_files.py
View File

@ -1354,8 +1354,8 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
return value
# Stage the output zip package for package signing.
temp_zip_file = tempfile.NamedTemporaryFile()
output_zip = zipfile.ZipFile(temp_zip_file, "w",
staging_file = common.MakeTempFile(suffix='.zip')
output_zip = zipfile.ZipFile(staging_file, "w",
compression=zipfile.ZIP_DEFLATED)
if source_file is not None:
@ -1419,10 +1419,6 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
else:
print("Warning: cannot find care map file in target_file package")
# source_info must be None for full OTAs.
if source_file is None:
assert source_info is None
AddCompatibilityArchiveIfTrebleEnabled(
target_zip, output_zip, target_info, source_info)
@ -1440,8 +1436,7 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
# compute the ZIP entry offsets, write back the final metadata and do the
# final signing.
prelim_signing = common.MakeTempFile(suffix='.zip')
SignOutput(temp_zip_file.name, prelim_signing)
common.ZipClose(temp_zip_file)
SignOutput(staging_file, prelim_signing)
# Open the signed zip. Compute the final metadata that's needed for streaming.
prelim_signing_zip = zipfile.ZipFile(prelim_signing, 'r')