From 75d5e40890dba5549c044fe4efb53a89e25fce4e Mon Sep 17 00:00:00 2001
From: Randall Huang <huangrandall@google.com>
Date: Tue, 2 Jul 2019 16:26:43 +0800
Subject: [PATCH] Allow vbmeta_system to be OTA'd

This CL adds vbmeta_system to the list AB_OTA_PARTITIONS.

Bug: 121997362
Bug: 130337990
Bug: 137153285
Test: python $TOP/system/update_engine/scripts/update_device.py
<ota-img.zip>
Signed-off-by: Hridya Valsaraju <hridya@google.com>
Signed-off-by: Randall Huang <huangrandall@google.com>
Signed-off-by: Leo Liou <leoliou@google.com>
Change-Id: I3142c62125addf49d43b67f328969ad55f924aec
---
 BoardConfig-common.mk | 3 ++-
 gpt-utils/gpt-utils.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index eb02cdb7..668db029 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -66,7 +66,8 @@ AB_OTA_PARTITIONS += \
     system \
     vbmeta \
     dtbo \
-    product
+    product \
+    vbmeta_system
 
 # Partitions (listed in the file) to be wiped under recovery.
 TARGET_RECOVERY_WIPE := device/google/redbull/recovery.wipe
diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h
index fccf544a..39e78b51 100644
--- a/gpt-utils/gpt-utils.h
+++ b/gpt-utils/gpt-utils.h
@@ -82,7 +82,8 @@ extern "C" {
 #define PTN_SWAP_LIST                   PTN_XBL, \
             "abl", "aop", "devcfg", \
             "dtbo", "hyp", "keymaster", "qupfw", "tz", \
-            "uefisecapp", "vbmeta", "xbl_config", "featenabler"
+            "uefisecapp", "vbmeta", "vbmeta_system", "xbl_config", \
+            "featenabler"
 
 #define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem", "product"
 #define BOOT_DEV_DIR    "/dev/block/bootdevice/by-name"