| commit | a20557926b01b9e1f5da29d003cc886a9b676b4b | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Wed Mar 06 01:12:37 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 06 01:12:37 2024 +0000 |
| tree | 1789aedb9666bc0162d2b3879603c1160fb339cb | |
| parent | f9637be72b7ea3ef2b5bd138ca65816ad2018b11 [diff] | |
| parent | 694d3438f99e67eeadd79659712c7fb83f6fa225 [diff] |
Merge "Turn on V3 cow" into main am: c09a15f81f am: 694d3438f9 Original change: https://android-review.googlesource.com/c/platform/build/+/2973761 Change-Id: I841a457ec679c9ebd6d2a53b97901ffe7f6c1a01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/product_config.mk b/core/product_config.mk index 63eedbf..2f1f7fa 100644 --- a/core/product_config.mk +++ b/core/product_config.mk
@@ -642,6 +642,15 @@ 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 af0f7a9..418aaa4 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