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

Commit 0d23fec7 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Add support for products overriding properties in /default.prop 



We need this to allow products to specify the default USB configuration,
and allow the build system to add adb to this configuration
for eng and userdebug builds.

For example:

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
	persist.sys.usb.config=mtp

Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 5b65ee49

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