commit eb36c8b31bd8ec12424118d13d2b3a80020d6a1c
author Tianjie Xu <xunchang@google.com> Tue Feb 06 04:48:12 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 06 04:48:12 2018 +0000
tree 7435d7fb1abfd3352024348685a0ff35264c7bcd
parent 50db9b67c89f3a7fddb7357a2f3f1eb4ffb4fa80
parent 2d0cda7150bce3a94c59bb3ef8a24fc6d40f4433

Only find deflates for zip files if puffdiff is enabled am: 395906773e
am: 2d0cda7150

Change-Id: I5d39cec784fb7d012bdb744b3884bfa341dfbd92

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,