diff options
| author | Tao Bao <tbao@google.com> | 2017-02-28 19:15:21 -0800 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2017-02-28 20:20:27 -0800 |
| commit | 9beea2a4a3af907653bca906cda63f2d010e6ab4 (patch) | |
| tree | 5a5d7a018d8446aaa03bd06da985e7ef5aaec696 | |
| parent | 93de77745c0ce911b2e84c73eaa7679386aef091 (diff) | |
| download | build-9beea2a4a3af907653bca906cda63f2d010e6ab4.tar.gz | |
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
| -rw-r--r-- | tools/releasetools/common.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 5a24d5ed52..956f0004ae 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -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"), ' |