The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/update_engine/+/77d7cbcef1ca1afd36720ec7ec74039b5445101e

commit 77d7cbcef1ca1afd36720ec7ec74039b5445101e
Author: Amin Hassani <ahassani@google.com>
Date: Fri Feb 09 07:41:46 2018

update_engine: Disable puffin in minor version 4

This patch disables puffin for minor version 4, but keeps BROTLI_BSDIFF in the
same minor version.  Also adds puffin for minor version 5, but it does not
enable it.

BUG=b:72815313
BUG= chromium:810184 
TEST=update_engine unittests pass
TEST=update_payload unittests pass
TEST=test_paycheck.sh on two images with minor version 4 pass
TEST=brill_update_payload generate/verify pass

Change-Id: I814fc126d67207501d419cff9c575cd13d877b48
Reviewed-on: https://chromium-review.googlesource.com/907223
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/scripts/update_payload/checker.py
[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/payload_consumer/payload_constants.cc
[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/payload_generator/payload_generation_config.cc
[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/update_metadata.proto
[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/scripts/update_payload/checker_unittest.py
[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/scripts/update_payload/applier.py
[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/scripts/update_payload/common.py
[modify] https://crrev.com/77d7cbcef1ca1afd36720ec7ec74039b5445101e/payload_consumer/payload_constants.h

I would like to cherry-pick two commits back to M65 if possible. Here are the cherry-picked CLs.

- crrev.com/c/914446
- crrev.com/c/916706

These two CLs basically disable puffin for M65. We will enable them again in M66. The changes mostly affect the payload generation code path. Although, it touches the client code too, but nothing that can cause problems.

This bug requires manual review: M65 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: cmasso@(Android), cmasso@(iOS), bhthompson@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/update_engine/+/552d14c1285fff61a3f50faf403af4d3362d5aaf

commit 552d14c1285fff61a3f50faf403af4d3362d5aaf
Author: Amin Hassani <ahassani@google.com>
Date: Tue Feb 13 18:26:00 2018

update_engine: Disable puffin in minor version 4

This patch disables puffin for minor version 4, but keeps BROTLI_BSDIFF in the
same minor version.  Also adds puffin for minor version 5, but it does not
enable it.

BUG=b:72815313
BUG= chromium:810184 
TEST=update_engine unittests pass
TEST=update_payload unittests pass
TEST=test_paycheck.sh on two images with minor version 4 pass
TEST=brill_update_payload generate/verify pass

Change-Id: I814fc126d67207501d419cff9c575cd13d877b48
Previous-Reviewed-on: https://chromium-review.googlesource.com/907223
(cherry picked from commit d0b6ff782652cdd2cb922958f004a079cb2b05bd)

[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/scripts/update_payload/checker.py
[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/payload_consumer/payload_constants.cc
[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/payload_generator/payload_generation_config.cc
[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/update_metadata.proto
[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/scripts/update_payload/checker_unittest.py
[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/scripts/update_payload/applier.py
[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/scripts/update_payload/common.py
[modify] https://crrev.com/552d14c1285fff61a3f50faf403af4d3362d5aaf/payload_consumer/payload_constants.h

The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/update_engine/+/e7f1ac4f4c25c2af535efdb684037fa283098b0f

commit e7f1ac4f4c25c2af535efdb684037fa283098b0f
Author: Amin Hassani <ahassani@google.com>
Date: Wed Mar 07 01:22:41 2018

update_engine: bump minor version to 5

We recently disable puffin in minor version 4 and enabled it in minor version
5. This patch bumps the minor version to 5.

BUG= chromium:810184 
TEST=brillo_update_payload {generate|verify}

Change-Id: I06b92f792fbc05c0acec062f8f3ff5d7305bd0a0
Reviewed-on: https://chromium-review.googlesource.com/917306
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>

[modify] https://crrev.com/e7f1ac4f4c25c2af535efdb684037fa283098b0f/payload_consumer/delta_performer.cc
[modify] https://crrev.com/e7f1ac4f4c25c2af535efdb684037fa283098b0f/update_engine.conf