Snap for 11648291 from 4b56fcf51e26539030a09e9454898bd6248cd0cd to 24Q3-release
Change-Id: I3dc72a3c86773a4cdf11aa83f62e53a52a56fb22
diff --git a/payload_consumer/block_extent_writer.h b/payload_consumer/block_extent_writer.h
index eeae36d..516c24b 100644
--- a/payload_consumer/block_extent_writer.h
+++ b/payload_consumer/block_extent_writer.h
@@ -49,7 +49,7 @@
bool NextExtent();
[[nodiscard]] size_t ConsumeWithBuffer(const uint8_t* const bytes,
const size_t count);
- // It's a non-owning pointer, because PartitionWriter owns the CowWruter. This
+ // It's a non-owning pointer, because PartitionWriter owns the CowWriter. This
// allows us to use a single instance of CowWriter for all operations applied
// to the same partition.
google::protobuf::RepeatedPtrField<Extent> extents_;
diff --git a/payload_generator/delta_diff_generator.cc b/payload_generator/delta_diff_generator.cc
index ed9bf4e..44d97df 100644
--- a/payload_generator/delta_diff_generator.cc
+++ b/payload_generator/delta_diff_generator.cc
@@ -144,9 +144,8 @@
config_.target.dynamic_partition_metadata->compression_factor());
// 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 * 1.01), 25);
+ cow_info_->cow_size = cow_info_->cow_size * 1.01;
+ 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
diff --git a/payload_generator/payload_generation_config.cc b/payload_generator/payload_generation_config.cc
index 810d0de..470d622 100644
--- a/payload_generator/payload_generation_config.cc
+++ b/payload_generator/payload_generation_config.cc
@@ -214,7 +214,7 @@
metadata->set_vabc_compression_param(compression_method);
std::string cow_version;
if (!store.GetString("virtual_ab_cow_version", &cow_version)) {
- metadata->set_cow_version(android::snapshot::kCowVersionManifest);
+ metadata->set_cow_version(2);
} else {
uint32_t cow_version_num{};
android::base::ParseUint(cow_version, &cow_version_num);