diff options
| author | Amin Hassani <ahassani@chromium.org> | 2017-12-15 17:45:49 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-12-15 22:19:46 -0800 |
| commit | b44f73baa8d302a077ab1c0c73eac63bd02350e5 (patch) | |
| tree | 35b86db22317dd8be45863ee69b722666bb949a2 /scripts/update_payload/checker.py | |
| parent | 717c324c334cc3bac954101f7a127fe8ef56e4e6 (diff) | |
Revert "update_payload: Add XZ compression support"
This reverts commit f1d6ceaedbcf81044d6af6b716c63ed79996f0a4.
Reason for revert: <canaries failing>
Original change's description:
> update_payload: Add XZ compression support
>
> This patch adds support for checking a payload that has REPLACE_XZ
> operations. REPLACE_XZ was added in minor version 3.
>
> BUG=chromium:758792
> TEST=unittests pass; paycheck.py with a xz generated payload pass;
> CQ-DEPEND=CL:823234
>
> Change-Id: If82c767a201b189e464f459d5c19485e5278d9b1
> Reviewed-on: https://chromium-review.googlesource.com/823227
> Commit-Ready: Amin Hassani <ahassani@chromium.org>
> Tested-by: Amin Hassani <ahassani@chromium.org>
> Reviewed-by: Ben Chan <benchan@chromium.org>
> Reviewed-by: Sen Jiang <senj@chromium.org>
TBR=benchan@chromium.org,senj@chromium.org,ahassani@chromium.org
Change-Id: I931ff3be081a41fe5fceef0e049ba4165c6acb49
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:795313
Reviewed-on: https://chromium-review.googlesource.com/830054
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Diffstat (limited to 'scripts/update_payload/checker.py')
| -rw-r--r-- | scripts/update_payload/checker.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/scripts/update_payload/checker.py b/scripts/update_payload/checker.py index 3cf98cae..c710c47b 100644 --- a/scripts/update_payload/checker.py +++ b/scripts/update_payload/checker.py @@ -322,10 +322,6 @@ class PayloadChecker(object): self.new_rootfs_fs_size = 0 self.new_kernel_fs_size = 0 self.minor_version = None - # TODO(*): When fixing crbug.com/794404, the major version should be - # correclty handled in update_payload scripts. So stop forcing - # major_verions=1 here and set it to the correct value. - self.major_version = 1; @staticmethod def _CheckElem(msg, name, report, is_mandatory, is_submsg, convert=str, @@ -705,7 +701,7 @@ class PayloadChecker(object): return total_num_blocks def _CheckReplaceOperation(self, op, data_length, total_dst_blocks, op_name): - """Specific checks for REPLACE/REPLACE_BZ/REPLACE_XZ operations. + """Specific checks for REPLACE/REPLACE_BZ operations. Args: op: The operation object from the manifest. @@ -1002,9 +998,6 @@ class PayloadChecker(object): # Type-specific checks. if op.type in (common.OpType.REPLACE, common.OpType.REPLACE_BZ): self._CheckReplaceOperation(op, data_length, total_dst_blocks, op_name) - elif op.type == common.OpType.REPLACE_XZ and (self.minor_version >= 3 or - self.major_version >= 2): - self._CheckReplaceOperation(op, data_length, total_dst_blocks, op_name) elif op.type == common.OpType.MOVE and self.minor_version == 1: self._CheckMoveOperation(op, data_offset, total_src_blocks, total_dst_blocks, op_name) @@ -1077,7 +1070,6 @@ class PayloadChecker(object): op_counts = { common.OpType.REPLACE: 0, common.OpType.REPLACE_BZ: 0, - common.OpType.REPLACE_XZ: 0, common.OpType.MOVE: 0, common.OpType.ZERO: 0, common.OpType.BSDIFF: 0, @@ -1090,7 +1082,6 @@ class PayloadChecker(object): op_blob_totals = { common.OpType.REPLACE: 0, common.OpType.REPLACE_BZ: 0, - common.OpType.REPLACE_XZ: 0, # MOVE operations don't have blobs. common.OpType.BSDIFF: 0, # SOURCE_COPY operations don't have blobs. |