diff options
| author | Daniel Zheng <zhengdaniel@google.com> | 2024-03-05 23:04:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-05 23:04:46 +0000 |
| commit | c09a15f81f3f71582e3a67a97c63ba7d1464d572 (patch) | |
| tree | d57d87c6d1686af083ba3aca1937c4cc610340d3 | |
| parent | ee09882e544038db9a8f8d3a5920a1c8d3281214 (diff) | |
| parent | 7102baaf65d652857823f63c58c19f7dbb158592 (diff) | |
| download | build-c09a15f81f3f71582e3a67a97c63ba7d1464d572.tar.gz | |
Merge "Turn on V3 cow" into main
| -rw-r--r-- | core/product_config.mk | 9 | ||||
| -rw-r--r-- | target/product/virtual_ab_ota/android_t_baseline.mk | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index 500735e71c..4525423b4f 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -606,6 +606,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 \ diff --git a/target/product/virtual_ab_ota/android_t_baseline.mk b/target/product/virtual_ab_ota/android_t_baseline.mk index af0f7a9371..418aaa4c2d 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 |