releasetools: Merge two identical conditional branches.
The merged two branches have become identical since commit
fc3422ad3697b5d83adfb69133f66e1623416b18 (landed into Nougat).
Test: Get identical incremental packages w/ and w/o the CL.
Change-Id: Id1183f8ed83f684a0dac1a4af87b6e075b08aabc
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 5a24d5e..956f000 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1449,14 +1449,7 @@
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"), '