tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"

Browse source 
* commit 'd21d1d273b83e701667beeabe0c76fd6888e15fc':
  Check partition hash before resorting to block_image_verify
This commit is contained in:
Sami Tolvanen 2015-04-25 09:32:33 +00:00 committed by Android Git Automerger
commit 497b74d5a2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/releasetools/common.py
View file

@ -1140,10 +1140,13 @@ class BlockDifference(object):
script.Print("Image %s will be patched unconditionally." % (partition,))
else:
if self.version >= 3:
script.AppendExtra(('if block_image_verify("%s", '
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, partition, partition, partition))
'"%s.new.dat", "%s.patch.dat")) then') % (
self.device, self.src.care_map.to_string_raw(),
self.src.TotalSha1(),
self.device, partition, partition, partition))
else:
script.AppendExtra('if range_sha1("%s", "%s") == "%s" then' % (
self.device, self.src.care_map.to_string_raw(),