commit 292bf20140d64dc6a5a232a13bfbec8efcf68cc9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 24 23:25:10 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 24 23:25:10 2024 +0000
tree 44d6f36e6a1130dae50fc0fd7c8bca61387038f3
parent 0bce4ba7e55648a0f554f9027e693b47f13b7d32
parent 4ca162e443707059221388f1801bf59adc3536f3

Snap for 11760402 from 4ca162e443707059221388f1801bf59adc3536f3 to 24Q3-release

Change-Id: I0881c8e50826dfca2be051bb4880d4a506222a94

payload_generator/delta_diff_generator.cc

diff --git a/payload_generator/delta_diff_generator.cc b/payload_generator/delta_diff_generator.cc
index 426efbc..4abff92 100644
--- a/payload_generator/delta_diff_generator.cc
+++ b/payload_generator/delta_diff_generator.cc
@@ -146,7 +146,9 @@
 
     // add a 1% overhead to our estimation
     cow_info_->cow_size = cow_info_->cow_size * 1.01;
-    cow_info_->op_count_max = std::max(int(cow_info_->op_count_max), 25);
+    if (config_.target.dynamic_partition_metadata->cow_version() >= 3) {
+      cow_info_->op_count_max = std::max(int(cow_info_->op_count_max), 25);
+    }
     // ops buffer size == 0 for v2 version of cow format
     LOG(INFO) << "Estimated COW size for partition: " << new_part_.name << " "
               << cow_info_->cow_size