diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-04-25 10:01:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-25 10:01:53 +0000 |
| commit | 3edeb4e97b91810008ca7a733458637f75d1792b (patch) | |
| tree | 1d334115f15457fb7858b6ff44be21133c9aa26f | |
| parent | b126ae9e3a0b192ee49d6eed64cf71d25f51c698 (diff) | |
| parent | 045d817cce8cb1feb0186b537306cabf1a5069cd (diff) | |
| download | build-3edeb4e97b91810008ca7a733458637f75d1792b.zip build-3edeb4e97b91810008ca7a733458637f75d1792b.tar.gz build-3edeb4e97b91810008ca7a733458637f75d1792b.tar.bz2 | |
am 045d817c: am 497b74d5: am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit '045d817cce8cb1feb0186b537306cabf1a5069cd':
Check partition hash before resorting to block_image_verify
| -rw-r--r-- | tools/releasetools/common.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 04fe5b0..d0b9e57 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1147,10 +1147,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(), |