Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21362f02 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: Abort the update on apply_patch failures." am: 2a23c0c8 

am: d77af53f

* commit 'd77af53f':
  releasetools: Abort the update on apply_patch failures.
parents 4c6b66e6 d77af53f

tools/releasetools/edify_generator.py

+2 −2
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ class EdifyGenerator(object): 
    cmd = ['apply_patch("%s",\0"%s",\0%s,\0%d'

           % (srcfile, tgtfile, tgtsha1, tgtsize)]

    for i in range(0, len(patchpairs), 2):

      cmd.append(',\0%s, package_extract_file("%s")' % patchpairs[i:i+2])

    cmd.append(');')

      cmd.append(',\0%s,\0package_extract_file("%s")' % patchpairs[i:i+2])

    cmd.append(') ||\n    abort("Failed to apply patch to %s");' % (srcfile,))

    cmd = "".join(cmd)

    self.script.append(self.WordWrap(cmd))