From 1d20ca9f7228347891c5386073b7e989c6b47846 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Thu, 16 May 2024 10:11:31 -0700
Subject: [PATCH] Move all targets away from non-AB

This sets AB_OTA_UPDATER to true by default. OEMs can still
override this variable in their board config if their device
is still on non-AB.

Since some targets(e.g. art target) do not need updates,
we permit empty AB_OTA_PARTITIONS if AB_OTA_UPDATER is true.

This reverts commit 2a3faafdbf61e09441f7cf4fc59f887a7bc5bc91

Test: th
Bug: 324360816
Change-Id: Ia9e30983ddc7981659d042a177e9edc8abac6a47
---
 core/Makefile        | 6 ------
 core/board_config.mk | 4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index cdb8423a9d..ee8c6faf0b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6132,12 +6132,6 @@ ifeq ($(AB_OTA_UPDATER),true)
     $(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_version
     $(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/system_version
   endif
-
-  # Not checking in board_config.mk, since AB_OTA_PARTITIONS may be updated in Android.mk (e.g. to
-  # additionally include radio or bootloader partitions).
-  ifeq ($(AB_OTA_PARTITIONS),)
-    $(error AB_OTA_PARTITIONS must be defined when using AB_OTA_UPDATER)
-  endif
 endif
 
 ifneq ($(AB_OTA_PARTITIONS),)
diff --git a/core/board_config.mk b/core/board_config.mk
index e184601008..d3f0493a6c 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -923,7 +923,9 @@ endif
 ###########################################
 # Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE.
 TARGET_RECOVERY_UPDATER_LIBS ?=
-AB_OTA_UPDATER ?=
+ifeq ($(AB_OTA_UPDATER),)
+AB_OTA_UPDATER := true
+endif
 .KATI_READONLY := TARGET_RECOVERY_UPDATER_LIBS AB_OTA_UPDATER
 
 # Ensure that if PRODUCT_OTA_FORCE_NON_AB_PACKAGE == true, then AB_OTA_UPDATER must be true