commit 67dd5dc622b295f35250c6ea32d24f2e1607abc2
author Kelvin Zhang <zhangkelvin@google.com> Tue Sep 14 22:14:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 14 22:14:09 2021 +0000
tree b97130ec682e8fb5e12a4c4bffe79b72883d82ac
parent 2279c1f5e2443f5b19750ede7de33da63e703dd2
parent 6ac90059186bab5d375d4574db6b2f5f3b26798f

Consider .capex files as zip archives am: 6ac9005918

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/update_engine/+/15829227

Change-Id: I2cb2849e061453ce1fed2c1cbbf92b52aad441be

payload_generator/deflate_utils.cc

diff --git a/payload_generator/deflate_utils.cc b/payload_generator/deflate_utils.cc
index c874bfd..68d44d7 100644
--- a/payload_generator/deflate_utils.cc
+++ b/payload_generator/deflate_utils.cc
@@ -312,7 +312,7 @@
       // .zvoice files may eventually move out of rootfs. If that happens,
       // remove ".zvoice" (crbug.com/782918).
       bool is_zip = IsFileExtensions(
-          file.name, {".apk", ".zip", ".jar", ".zvoice", ".apex"});
+          file.name, {".apk", ".zip", ".jar", ".zvoice", ".apex", "capex"});
       bool is_gzip = IsFileExtensions(file.name, {".gz", ".gzip", ".tgz"});
       if (is_zip || is_gzip) {
         brillo::Blob data;