| commit | f4d1196edca97a666e20d16a334aa67f47bbcf0a | [log] [tgz] |
|---|---|---|
| author | Amin Hassani <ahassani@chromium.org> | Wed Jun 24 12:14:10 2020 -0700 |
| committer | Commit Bot <commit-bot@chromium.org> | Thu Jun 25 17:36:42 2020 +0000 |
| tree | e89f917280382d9945f4fd9a980c22a29646d1ad | |
| parent | 45061b6ddc19b24cf6a934e82391ea4915f143de [diff] |
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>
diff --git a/payload_consumer/payload_constants.cc b/payload_consumer/payload_constants.cc index 908a893..299bcfc 100644 --- a/payload_consumer/payload_constants.cc +++ b/payload_consumer/payload_constants.cc
@@ -64,10 +64,6 @@ 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 e1f700a..7158796 100644 --- a/payload_generator/payload_generation_config.cc +++ b/payload_generator/payload_generation_config.cc
@@ -256,10 +256,6 @@ case InstallOperation::PUFFDIFF: return minor >= kPuffdiffMinorPayloadVersion; - - case InstallOperation::MOVE: - case InstallOperation::BSDIFF: - NOTREACHED(); } return false; }