commit 395906773e5150569891840c42e4ce11546afa03
author Tianjie Xu <xunchang@google.com> Mon Feb 05 17:45:02 2018 -0800
committer Tianjie Xu <xunchang@google.com> Tue Feb 06 04:37:12 2018 +0000
tree b7b073e4b56dce75e8c1526a71e1b7e9637fd354
parent b379d19c05c5128a7fa45b72dbe74a764d143b98

Only find deflates for zip files if puffdiff is enabled

Because the deflates are useless if we don't do puffdiff.

Bug: 72815313
Test: generate an incremental OTA for walleye 4504078-4585723
Change-Id: I3fdb4cee93f0b046b4dace4e25693d1eda70310d

payload_generator/deflate_utils.cc

diff --git a/payload_generator/deflate_utils.cc b/payload_generator/deflate_utils.cc
index 060acbc..e331142 100644
--- a/payload_generator/deflate_utils.cc
+++ b/payload_generator/deflate_utils.cc
@@ -294,7 +294,7 @@
             file.name, ".zip", base::CompareCase::INSENSITIVE_ASCII) ||
         base::EndsWith(file.name, ".jar", base::CompareCase::INSENSITIVE_ASCII);
 
-    if (is_zip) {
+    if (is_zip && extract_deflates) {
       brillo::Blob data;
       TEST_AND_RETURN_FALSE(
           utils::ReadExtents(part.path,