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

Commit aef9309b authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Add support for products overriding properties in /default.prop"

parents c96db7f4 0d23fec7

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop 
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DEFAULT_PROP_TARGET)

ADDITIONAL_DEFAULT_PROPERTIES := \

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

ADDITIONAL_DEFAULT_PROPERTIES += \

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



$(INSTALLED_DEFAULT_PROP_TARGET):

	@echo Target buildinfo: $@

core/product.mk

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

    PRODUCT_BRAND \

    PRODUCT_PROPERTY_OVERRIDES \

    PRODUCT_DEFAULT_PROPERTY_OVERRIDES \

    PRODUCT_CHARACTERISTICS \

    PRODUCT_COPY_FILES \

    PRODUCT_OTA_PUBLIC_KEYS \

core/product_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -274,6 +274,12 @@ PRODUCT_CONTRIBUTORS_FILE := \ 
PRODUCT_PROPERTY_OVERRIDES := \

	$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES))



# A list of property assignments, like "key = value", with zero or more

# whitespace characters on either side of the '='.

# used for adding properties to default.prop

PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \

	$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_PROPERTY_OVERRIDES))



# Should we use the default resources or add any product specific overlays

PRODUCT_PACKAGE_OVERLAYS := \

	$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGE_OVERLAYS))