From c3ac2b42e22777711edb4da6c9f25688d37b9067 Mon Sep 17 00:00:00 2001
From: Stylogey <stylogey@gmail.com>
Date: Sun, 3 May 2020 18:14:16 +0200
Subject: [PATCH] sdm660-common: move A/B stuff to common

Change-Id: I8770ea03a27f96e04daedaf021906842c0bcebce
---
 BoardConfigCommon.mk | 16 ++++++++++++++--
 rootdir/Android.mk   |  2 +-
 sdm660.mk            | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fdbb6a56..b5520be2 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -25,6 +25,18 @@
 # Common Tree Path
 COMMON_PATH := device/xiaomi/sdm660-common
 
+# A/B
+ifeq ($(ENABLE_AB), true)
+AB_OTA_UPDATER := true
+AB_OTA_PARTITIONS ?= \
+    boot \
+    system \
+    vendor
+BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+BOARD_USES_RECOVERY_AS_BOOT := true
+TARGET_NO_RECOVERY := true
+endif
+
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
@@ -163,7 +175,7 @@ BOARD_USES_METADATA_PARTITION := true
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
-ifneq ($(AB_OTA_UPDATER), true)
+ifneq ($(ENABLE_AB), true)
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
@@ -202,7 +214,7 @@ TARGET_USES_QCOM_BSP := false
 # Recovery
 ifneq ($(filter lavender,$(TARGET_DEVICE)),)
 TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_A.qcom
-else ifeq ($(AB_OTA_UPDATER), true)
+else ifeq ($(ENABLE_AB), true)
 TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_AB.qcom
 else
 TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 33f0c6e6..5e6fb233 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -97,7 +97,7 @@ LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
 ifneq ($(filter lavender,$(TARGET_DEVICE)),)
 LOCAL_SRC_FILES    := etc/fstab_A.qcom
-else ifeq ($(AB_OTA_UPDATER), true)
+else ifeq ($(ENABLE_AB), true)
 LOCAL_SRC_FILES    := etc/fstab_AB.qcom
 else
 LOCAL_SRC_FILES    := etc/fstab.qcom
diff --git a/sdm660.mk b/sdm660.mk
index 2b21de01..f08821c9 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -40,6 +40,42 @@ COMMON_PATH := device/xiaomi/sdm660-common
 # Inherit properties
 $(call inherit-product, $(COMMON_PATH)/common_prop.mk)
 
+# A/B
+ifeq ($(ENABLE_AB), true)
+AB_OTA_POSTINSTALL_CONFIG += \
+    RUN_POSTINSTALL_system=true \
+    POSTINSTALL_PATH_system=system/bin/otapreopt_script \
+    FILESYSTEM_TYPE_system=ext4 \
+    POSTINSTALL_OPTIONAL_system=true
+
+PRODUCT_PACKAGES += \
+    otapreopt_script
+
+# Boot control
+PRODUCT_PACKAGES += \
+    android.hardware.boot@1.0-impl \
+    android.hardware.boot@1.0-impl.recovery \
+    android.hardware.boot@1.0-service \
+    bootctrl.sdm660 \
+    bootctrl.sdm660.recovery
+
+# Boot control debug
+PRODUCT_PACKAGES_DEBUG += \
+    bootctl
+
+# Update engine
+PRODUCT_PACKAGES += \
+    update_engine \
+    update_engine_sideload \
+    update_verifier
+
+PRODUCT_HOST_PACKAGES += \
+    brillo_update_payload
+
+PRODUCT_PACKAGES_DEBUG += \
+    update_engine_client
+endif
+
 # Audio
 PRODUCT_PACKAGES += \
     android.hardware.audio@5.0-impl \