From 4023fdfc0428d60c34b68171a746bc693c7a9420 Mon Sep 17 00:00:00 2001 From: Daniel Zheng Date: Tue, 16 Apr 2024 15:46:11 +0000 Subject: [PATCH] Revert^2 "Turn on V3 cow" This reverts commit fa5bfb9d79cec2a9265b03562a48dced79e7781f. Reason for revert: we were running into OTA failures b/333966507. The reason was that OTA compatibility tools on go/absign weren't updated with our v3 compatibility tools (which turns of v3 full OTA for devices launching prior to Android 15). Once we know that go/absign is updated, we can check in this change again Change-Id: I789c24b57754d6ede794d7f9451ee0ca469c2fb4 --- core/product_config.mk | 9 +++++++++ target/product/virtual_ab_ota/android_t_baseline.mk | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/product_config.mk b/core/product_config.mk index 500735e71c..4525423b4f 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -606,6 +606,15 @@ ifneq ($$(filter-out true false,$$(PRODUCT_BUILD_$(1)_IMAGE)),) endif endef +ifndef PRODUCT_VIRTUAL_AB_COW_VERSION + PRODUCT_VIRTUAL_AB_COW_VERSION := 2 + ifdef PRODUCT_SHIPPING_API_LEVEL + ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),34)) + PRODUCT_VIRTUAL_AB_COW_VERSION := 3 + endif + endif +endif + # Copy and check the value of each PRODUCT_BUILD_*_IMAGE variable $(foreach image, \ PVMFW \ diff --git a/target/product/virtual_ab_ota/android_t_baseline.mk b/target/product/virtual_ab_ota/android_t_baseline.mk index af0f7a9371..418aaa4c2d 100644 --- a/target/product/virtual_ab_ota/android_t_baseline.mk +++ b/target/product/virtual_ab_ota/android_t_baseline.mk @@ -20,5 +20,3 @@ # # All U+ launching devices should instead use vabc_features.mk. $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/vabc_features.mk) - -PRODUCT_VIRTUAL_AB_COW_VERSION ?= 2