diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-11-20 04:06:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-20 04:06:53 +0000 |
commit | 8bd7918a28a3ca7fcbe60aa303f69db7cffb5568 (patch) | |
tree | 60f6a869ca119f77e7072a1629d86e7ac380431e | |
parent | 614e1e806ebaa0872a23023d992b44098608b86f (diff) | |
parent | 7416b8d1434ef755e7b05a9802d8ec2cc4234462 (diff) | |
download | build-8bd7918a28a3ca7fcbe60aa303f69db7cffb5568.tar.gz |
Merge "Remove PRODUCT_USE_LOGICAL_PARTITIONS."
-rw-r--r-- | core/product.mk | 1 | ||||
-rw-r--r-- | core/product_config.mk | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/core/product.mk b/core/product.mk index 661416cce8..491f9167f0 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 \ diff --git a/core/product_config.mk b/core/product_config.mk index 5a727c40aa..177978c351 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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 |