From 75b2b721ccbef236d6f7ce4bc08cc004f5c5a2fd Mon Sep 17 00:00:00 2001
From: Bowgo Tsai <bowgotsai@google.com>
Date: Thu, 8 Oct 2020 14:56:17 +0800
Subject: [PATCH] sm8350-common: Including product partition into
 vbmeta_system.img

vbmeta_system.img should include HASHTREE descriptors for system.img,
system_ext.img and product.img, which will be updated in a system-only
OTA manner.

Bug: 170180068
Test: Tree Hugger
Change-Id: Iaf81dc11313826d146adb31d4edfbbd5310c48f6
---
 BoardConfigCommon.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 0423e9a..327dcd4 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -198,7 +198,7 @@ BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 BOARD_AVB_ENABLE := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
-BOARD_AVB_VBMETA_SYSTEM := system system_ext
+BOARD_AVB_VBMETA_SYSTEM := system system_ext product
 BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)