Merge "Revert "Turn on V3 cow"" into main

This commit is contained in:
Daniel Zheng 2024-04-13 06:50:00 +00:00 committed by Gerrit Code Review
commit 28ca2fc0a0
2 changed files with 2 additions and 9 deletions

View file

@ -630,15 +630,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 \

View file

@ -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