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

Commit 65457248 authored by Koushik Dutta's avatar Koushik Dutta Committed by Steve Kondik
Browse files

add support for overriding build.prop settings. 

Change-Id: Ie4224d608b7bcb0c2087bd77bc954f8f5f9b6495

Conflicts:

	core/Makefile
parent d49e2c59

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

			$(PRODUCT_BUILD_PROP_OVERRIDES) \

	        bash $(BUILDINFO_SH) > $@

	$(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \

	          cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ endef 
#



_product_var_list := \

    PRODUCT_BUILD_PROP_OVERRIDES \

    PRODUCT_NAME \

    PRODUCT_MODEL \

    PRODUCT_LOCALES \

core/product_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -297,6 +297,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \

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



PRODUCT_BUILD_PROP_OVERRIDES := \

	$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_PROP_OVERRIDES))



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

PRODUCT_PACKAGE_OVERLAYS := \

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