StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 66c28d86: am 042e3b75: am a65eb8c7: Split to multiple bash commands.

Browse Source 
* commit '66c28d86a47ed284492ffbe6a59d30bf201198cd':
  Split to multiple bash commands.
This commit is contained in:
Ying Wang
2014-08-16 00:29:58 +00:00
committed by Android Git Automerger
parent e5862e8a1e 66c28d86a4
commit a5bb9a73cf
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/Makefile
View File

@@ -240,6 +240,12 @@ package-stats: $(PACKAGE_STATS_FILE)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Cert-to-package mapping. Used by the post-build signing tools. # Cert-to-package mapping. Used by the post-build signing tools.
# Use a macro to add newline to each echo command
define _apkcerts_echo_with_newline
$(hide) echo $(1)
endef
name := $(TARGET_PRODUCT) name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug) ifeq ($(TARGET_BUILD_TYPE),debug)
name := $(name)_debug name := $(name)_debug
@@ -254,13 +260,15 @@ $(APKCERTS_FILE):
@echo APK certs list: $@ @echo APK certs list: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@rm -f $@ @rm -f $@
$(hide) $(foreach p,$(PACKAGES),\ $(foreach p,$(PACKAGES),\
$(if $(PACKAGES.$(p).EXTERNAL_KEY),\ $(if $(PACKAGES.$(p).EXTERNAL_KEY),\
echo 'name="$(p).apk" certificate="EXTERNAL" \ $(call _apkcerts_echo_with_newline,\
private_key=""' >> $@;,\ 'name="$(p).apk" certificate="EXTERNAL" \
echo 'name="$(p).apk" certificate="$(PACKAGES.$(p).CERTIFICATE)" \ private_key=""' >> $@),\
private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $@;)) $(call _apkcerts_echo_with_newline,\
# In case $(PACKAGES) is empty. 'name="$(p).apk" certificate="$(PACKAGES.$(p).CERTIFICATE)" \
private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $@)))
# In case value of PACKAGES is empty.
$(hide) touch $@ $(hide) touch $@
.PHONY: apkcerts-list .PHONY: apkcerts-list