aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSen Jiang2018-01-25 18:48:09 -0600
committerGerrit Code Review2018-01-25 18:48:09 -0600
commit63eb1a444489167429964d55cf59f3217b52efd6 (patch)
treec44c4c92125107f8ea3cbd5691ad3dcd13203aa1
parent80ccac2fffc09ef0b8a1fe43c096788e12359a1d (diff)
parent7191bf0492168a2b488eb3ce52129def996b40ea (diff)
downloadplatform-bootable-recovery-63eb1a444489167429964d55cf59f3217b52efd6.tar.gz
platform-bootable-recovery-63eb1a444489167429964d55cf59f3217b52efd6.tar.xz
platform-bootable-recovery-63eb1a444489167429964d55cf59f3217b52efd6.zip
Merge "Add update_channel field to bootloader_message_ab."
-rw-r--r--bootloader_message/include/bootloader_message/bootloader_message.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h
index 798f3bb8..95c19ae5 100644
--- a/bootloader_message/include/bootloader_message/bootloader_message.h
+++ b/bootloader_message/include/bootloader_message/bootloader_message.h
@@ -103,13 +103,17 @@ static_assert(sizeof(struct bootloader_message) == 2048,
103 * implementations are free to use all 32 bytes and may store private 103 * implementations are free to use all 32 bytes and may store private
104 * data past the first NUL-byte in this field. It is encouraged, but 104 * data past the first NUL-byte in this field. It is encouraged, but
105 * not mandatory, to use 'struct bootloader_control' described below. 105 * not mandatory, to use 'struct bootloader_control' described below.
106 *
107 * The update_channel field is used to store the Omaha update channel
108 * if update_engine is compiled with Omaha support.
106 */ 109 */
107struct bootloader_message_ab { 110struct bootloader_message_ab {
108 struct bootloader_message message; 111 struct bootloader_message message;
109 char slot_suffix[32]; 112 char slot_suffix[32];
113 char update_channel[128];
110 114
111 // Round up the entire struct to 4096-byte. 115 // Round up the entire struct to 4096-byte.
112 char reserved[2016]; 116 char reserved[1888];
113}; 117};
114 118
115/** 119/**