| commit | 849ac2da81c8b67bf72336470fa428203662a272 | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Wed Apr 03 22:55:04 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 03 22:55:04 2024 +0000 |
| tree | ebe3047888aaef92a6ee6fb895faa34e6905eef5 | |
| parent | 068a2998449ea144949c5a01a02a5ae6984dd39f [diff] | |
| parent | b80e6a656e4eaee88b741d070cf4f5cb53c17153 [diff] |
Merge "Revert "Turn on V3 cow"" into main am: b80e6a656e Original change: https://android-review.googlesource.com/c/platform/build/+/3025086 Change-Id: I6246fe772e287d28bf0a3d50026de985025c78cc 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 988332e..b9952b0 100644 --- a/core/product_config.mk +++ b/core/product_config.mk
@@ -613,15 +613,6 @@ 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 418aaa4..af0f7a9 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