diff options
| author | Ying Wang <wangying@android.com> | 2013-07-18 17:00:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-18 17:00:20 +0000 |
| commit | a1f8cdf74bcc35110bd306d633e019a6279fc7fe (patch) | |
| tree | 294003c4c397c69372290f364feda0b3788a0968 | |
| parent | 4e132ca5e5c5048d7a95563eddd9f5ef11346678 (diff) | |
| parent | 674a27ddaf0f0b30f4598f0a265cb39d580b1714 (diff) | |
| download | build-jb-mr1.1-dev-plus-aosp.tar.gz | |
Merge "Allow several system property files"jb-mr1.1-dev-plus-aosp
| -rw-r--r-- | core/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 507a19898c..70598ae513 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 "#" >> $@; \ |