commit dea8b94f98ae14cd5782d4cf628d8cf2736dfd5c
author Tianjie Xu <xunchang@google.com> Wed Apr 13 19:19:03 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 13 19:19:03 2016 +0000
tree 8449e9a8b7cc3b3bb5f73659840c6016815a43dc
parent f221cbba4255a0ade9a222715bb401c544250939
parent 618a81e818f8d1be611dfcd552220f11558cd088

Merge "Remove post-install verification"

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 62ccc45..e54bbb0 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1446,7 +1446,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.
@@ -1570,7 +1571,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))