Remove deprecated fields from update_metadata protobuf am: 9ae7dc6045
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2056748
Change-Id: I297406b19d6163e2271232acea3bdb5fe065c684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/update_metadata.proto b/update_metadata.proto
index d318a62..3f454ad 100644
--- a/update_metadata.proto
+++ b/update_metadata.proto
@@ -146,25 +146,6 @@
optional bytes hash = 2;
}
-// Describe an image we are based on in a human friendly way.
-// Examples:
-// dev-channel, x86-alex, 1.2.3, mp-v3
-// nplusone-channel, x86-alex, 1.2.4, mp-v3, dev-channel, 1.2.3
-//
-// All fields will be set, if this message is present.
-message ImageInfo {
- optional string board = 1 [deprecated = true];
- optional string key = 2 [deprecated = true];
- optional string channel = 3 [deprecated = true];
- optional string version = 4 [deprecated = true];
-
- // If these values aren't present, they should be assumed to match
- // the equivalent value above. They are normally only different for
- // special image types such as nplusone images.
- optional string build_channel = 5 [deprecated = true];
- optional string build_version = 6 [deprecated = true];
-}
-
message InstallOperation {
enum Type {
REPLACE = 0; // Replace destination extents w/ attached data.
@@ -401,8 +382,7 @@
// Only present in major version = 1. List of install operations for the
// kernel and rootfs partitions. For major version = 2 see the |partitions|
// field.
- repeated InstallOperation install_operations = 1 [deprecated = true];
- repeated InstallOperation kernel_install_operations = 2 [deprecated = true];
+ reserved 1, 2;
// (At time of writing) usually 4096
optional uint32 block_size = 3 [default = 4096];
@@ -415,17 +395,8 @@
optional uint64 signatures_offset = 4;
optional uint64 signatures_size = 5;
- // Only present in major version = 1. Partition metadata used to validate the
- // update. For major version = 2 see the |partitions| field.
- optional PartitionInfo old_kernel_info = 6 [deprecated = true];
- optional PartitionInfo new_kernel_info = 7 [deprecated = true];
- optional PartitionInfo old_rootfs_info = 8 [deprecated = true];
- optional PartitionInfo new_rootfs_info = 9 [deprecated = true];
-
- // old_image_info will only be present for delta images.
- optional ImageInfo old_image_info = 10 [deprecated = true];
-
- optional ImageInfo new_image_info = 11 [deprecated = true];
+ // Fields deprecated in major version 2.
+ reserved 6,7,8,9,10,11;
// The minor version, also referred as "delta version", of the payload.
// Minor version 0 is full payload, everything else is delta payload.