Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 723b257b authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Remove PRODUCT_USE_LOGICAL_PARTITIONS." 

am: 8bd7918a

Change-Id: Ie9a77886584e9ccc1ee257878d168e995c71fc5c
parents 46a4349a 8bd7918a

core/product.mk

+0 −1
Original line number Diff line number Diff line
@@ -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 \

core/product_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -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