Merge "Remove PRODUCT_USE_LOGICAL_PARTITIONS." am: 8bd7918a28

am: 723b257b01

Change-Id: I747f033d1c850a4f0f1ef2953bfd38bca197c087
This commit is contained in:
Yifan Hong 2018-11-19 20:27:03 -08:00 committed by android-build-merger
commit 2b255df31c
2 changed files with 0 additions and 3 deletions

View File

@ -203,7 +203,6 @@ _product_var_list := \
PRODUCT_CFI_EXCLUDE_PATHS \
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE \
PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE \
PRODUCT_USE_LOGICAL_PARTITIONS \
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS \
PRODUCT_ARTIFACT_PATH_REQUIREMENT_HINT \
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST \

View File

@ -523,10 +523,8 @@ PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RETROFIT_DYNAMIC_PARTITIONS))
.KATI_READONLY := PRODUCT_RETROFIT_DYNAMIC_PARTITIONS
# TODO(b/119286600): remove PRODUCT_USE_LOGICAL_PARTITIONS
PRODUCT_USE_DYNAMIC_PARTITIONS := $(or \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_DYNAMIC_PARTITIONS)), \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_LOGICAL_PARTITIONS)), \
$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS))
.KATI_READONLY := PRODUCT_USE_DYNAMIC_PARTITIONS