From 892b51ab7d25af6c50e8bb1cd616d6cde975bf10 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 30 Apr 2024 09:28:39 -0700 Subject: [PATCH] Move aosp_x86_64 away from non-AB non-AB is deprecated, move GSI targets to AB updates Test: th Bug: 334489639 Change-Id: I96e398c43f594cdc4ac6e20cf9444cb67a80eee3 --- target/product/aosp_arm64.mk | 3 ++- target/product/aosp_x86_64.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index d9446153c4..364fed4efc 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -55,7 +55,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # All components inherited here go to vendor or vendor_boot image # $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS ?= system # # Special settings for GSI releasing diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 4344f50cae..595940d9d1 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -57,7 +57,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # All components inherited here go to vendor image # $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS ?= system # # Special settings for GSI releasing