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

Commit fa07bff6 authored by Alexander Mishkovets's avatar Alexander Mishkovets
Browse files

DO NOT MERGE Fix the order of loading OEM properties 

Move the OEM property imports so that they take higher precedence over
product and can still be overridden by factory properties.

Bug: 171304788
Test: manual

Merged-In: I31f0a582a5c1c55a42fb213c8269b7829aa27b52
Change-Id: I6e17440714e3e5b3a94ec6e1d2f166080513e1a0
parent 4ce37703

core/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -420,13 +420,6 @@ $(intermediate_system_build_prop): $(BUILDINFO_SH) $(BUILDINFO_COMMON_SH) $(INTE 
	@echo Target buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo > $@

ifneq ($(PRODUCT_OEM_PROPERTIES),)

	$(hide) echo "#" >> $@; \

	        echo "# PRODUCT_OEM_PROPERTIES" >> $@; \

	        echo "#" >> $@;

	$(hide) $(foreach prop,$(PRODUCT_OEM_PROPERTIES), \

	    echo "import /oem/oem.prop $(prop)" >> $@;)

endif

	$(hide) PRODUCT_BRAND="$(PRODUCT_SYSTEM_BRAND)" \

	        PRODUCT_MANUFACTURER="$(PRODUCT_SYSTEM_MANUFACTURER)" \

	        PRODUCT_MODEL="$(PRODUCT_SYSTEM_MODEL)" \
@@ -605,6 +598,13 @@ $(INSTALLED_PRODUCT_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PR 
	$(hide) $(foreach line,$(FINAL_PRODUCT_PROPERTIES), \

	    echo "$(line)" >> $@;)

	$(hide) $(POST_PROCESS_PROPS) $@

ifneq ($(PRODUCT_OEM_PROPERTIES),)

	$(hide) echo "#" >> $@; \

	        echo "# PRODUCT_OEM_PROPERTIES" >> $@; \

	        echo "#" >> $@;

	$(hide) $(foreach prop,$(PRODUCT_OEM_PROPERTIES), \

	    echo "import /oem/oem.prop $(prop)" >> $@;)

endif



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

# odm build.prop