Merge "Revert^2 "Turn on V3 cow"" into main am: 5f4028b318
Original change: https://android-review.googlesource.com/c/platform/build/+/3031006 Change-Id: I1daa199dd49aa0f7236076a04509d6759c10204a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
94287c6afc
2 changed files with 9 additions and 2 deletions
|
@ -613,6 +613,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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue