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

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

Merge "releasetools: Explicitly pass the SHA-1 of source boot image to... 

Merge "releasetools: Explicitly pass the SHA-1 of source boot image to PatchCheck." am: 50869f20 am: e89e50e4
am: c2992587

Change-Id: I00387271e0961b821b1b42634b9a69138808a2e0
parents 8fe7daef c2992587

tools/releasetools/ota_from_target_files.py

+7 −1
Original line number Diff line number Diff line
@@ -1517,10 +1517,16 @@ else if get_stage("%(bcb_dev)s") != "3/3" then 


      common.ZipWriteStr(output_zip, "patch/boot.img.p", d)



      # TODO(b/110106408): Remove after properly handling the SHA-1 embedded in

      # the filename argument in updater code. Prior to that, explicitly list

      # the SHA-1 of the source image, in case the updater tries to find a

      # matching backup from /cache. Similarly for the call to

      # script.ApplyPatch() below.

      script.PatchCheck("%s:%s:%d:%s:%d:%s" %

                        (boot_type, boot_device,

                         source_boot.size, source_boot.sha1,

                         target_boot.size, target_boot.sha1))

                         target_boot.size, target_boot.sha1),

                        source_boot.sha1)

      size.append(target_boot.size)



  if size: