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

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

ro.boot.logical_partitions moved to product image 

Test: m productimage -j && cat $OUT/product/build.prop
Bug: 111909365
Change-Id: I62abd5602f6b2fe7eead9d636ffb7708df23fd02
parent 285083e4

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ INSTALLED_PRODUCT_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT)/build.prop 
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_BUILD_PROP_TARGET)



FINAL_PRODUCT_PROPERTIES += \

    $(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES))

    $(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES) $(ADDITIONAL_PRODUCT_PROPERTIES))

FINAL_PRODUCT_PROPERTIES := $(call uniq-pairs-by-first-component, \

    $(FINAL_PRODUCT_PROPERTIES),=)

core/main.mk

+12 −1
Original line number Diff line number Diff line
@@ -144,6 +144,15 @@ endif 


ADDITIONAL_BUILD_PROPERTIES :=



#

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

# Validate ADDITIONAL_PRODUCT_PROPERTIES.

ifneq ($(ADDITIONAL_PRODUCT_PROPERTIES),)

$(error ADDITIONAL_PRODUCT_PROPERTIES must not be set before here: $(ADDITIONAL_PRODUCT_PROPERTIES))

endif



ADDITIONAL_PRODUCT_PROPERTIES :=



#

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

# Add the product-defined properties to the build properties.
@@ -231,7 +240,7 @@ else 
ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}

endif



ADDITIONAL_BUILD_PROPERTIES += ro.boot.logical_partitions=${USE_LOGICAL_PARTITIONS}

ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=${USE_LOGICAL_PARTITIONS}



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

###
@@ -402,6 +411,8 @@ ADDITIONAL_DEFAULT_PROPERTIES := $(strip $(ADDITIONAL_DEFAULT_PROPERTIES)) 
.KATI_READONLY := ADDITIONAL_DEFAULT_PROPERTIES

ADDITIONAL_BUILD_PROPERTIES := $(strip $(ADDITIONAL_BUILD_PROPERTIES))

.KATI_READONLY := ADDITIONAL_BUILD_PROPERTIES

ADDITIONAL_PRODUCT_PROPERTIES := $(strip $(ADDITIONAL_PRODUCT_PROPERTIES))

.KATI_READONLY := ADDITIONAL_PRODUCT_PROPERTIES



ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)

ENFORCE_RRO_SOURCES :=