From 2ddbfee4ca1b4b495c317fc6eb53cd5e5db9ae0c Mon Sep 17 00:00:00 2001
From: Priyanka Advani <padvani@google.com>
Date: Tue, 25 Jun 2024 23:56:32 +0000
Subject: [PATCH] Revert "Move all targets away from non-AB"

This reverts commit 1d20ca9f7228347891c5386073b7e989c6b47846.

Reason for revert: Droidmonitor created revert due to b/349466627. Will be verifying through ABTD before submission.

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

diff --git a/core/Makefile b/core/Makefile
index ee8c6faf0b..cdb8423a9d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6132,6 +6132,12 @@ 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 d3f0493a6c..e184601008 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -923,9 +923,7 @@ endif
 ###########################################
 # Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE.
 TARGET_RECOVERY_UPDATER_LIBS ?=
-ifeq ($(AB_OTA_UPDATER),)
-AB_OTA_UPDATER := true
-endif
+AB_OTA_UPDATER ?=
 .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