From d5ce52e13738ec5cb19e6c2c7d6a2084fbee624e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= <ptosi@google.com>
Date: Wed, 9 Mar 2022 09:16:10 +0000
Subject: [PATCH] Revert^2 "gs101: Add pvmfw to AB_OTA_PARTITIONS"

Now that the necessary SELinux policies are in (ag/16507235), we should
be able to re-apply this change without breaking OTA updates
(b/211070100).

This reverts commit efd5649bb8abf6ad745f1a50536fdc41a2d76ba6.

Bug: 210833963
Test: local OTA update (see bug)
Change-Id: I0fd5f840159e4163adde753f6d339546067b8cf6
(cherry picked from commit e635619443188ecab53e6b4ec8194876506537d0)
---
 BoardConfig-common.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 1b246e13..73eafa2f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -95,6 +95,9 @@ endif
 ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
 AB_OTA_PARTITIONS += vbmeta
 endif
+ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false)
+AB_OTA_PARTITIONS += pvmfw
+endif
 
 # EMULATOR common modules
 BOARD_EMULATOR_COMMON_MODULES := liblight