diff options
| author | Chirayu Desai <chirayudesai1@gmail.com> | 2012-11-01 18:16:46 +0530 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-17 17:59:48 +0000 |
| commit | 1f07612844fd112f9ac4f54bfbfbbfa68a3d20d0 (patch) | |
| tree | 10a5983d463008bbb398c2d1b2ce63c68a14c183 /core | |
| parent | 72ce6bd8bdb40efdbc64e03a743b0d8e8552e7a6 (diff) | |
| download | build-1f07612844fd112f9ac4f54bfbfbbfa68a3d20d0.zip build-1f07612844fd112f9ac4f54bfbfbbfa68a3d20d0.tar.gz build-1f07612844fd112f9ac4f54bfbfbbfa68a3d20d0.tar.bz2 | |
Revert "build: Use newline at the end of echo to apkcerts file"
This reverts commit 99430f74c8b2344fbcb96b2db51893ecb65b7c1f.
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index ff2424b..6738755 100644 --- a/core/Makefile +++ b/core/Makefile @@ -251,11 +251,6 @@ $(PACKAGE_STATS_FILE): $(PACKAGES_TO_STAT) .PHONY: package-stats package-stats: $(PACKAGE_STATS_FILE) -# makefile workaround to allow the insert of a newline -define \n - - -endef # ----------------------------------------------------------------- # Cert-to-package mapping. Used by the post-build signing tools. name := $(TARGET_PRODUCT) @@ -272,12 +267,12 @@ $(APKCERTS_FILE): @echo APK certs list: $@ @mkdir -p $(dir $@) @rm -f $@ - $(hide) $(foreach p,$(PACKAGES),\ + $(hide) cd $(dir $@) && $(foreach p,$(PACKAGES),\ $(if $(PACKAGES.$(p).EXTERNAL_KEY),\ echo 'name="$(p).apk" certificate="EXTERNAL" \ - private_key=""' >> $@;${\n},\ + private_key=""' >> $(notdir $@);,\ echo 'name="$(p).apk" certificate="$(PACKAGES.$(p).CERTIFICATE)" \ - private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $@;${\n})) + private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $(notdir $@);)) # In case $(PACKAGES) is empty. $(hide) touch $@ |