commit 663719437a24ebd6b1879c968b9e68ed96b2fc35
author Kelvin Zhang <zhangkelvin@google.com> Tue Feb 02 21:53:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 02 21:53:59 2021 +0000
tree f8cbe815d313c0e147f2ec0c864484096a631f6b
parent 04c183f61678657632af226a44076272e9b3bda1
parent 0a52f1b9a9d99424a63105aa7ae09114f24e56ac

Skip merge sequence and COW computation if VABC disabled am: 0a52f1b9a9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ed8965d36747f0a1b83937a1fde948abe9c4bb9

payload_generator/delta_diff_generator.cc

diff --git a/payload_generator/delta_diff_generator.cc b/payload_generator/delta_diff_generator.cc
index f008d40..74014d9 100644
--- a/payload_generator/delta_diff_generator.cc
+++ b/payload_generator/delta_diff_generator.cc
@@ -106,6 +106,10 @@
     if (!snapshot_enabled || !IsDynamicPartition(new_part_.name)) {
       return;
     }
+    // Skip cow size estimation if VABC isn't enabled
+    if (!config_.target.dynamic_partition_metadata->vabc_enabled()) {
+      return;
+    }
     if (!old_part_.path.empty()) {
       auto generator = MergeSequenceGenerator::Create(*aops_);
       if (!generator || !generator->Generate(cow_merge_sequence_)) {
@@ -127,7 +131,6 @@
     for (const AnnotatedOperation& aop : *aops_) {
       *operations.Add() = aop.op;
     }
-    // TODO(177936022) Skip cow size estimation if VABC isn't enabled
     *cow_size_ = EstimateCowSize(
         source_fd,
         std::move(target_fd),