From: Tianjie Xu Date: Fri, 25 Mar 2016 22:01:33 +0000 (-0700) Subject: Remove post-install verification X-Git-Tag: android-x86-7.1-r1~344^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b2deb220335e1059a3c95d8063705f5706604bdb;p=android-x86%2Fbuild.git Remove post-install verification post-install verification calls range_sha1() and checks if the given partition has expected contents. It takes roughly 20 seconds on angler with 2.8G system image. Remove it to speed up OTA update. Also abort the update if block_image_update() fails, as we were relying on post-install verification to capture block_image_update() failures. Bug: 27729678 Change-Id: I8123cd8929295ec26df247acf6bb51df813771d9 --- diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 563ce31a1..98e3d0438 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1335,7 +1335,8 @@ class BlockDifference(object): 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 @@ class BlockDifference(object): 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))