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

Commit 9beea2a4 authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Merge two identical conditional branches. 

The merged two branches have become identical since commit
fc3422ad (landed into Nougat).

Test: Get identical incremental packages w/ and w/o the CL.
Change-Id: Id1183f8ed83f684a0dac1a4af87b6e075b08aabc
parent 93de7774

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"), '