diff options
| author | Akilesh Kailash <akailash@google.com> | 2021-04-30 19:08:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 19:08:04 +0000 |
| commit | ed7c2726044e333f5341765f5ebfcd05e475fbdc (patch) | |
| tree | b19d2aacd0c03308aa265bea5dfa8307b925a66a | |
| parent | 7297ac0b8116ceb8b83c37de2b5f28a9d2d1cc92 (diff) | |
| parent | 41b934b719c33046ce22d5c4fccd601ea76a39e8 (diff) | |
Add COW version to the update_metadata.proto am: 3632df977f am: 2b10c92256 am: 41b934b719
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1675042
Change-Id: I6e9c12ec66295e0a502367c39430b5e0225df50a
| -rw-r--r-- | payload_generator/payload_generation_config.cc | 2 | ||||
| -rw-r--r-- | update_metadata.proto | 4 |
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 |