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

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

Merge "Remove USE_LOGICAL_PARTITIONS override" 

am: c0213682

Change-Id: I75667dfc3596cda7b8b640540f48964081107eb2
parents 9a7d5258 c0213682

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) 
INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)

endif



ifeq (true,$(USE_LOGICAL_PARTITIONS))

ifeq (true,$(PRODUCT_USE_LOGICAL_PARTITIONS))



ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)

  $(error vboot 1.0 doesn't support logical partition)
@@ -1167,7 +1167,7 @@ endif 
# TODO(b/80195851): Should not define BOARD_AVB_SYSTEM_KEY_PATH without

# BOARD_AVB_SYSTEM_DETACHED_VBMETA.



endif # USE_LOGICAL_PARTITIONS

endif # PRODUCT_USE_LOGICAL_PARTITIONS



# $(1): the path of the output dictionary file

# $(2): a subset of "system vendor cache userdata product product_services oem"

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -948,14 +948,14 @@ ifndef PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS 
endif

.KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS



ifeq ($(USE_LOGICAL_PARTITIONS),true)

ifeq ($(PRODUCT_USE_LOGICAL_PARTITIONS),true)

    requirements := \

        PRODUCT_USE_DYNAMIC_PARTITION_SIZE \

        PRODUCT_BUILD_SUPER_PARTITION \

        PRODUCT_USE_FASTBOOTD \



    $(foreach req,$(requirements),$(if $(filter false,$($(req))),\

        $(error USE_LOGICAL_PARTITIONS requires $(req) to be true)))

        $(error PRODUCT_USE_LOGICAL_PARTITIONS requires $(req) to be true)))



    requirements :=

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ else 
ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}

endif



ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=$(USE_LOGICAL_PARTITIONS)

ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=$(PRODUCT_USE_LOGICAL_PARTITIONS)



# -----------------------------------------------------------------

###

core/product_config.mk

+5 −8
Original line number Diff line number Diff line
@@ -519,21 +519,18 @@ PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := \ 
PRODUCT_USE_LOGICAL_PARTITIONS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_LOGICAL_PARTITIONS))

.KATI_READONLY := PRODUCT_USE_LOGICAL_PARTITIONS

ifndef USE_LOGICAL_PARTITIONS

    USE_LOGICAL_PARTITIONS := $(PRODUCT_USE_LOGICAL_PARTITIONS)

endif



# All requirements of USE_LOGICAL_PARTITIONS falls back to

# USE_LOGICAL_PARTITIONS if not defined.

# All requirements of PRODUCT_USE_LOGICAL_PARTITIONS falls back to

# PRODUCT_USE_LOGICAL_PARTITIONS if not defined.

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := $(or \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_DYNAMIC_PARTITION_SIZE)),\

    $(USE_LOGICAL_PARTITIONS))

    $(PRODUCT_USE_LOGICAL_PARTITIONS))

.KATI_READONLY := PRODUCT_USE_DYNAMIC_PARTITION_SIZE

PRODUCT_BUILD_SUPER_PARTITION := $(or \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_SUPER_PARTITION)),\

    $(USE_LOGICAL_PARTITIONS))

    $(PRODUCT_USE_LOGICAL_PARTITIONS))

.KATI_READONLY := PRODUCT_BUILD_SUPER_PARTITION

PRODUCT_USE_FASTBOOTD := $(or \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\

    $(USE_LOGICAL_PARTITIONS))

    $(PRODUCT_USE_LOGICAL_PARTITIONS))

.KATI_READONLY := PRODUCT_USE_FASTBOOTD