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

Commit 9c126441 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "lrap_sysprop" 

* changes:
  ro.boot.logical_partitions moved to product image
  Fix collapse-pairs for last empty property
parents 4f85bace af9e7f04

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/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -796,8 +796,8 @@ endef 


define collapse-pairs

$(eval _cpSEP := $(strip $(if $(2),$(2),=)))\

$(subst $(space)$(_cpSEP)$(space),$(_cpSEP),$(strip \

    $(subst $(_cpSEP), $(_cpSEP) ,$(1))))

$(strip $(subst $(space)$(_cpSEP)$(space),$(_cpSEP),$(strip \

    $(subst $(_cpSEP), $(_cpSEP) ,$(1)))$(space)))

endef



###########################################################

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 :=