commit 6ac90059186bab5d375d4574db6b2f5f3b26798f
author Kelvin Zhang <zhangkelvin@google.com> Mon Sep 13 16:43:41 2021 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Sep 14 13:19:08 2021 -0700
tree b97130ec682e8fb5e12a4c4bffe79b72883d82ac
parent b5f09960717c22c84cb555c55020bafb9343a694

Consider .capex files as zip archives

This reduces size of SP2A.210827.001-to-SP2A.210903.001.zip OTA
package from 83MB to 66MB. Which is ~21% improvement.

Tests: th
Bug: 199920825

(cherry picked from commit dc1f258e94b2c2dac1d3468301ebcdc0a2fe147c)

Change-Id: I10fa03401e5920c633c3ce5d6cf737489fecb6de
Merged-In: I10fa03401e5920c633c3ce5d6cf737489fecb6de

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;