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

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

Merge "releasetools: Merge two identical conditional branches." 

am: 59978ab6

Change-Id: I7a5c85ebff5e3ee4ecf3209b3a016daa1ddb14a9
parents 425bbada 59978ab6

tools/releasetools/common.py

+1 −8
Original line number Diff line number Diff line
@@ -1449,14 +1449,7 @@ class BlockDifference(object): 
        return



      ranges_str = ranges.to_string_raw()

      if self.version >= 4:

        script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '

                            'block_image_verify("%s", '

                            'package_extract_file("%s.transfer.list"), '

                            '"%s.new.dat", "%s.patch.dat")) then') % (

                            self.device, ranges_str, expected_sha1,

                            self.device, partition, partition, partition))

      elif self.version == 3:

      if self.version >= 3:

        script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '

                            'block_image_verify("%s", '

                            'package_extract_file("%s.transfer.list"), '