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

Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3 am: 514e6e4488 

am: 81d1ad1267

Change-Id: Ia106d318e77b954eadcfdcd80e13e85f89e43187
This commit is contained in:
Tao Bao 2017-03-01 18:08:17 +00:00 committed by android-build-merger
parent 8beb26d5cb 81d1ad1267
commit fb8d22de03
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@ -1449,14 +1449,7 @@ class BlockDifference(object):
return
ranges_str = ranges.to_string_raw()
if self.version >= 4:
script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
'block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '
'"%s.new.dat", "%s.patch.dat")) then') % (
self.device, ranges_str, expected_sha1,
self.device, partition, partition, partition))
elif self.version == 3:
if self.version >= 3:
script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
'block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '