| commit | 2fe84323164a95ce83c7936ef8f6c14483f38049 | [log] [tgz] |
|---|---|---|
| author | Amin Hassani <ahassani@chromium.org> | Wed Oct 28 21:43:23 2020 +0000 |
| committer | Commit Bot <commit-bot@chromium.org> | Thu Oct 29 18:43:49 2020 +0000 |
| tree | e4a750f65288f2a48e1c005ce7b873ab731b76da | |
| parent | ed03b44c7f9136d6491d7c238f1ab7b66c12456c [diff] |
Revert "update_engine: Remove case conditions for deprecated operations" This reverts commit f4d1196edca97a666e20d16a334aa67f47bbcf0a. Reason for revert: <Failing in aops/1479157> Original change's description: > update_engine: Remove case conditions for deprecated operations > > MOVE and BSDIFF were related to minor version 1 and major version 1 > which both are deprecated so we should remove these so the builders > don't complain (with warning) about these values. > > BUG=None > TEST=unittests pass > > Change-Id: I7ccc2c18d2dfc8e80b7c5d560988762a4c4cbdc3 > Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2265160 > Tested-by: Amin Hassani <ahassani@chromium.org> > Reviewed-by: Jae Hoon Kim <kimjae@chromium.org> > Commit-Queue: Amin Hassani <ahassani@chromium.org> TBR=ahassani@chromium.org,kimjae@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: None Change-Id: I9de3451f1607301e2b273a815e116754e2fa1e25 Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2506472 Reviewed-by: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Commit-Queue: Amin Hassani <ahassani@chromium.org>
diff --git a/payload_consumer/payload_constants.cc b/payload_consumer/payload_constants.cc index 663ab81..d62a0ec 100644 --- a/payload_consumer/payload_constants.cc +++ b/payload_consumer/payload_constants.cc
@@ -66,6 +66,10 @@ return "PUFFDIFF"; case InstallOperation::BROTLI_BSDIFF: return "BROTLI_BSDIFF"; + + case InstallOperation::BSDIFF: + case InstallOperation::MOVE: + NOTREACHED(); } return "<unknown_op>"; }
diff --git a/payload_generator/payload_generation_config.cc b/payload_generator/payload_generation_config.cc index 7f853d8..ef2f240 100644 --- a/payload_generator/payload_generation_config.cc +++ b/payload_generator/payload_generation_config.cc
@@ -258,6 +258,10 @@ case InstallOperation::PUFFDIFF: return minor >= kPuffdiffMinorPayloadVersion; + + case InstallOperation::MOVE: + case InstallOperation::BSDIFF: + NOTREACHED(); } return false; }