aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkilesh Kailash <akailash@google.com>2021-04-30 18:26:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-30 18:26:15 +0000
commit2b10c922562066da2f0db50f24448e8fee1c85d2 (patch)
tree1d330c2d0e3ff865371bd3de6876f67f9e4a7447
parente0c1d5f924a57284630ef09768ff283fb0043e1b (diff)
parent3632df977f9d2c457f5524d847669318058b3fa3 (diff)
downloadupdate_engine-2b10c922562066da2f0db50f24448e8fee1c85d2.tar.gz
Add COW version to the update_metadata.proto am: 3632df977f
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1675042 Change-Id: I67f9d382724a0c9f21fe6f04453ec6f117689d73
-rw-r--r--payload_generator/payload_generation_config.cc2
-rw-r--r--update_metadata.proto4
2 files changed, 6 insertions, 0 deletions
diff --git a/payload_generator/payload_generation_config.cc b/payload_generator/payload_generation_config.cc
index d45de6a6..2cd2ebcc 100644
--- a/payload_generator/payload_generation_config.cc
+++ b/payload_generator/payload_generation_config.cc
@@ -23,6 +23,7 @@
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <brillo/strings/string_utils.h>
+#include <libsnapshot/cow_format.h>
#include "update_engine/common/utils.h"
#include "update_engine/payload_consumer/delta_performer.h"
@@ -185,6 +186,7 @@ bool ImageConfig::LoadDynamicPartitionMetadata(
// We use "gz" compression by default for VABC.
if (metadata->vabc_enabled()) {
metadata->set_vabc_compression_param("gz");
+ metadata->set_cow_version(android::snapshot::kCowVersionManifest);
}
dynamic_partition_metadata = std::move(metadata);
return true;
diff --git a/update_metadata.proto b/update_metadata.proto
index bc9e34ac..93e4e2e1 100644
--- a/update_metadata.proto
+++ b/update_metadata.proto
@@ -359,6 +359,10 @@ message DynamicPartitionMetadata {
// See system/core/fs_mgr/libsnapshot/cow_writer.cpp for available options,
// as this parameter is ultimated forwarded to libsnapshot's CowWriter
optional string vabc_compression_param = 4;
+
+ // COW version used by VABC. The represents the major version in the COW
+ // header
+ optional uint32 cow_version = 5;
}
// Definition has been duplicated from