commit 2d0cda7150bce3a94c59bb3ef8a24fc6d40f4433
author Tianjie Xu <xunchang@google.com> Tue Feb 06 04:45:13 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 06 04:45:13 2018 +0000
tree b7b073e4b56dce75e8c1526a71e1b7e9637fd354
parent 6085a0e6c2fce9a3db809b8a8033cf06e86c4987
parent 395906773e5150569891840c42e4ce11546afa03

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

Change-Id: I8df22ffff6bfc1129c92c69f0fbab6570e46620b

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,