Merge "Remove post-install verification" into nyc-dev
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 563ce31..98e3d04 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1335,7 +1335,8 @@
if progress:
script.ShowProgress(progress, 0)
self._WriteUpdate(script, output_zip)
- self._WritePostInstallVerifyScript(script)
+ if OPTIONS.verify:
+ self._WritePostInstallVerifyScript(script)
def WriteStrictVerifyScript(self, script):
"""Verify all the blocks in the care_map, including clobbered blocks.
@@ -1459,7 +1460,8 @@
call = ('block_image_update("{device}", '
'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))
script.AppendExtra(script.WordWrap(call))