From a69a26c5b3a1988c83c1d88a0ca73895964628c1 Mon Sep 17 00:00:00 2001
From: Daniel Zheng <zhengdaniel@google.com>
Date: Mon, 8 Apr 2024 17:39:50 +0000
Subject: [PATCH] Revert^2 "Turn on V3 cow"

e59e31cb9d8165c3b88069d5551cb4ccc0802bd9

Change-Id: Ia31a34856c89348c5efb7f9ff5498e1b0ff45134
---
 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