delta_generator: Use REPLACE_XZ in deltas when allowed.
This patch moves the generation of the best allowed full operation to a
new function which now includes ZERO, REPLACE, REPLACE_BZ and REPLACE_XZ
when allowed. This function is used to produce a full operation
whenever it is needed in the "full" payload generator and the AB "delta"
payload generator.
Bug: 24578399
TEST=brillo_update_payload generated REPLACE_XZ operations for a delta payload that was using REPLACE_BZ operations and merged them.
TEST=brillo_update_payload generated a full payload with REPLACE, REPLACE_BZ and REPLACE_XZ operations.
TEST=Updated unittests.
Change-Id: I29618094a84ef8050f8dd7ede0fd70056dc9d650
diff --git a/payload_generator/annotated_operation.h b/payload_generator/annotated_operation.h
index 4076070..653bab0 100644
--- a/payload_generator/annotated_operation.h
+++ b/payload_generator/annotated_operation.h
@@ -35,10 +35,10 @@
// The InstallOperation, as defined by the protobuf.
InstallOperation op;
- // Writes |blob| to the end of |data_fd|, and updates |data_file_size| to
- // match the new size of |data_fd|. It sets the data_offset and data_length
- // in AnnotatedOperation to match the offset and size of |blob| in |data_fd|.
- bool SetOperationBlob(brillo::Blob* blob, BlobFileWriter* blob_file);
+ // Writes |blob| to the end of |blob_file|. It sets the data_offset and
+ // data_length in AnnotatedOperation to match the offset and size of |blob|
+ // in |blob_file|.
+ bool SetOperationBlob(const brillo::Blob& blob, BlobFileWriter* blob_file);
};
// For logging purposes.
