Allow several system property files

TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.

Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
This commit is contained in:
Johan Redestig 2012-04-12 17:00:58 +02:00
parent 4e132ca5e5
commit 674a27ddaf
1 changed files with 8 additions and 3 deletions

View File

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