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

Commit 8bf79bb0 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 8bb3306b: am a1f8cdf7: Merge "Allow several system property files" 

* commit '8bb3306b':
  Allow several system property files
parents 0a2c858b 8bb3306b

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 "#" >> $@; \