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

Commit a1f8cdf7 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Allow several system property files"

parents 4e132ca5 674a27dd

core/Makefile

+8 −3
Original line number Diff line number Diff line
@@ -190,9 +190,14 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

	        bash $(BUILDINFO_SH) > $@

	$(hide) if [ -f "$(system_prop_file)" ]; then \

	          cat $(system_prop_file) >> $@; \

	        fi

	$(hide) $(foreach file,$(system_prop_file), \

		if [ -f "$(file)" ]; then \

			echo "#" >> $@; \

			echo Target buildinfo from: "$(file)"; \

			echo "# from $(file)" >> $@; \

			echo "#" >> $@; \

			cat $(file) >> $@; \

		fi;)

	$(if $(ADDITIONAL_BUILD_PROPERTIES), \

		$(hide) echo >> $@; \

		        echo "#" >> $@; \