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

Commit c5c0124e authored by Yifan Hong's avatar Yifan Hong
Browse files

logical partitions -> dynamic partitions 

Reflect a name change.

* PRODUCT_USE_LOGICAL_PARTITIONS is deprecated and
will be removed in the future.

* ro.boot.dynamic_partitions is created. ro.boot.logical_partitions
will be removed once all the usage is removed.

Bug: 119286600
Test: builds

Change-Id: I5cb8bb1f5ebcee893fbef3a0f047c32de8773830
parent 757dfe87

core/Makefile

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

endif



ifeq (true,$(PRODUCT_USE_LOGICAL_PARTITIONS))

ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))



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

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

# BOARD_AVB_SYSTEM_DETACHED_VBMETA.



endif # PRODUCT_USE_LOGICAL_PARTITIONS

endif # PRODUCT_USE_DYNAMIC_PARTITIONS



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

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

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -932,13 +932,13 @@ ifndef PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS 
endif

.KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS



ifeq ($(PRODUCT_USE_LOGICAL_PARTITIONS),true)

ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

    requirements := \

        PRODUCT_USE_DYNAMIC_PARTITION_SIZE \

        PRODUCT_BUILD_SUPER_PARTITION \



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

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

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



    requirements :=

core/main.mk

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

endif



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

# TODO(b/119286600): remove ro.logical_partitions

ADDITIONAL_PRODUCT_PROPERTIES += \

    ro.boot.logical_partitions=$(PRODUCT_USE_DYNAMIC_PARTITIONS) \

    ro.boot.dynamic_partitions=$(PRODUCT_USE_DYNAMIC_PARTITIONS) \



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

###

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ _product_var_list := \ 
    PRODUCT_USE_DYNAMIC_PARTITION_SIZE \

    PRODUCT_BUILD_SUPER_PARTITION \

    PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \

    PRODUCT_USE_DYNAMIC_PARTITIONS \



define dump-product

$(info ==== $(1) ====)\

core/product_config.mk

+11 −9
Original line number Diff line number Diff line
@@ -513,20 +513,22 @@ PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := \ 
PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE))



# Logical and Resizable Partitions feature flag.

PRODUCT_USE_LOGICAL_PARTITIONS := \

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

.KATI_READONLY := PRODUCT_USE_LOGICAL_PARTITIONS



# All requirements of PRODUCT_USE_LOGICAL_PARTITIONS falls back to

# PRODUCT_USE_LOGICAL_PARTITIONS if not defined.

# Dynamic partition feature flags.

# 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)))

.KATI_READONLY := PRODUCT_USE_DYNAMIC_PARTITIONS



# All requirements of PRODUCT_USE_DYNAMIC_PARTITIONS falls back to

# PRODUCT_USE_DYNAMIC_PARTITIONS if not defined.

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := $(or \

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

    $(PRODUCT_USE_LOGICAL_PARTITIONS))

    $(PRODUCT_USE_DYNAMIC_PARTITIONS))

.KATI_READONLY := PRODUCT_USE_DYNAMIC_PARTITION_SIZE

PRODUCT_BUILD_SUPER_PARTITION := $(or \

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

    $(PRODUCT_USE_LOGICAL_PARTITIONS))

    $(PRODUCT_USE_DYNAMIC_PARTITIONS))

.KATI_READONLY := PRODUCT_BUILD_SUPER_PARTITION



# List of modules that should be forcefully unmarked from being LOCAL_PRODUCT_MODULE, and hence