Merge "Remove PRODUCT_USE_FASTBOOTD flag."
This commit is contained in:
commit
d5eb793c40
3 changed files with 0 additions and 6 deletions
|
@ -958,7 +958,6 @@ ifeq ($(PRODUCT_USE_LOGICAL_PARTITIONS),true)
|
||||||
requirements := \
|
requirements := \
|
||||||
PRODUCT_USE_DYNAMIC_PARTITION_SIZE \
|
PRODUCT_USE_DYNAMIC_PARTITION_SIZE \
|
||||||
PRODUCT_BUILD_SUPER_PARTITION \
|
PRODUCT_BUILD_SUPER_PARTITION \
|
||||||
PRODUCT_USE_FASTBOOTD \
|
|
||||||
|
|
||||||
$(foreach req,$(requirements),$(if $(filter false,$($(req))),\
|
$(foreach req,$(requirements),$(if $(filter false,$($(req))),\
|
||||||
$(error PRODUCT_USE_LOGICAL_PARTITIONS requires $(req) to be true)))
|
$(error PRODUCT_USE_LOGICAL_PARTITIONS requires $(req) to be true)))
|
||||||
|
|
|
@ -208,7 +208,6 @@ _product_var_list := \
|
||||||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST \
|
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST \
|
||||||
PRODUCT_USE_DYNAMIC_PARTITION_SIZE \
|
PRODUCT_USE_DYNAMIC_PARTITION_SIZE \
|
||||||
PRODUCT_BUILD_SUPER_PARTITION \
|
PRODUCT_BUILD_SUPER_PARTITION \
|
||||||
PRODUCT_USE_FASTBOOTD \
|
|
||||||
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \
|
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \
|
||||||
|
|
||||||
define dump-product
|
define dump-product
|
||||||
|
|
|
@ -525,10 +525,6 @@ PRODUCT_BUILD_SUPER_PARTITION := $(or \
|
||||||
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_SUPER_PARTITION)),\
|
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_SUPER_PARTITION)),\
|
||||||
$(PRODUCT_USE_LOGICAL_PARTITIONS))
|
$(PRODUCT_USE_LOGICAL_PARTITIONS))
|
||||||
.KATI_READONLY := PRODUCT_BUILD_SUPER_PARTITION
|
.KATI_READONLY := PRODUCT_BUILD_SUPER_PARTITION
|
||||||
PRODUCT_USE_FASTBOOTD := $(or \
|
|
||||||
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\
|
|
||||||
$(PRODUCT_USE_LOGICAL_PARTITIONS))
|
|
||||||
.KATI_READONLY := PRODUCT_USE_FASTBOOTD
|
|
||||||
|
|
||||||
# List of modules that should be forcefully unmarked from being LOCAL_PRODUCT_MODULE, and hence
|
# List of modules that should be forcefully unmarked from being LOCAL_PRODUCT_MODULE, and hence
|
||||||
# installed on /system directory by default.
|
# installed on /system directory by default.
|
||||||
|
|
Loading…
Reference in a new issue