commit 30921a2965655a8ea8885e46379f9f42e812a1f8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 30 22:27:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 30 22:27:21 2024 +0000
tree cf0225619a5624d13316fb41b620cc28f50d7024
parent d73476f36d5c2a7f80d676518c86ea6555338a5a
parent 1103ca8ff94779502b3d86be20333369f12cb636

Merge "Only move aosp_tv_arm64 to non-AB" into main

products/aosp_tv_arm64.mk

diff --git a/products/aosp_tv_arm64.mk b/products/aosp_tv_arm64.mk
index f6244b5..2b49bfa 100644
--- a/products/aosp_tv_arm64.mk
+++ b/products/aosp_tv_arm64.mk
@@ -81,6 +81,8 @@
 PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false
 PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false
 PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE := false
+AB_OTA_UPDATER := true
+AB_OTA_PARTITIONS ?= system
 endif
 
 PRODUCT_NAME := aosp_tv_arm64

products/atv_generic_system.mk

diff --git a/products/atv_generic_system.mk b/products/atv_generic_system.mk
index 14bf475..cf874ab 100644
--- a/products/atv_generic_system.mk
+++ b/products/atv_generic_system.mk
@@ -29,9 +29,6 @@
     update_engine \
     update_verifier \
 
-AB_OTA_UPDATER := true
-AB_OTA_PARTITIONS ?= system
-
 ifeq ($(PRODUCT_REQUIRES_PAI_STUB),true)
 PRODUCT_PACKAGES += \
 	AtomPlayAutoInstallStub