From 219c25e9e1eaf35e074646ec697384e17b7fc600 Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Wed, 17 Aug 2022 03:42:08 -0600
Subject: [PATCH] sm7325-common: Adapt to virtual A/B

dubai is virtual A/B where-as berlin is not

Based on the logic from
https://github.com/LineageOS/android_device_xiaomi_sm8250-common

Change-Id: Ibadfd452365c799b290d32fd5afabc046b9f9c41
---
 BoardConfigCommon.mk | 9 ++++++++-
 sm7325.mk            | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index afdca11..4167405 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -139,6 +139,9 @@ DEVICE_MANIFEST_YUPIK_FILES += $(COMMON_PATH)/manifest_yupik.xml
 BOARD_USES_METADATA_PARTITION := true
 
 # Partitions
+ifeq ($(TARGET_IS_VAB),true)
+BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
+endif
 BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
 BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 100663296
@@ -168,9 +171,13 @@ TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 
 # Recovery
+ifeq ($(TARGET_IS_VAB),true)
+BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
+else
 BOARD_USES_RECOVERY_AS_BOOT := true
-BOARD_INCLUDE_DTB_IN_BOOTIMG := true
 BOARD_INCLUDE_RECOVERY_DTBO := true
+endif
+BOARD_INCLUDE_DTB_IN_BOOTIMG := true
 TARGET_NO_RECOVERY := true
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
 TARGET_USERIMAGES_USE_EXT4 := true
diff --git a/sm7325.mk b/sm7325.mk
index ccd633f..b6c6959 100644
--- a/sm7325.mk
+++ b/sm7325.mk
@@ -41,6 +41,11 @@ PRODUCT_PACKAGES += \
     WifiResTarget
 
 # A/B
+ifeq ($(TARGET_IS_VAB),true)
+# Inherit virtual_ab_ota product
+$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
+endif
+
 AB_OTA_POSTINSTALL_CONFIG += \
     RUN_POSTINSTALL_system=true \
     POSTINSTALL_PATH_system=system/bin/otapreopt_script \