diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-01 03:09:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-01 03:09:26 +0000 |
| commit | c05d59d8868921312bb4614c54d83c97dad19914 (patch) | |
| tree | b19d2aacd0c03308aa265bea5dfa8307b925a66a | |
| parent | d0de2d1b7d096452786d73d21f75d31a52c7326d (diff) | |
| parent | ed7c2726044e333f5341765f5ebfcd05e475fbdc (diff) | |
Snap for 7328689 from ed7c2726044e333f5341765f5ebfcd05e475fbdc to sc-d1-release
Change-Id: I7070eb7722e5c46b814e51df80150a65668f5509
| -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 |