commit d632cd16240757d2354adc1e2600aedbda290e1d
author Kelvin Zhang <zhangkelvin@google.com> Fri Feb 11 04:45:40 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 11 04:45:40 2022 +0000
tree bd5383fdbdb6fb0dfa9a17f5537443368168c47d
parent 4e3962e108fde56d31c3757a8c5385aa0588d23d
parent 363380aa336023b0ca634948e5b55504e312c9e9

Parse VABC compression method from input target_files am: 363380aa33

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

Change-Id: I870a2404d5b442729d92376d269fd3063d0ac618

payload_generator/payload_generation_config.cc

diff --git a/payload_generator/payload_generation_config.cc b/payload_generator/payload_generation_config.cc
index 7971f28..d520123 100644
--- a/payload_generator/payload_generation_config.cc
+++ b/payload_generator/payload_generation_config.cc
@@ -194,7 +194,15 @@
   }
   // We use "gz" compression by default for VABC.
   if (metadata->vabc_enabled()) {
-    metadata->set_vabc_compression_param("gz");
+    std::string compression_method;
+    if (store.GetString("virtual_ab_compression_method", &compression_method)) {
+      LOG(INFO) << "Using VABC compression method '" << compression_method
+                << "'";
+    } else {
+      LOG(INFO) << "No VABC compression method specified. Defaulting to 'gz'";
+      compression_method = "gz";
+    }
+    metadata->set_vabc_compression_param(compression_method);
     metadata->set_cow_version(android::snapshot::kCowVersionManifest);
   }
   dynamic_partition_metadata = std::move(metadata);