tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am a1f8cdf7: Merge "Allow several system property files"

Browse source 
* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
  Allow several system property files
This commit is contained in:
Ying Wang 2013-07-18 10:02:45 -07:00 committed by Android Git Automerger
commit 8bb3306b76
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/Makefile
View file

@ -190,9 +190,14 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(
TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \
TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \
bash $(BUILDINFO_SH) > $@ bash $(BUILDINFO_SH) > $@
$(hide) if [ -f "$(system_prop_file)" ]; then \ $(hide) $(foreach file,$(system_prop_file), \
cat $(system_prop_file) >> $@; \ if [ -f "$(file)" ]; then \
fi echo "#" >> $@; \
echo Target buildinfo from: "$(file)"; \
echo "# from $(file)" >> $@; \
echo "#" >> $@; \
cat $(file) >> $@; \
fi;)
$(if $(ADDITIONAL_BUILD_PROPERTIES), \ $(if $(ADDITIONAL_BUILD_PROPERTIES), \
$(hide) echo >> $@; \ $(hide) echo >> $@; \
echo "#" >> $@; \ echo "#" >> $@; \