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

Merge "releasetools: Make scripts pylint clean."

Browse Source 
am: 23a4070483

Change-Id: I4f4b35565f7d154dd47e4b5b8444e76c6c7227c6
This commit is contained in:
Tao Bao
2018-07-23 07:22:59 -07:00
committed by android-build-merger
parent 9295ccaef4 23a4070483
commit 1a3d83d667
6 changed files with 126 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/ota_from_target_files.py
View File

@@ -827,7 +827,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
allow_shared_blocks)
system_tgt.ResetFileMap()
system_diff = common.BlockDifference("system", system_tgt, src=None)
system_diff.WriteScript(script, output_zip)
system_diff.WriteScript(script, output_zip,
write_verify_script=OPTIONS.verify)
boot_img = common.GetBootableImage(
"boot.img", "boot.img", OPTIONS.input_tmp, "BOOT")
@@ -839,7 +840,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
allow_shared_blocks)
vendor_tgt.ResetFileMap()
vendor_diff = common.BlockDifference("vendor", vendor_tgt)
vendor_diff.WriteScript(script, output_zip)
vendor_diff.WriteScript(script, output_zip,
write_verify_script=OPTIONS.verify)
AddCompatibilityArchiveIfTrebleEnabled(input_zip, output_zip, target_info)
@@ -1559,10 +1561,12 @@ else
device_specific.IncrementalOTA_InstallBegin()
system_diff.WriteScript(script, output_zip,
progress=0.8 if vendor_diff else 0.9)
progress=0.8 if vendor_diff else 0.9,
write_verify_script=OPTIONS.verify)
if vendor_diff:
vendor_diff.WriteScript(script, output_zip, progress=0.1)
vendor_diff.WriteScript(script, output_zip, progress=0.1,
write_verify_script=OPTIONS.verify)
if OPTIONS.two_step:
common.ZipWriteStr(output_zip, "boot.img", target_boot.data)