From e59e31cb9d8165c3b88069d5551cb4ccc0802bd9 Mon Sep 17 00:00:00 2001
From: Daniel Zheng <zhengdaniel@google.com>
Date: Wed, 3 Apr 2024 17:55:13 +0000
Subject: [PATCH] Revert "Turn on V3 cow"

Revert submission 2973761-cow_v3_make

Reason for revert: b/332640740

Reverted changes: /q/submissionid:2973761-cow_v3_make

Change-Id: I61720bcb7c8fd346184efde7027ad46a93698eaa
---
 core/product_config.mk                              | 9 ---------
 target/product/virtual_ab_ota/android_t_baseline.mk | 2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/product_config.mk b/core/product_config.mk
index 4525423b4f..500735e71c 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -606,15 +606,6 @@ 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 418aaa4c2d..af0f7a9371 100644
--- a/target/product/virtual_ab_ota/android_t_baseline.mk
+++ b/target/product/virtual_ab_ota/android_t_baseline.mk
@@ -20,3 +20,5 @@
 #
 # 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