Merge "Remove post-install verification"

am: dea8b94

* commit 'dea8b94f98ae14cd5782d4cf628d8cf2736dfd5c':
  Remove post-install verification

Change-Id: I95cb2de223bbb1accbbe8c743d5b360e019bde92
This commit is contained in:
Tianjie Xu
2016-04-13 19:28:00 +00:00
committed by android-build-merger

View File

@@ -1446,6 +1446,7 @@ class BlockDifference(object):
if progress: if progress:
script.ShowProgress(progress, 0) script.ShowProgress(progress, 0)
self._WriteUpdate(script, output_zip) self._WriteUpdate(script, output_zip)
if OPTIONS.verify:
self._WritePostInstallVerifyScript(script) self._WritePostInstallVerifyScript(script)
def WriteStrictVerifyScript(self, script): def WriteStrictVerifyScript(self, script):
@@ -1570,7 +1571,8 @@ class BlockDifference(object):
call = ('block_image_update("{device}", ' call = ('block_image_update("{device}", '
'package_extract_file("{partition}.transfer.list"), ' 'package_extract_file("{partition}.transfer.list"), '
'"{partition}.new.dat", "{partition}.patch.dat");\n'.format( '"{partition}.new.dat", "{partition}.patch.dat") ||\n'
' abort("Failed to update {partition} image.");'.format(
device=self.device, partition=self.partition)) device=self.device, partition=self.partition))
script.AppendExtra(script.WordWrap(call)) script.AppendExtra(script.WordWrap(call))