StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^2 "Turn on V3 cow"" into main am: 78986f598f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3044532

Change-Id: I4bdfb9fd46645fafc1f6b2b2ecc257fcf7dfe0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng
2024-04-18 17:37:17 +00:00
committed by Automerger Merge Worker
parent d4503ddf8c 78986f598f
commit 2e9b1534f6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/product_config.mk
View File

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

2
target/product/virtual_ab_ota/android_t_baseline.mk
View File

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