Only write merge sequence if XOR is enabled
Saves a bit of space(2MB)
Test: th
Change-Id: I2d9b4b7a947552c2af469b69345a9aaba04eba87
diff --git a/payload_consumer/vabc_partition_writer.cc b/payload_consumer/vabc_partition_writer.cc
index 1ae82b5..d827fad 100644
--- a/payload_consumer/vabc_partition_writer.cc
+++ b/payload_consumer/vabc_partition_writer.cc
@@ -126,15 +126,19 @@
// ==============================================
if (!partition_update_.merge_operations().empty()) {
- TEST_AND_RETURN_FALSE(WriteMergeSequence(
- partition_update_.merge_operations(), cow_writer_.get()));
+ if (IsXorEnabled()) {
+ LOG(INFO) << "VABC XOR enabled for partition "
+ << partition_update_.partition_name();
+ TEST_AND_RETURN_FALSE(WriteMergeSequence(
+ partition_update_.merge_operations(), cow_writer_.get()));
+ }
}
// TODO(zhangkelvin) Rewrite this in C++20 coroutine once that's available.
// TODO(177104308) Don't write all COPY ops up-front if merge sequence is
// written
- auto converted = ConvertToCowOperations(partition_update_.operations(),
- partition_update_.merge_operations());
+ const auto converted = ConvertToCowOperations(
+ partition_update_.operations(), partition_update_.merge_operations());
if (!converted.empty()) {
// Use source fd directly. Ideally we want to verify all extents used in