Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d211eb9 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Split to multiple bash commands."

parents 7176e801 d9a88d58

core/Makefile

+15 −7
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ package-stats: $(PACKAGE_STATS_FILE) 


# -----------------------------------------------------------------

# 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)

ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug
@@ -254,13 +260,15 @@ $(APKCERTS_FILE): 
	@echo APK certs list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) $(foreach p,$(PACKAGES),\

	$(foreach p,$(PACKAGES),\

	  $(if $(PACKAGES.$(p).EXTERNAL_KEY),\

	    echo 'name="$(p).apk" certificate="EXTERNAL" \

	         private_key=""' >> $@;,\

	    echo 'name="$(p).apk" certificate="$(PACKAGES.$(p).CERTIFICATE)" \

	         private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $@;))

	# In case $(PACKAGES) is empty.

	    $(call _apkcerts_echo_with_newline,\

	      'name="$(p).apk" certificate="EXTERNAL" \

	      private_key=""' >> $@),\

	    $(call _apkcerts_echo_with_newline,\

	      'name="$(p).apk" certificate="$(PACKAGES.$(p).CERTIFICATE)" \

	      private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $@)))

	# In case value of PACKAGES is empty.

	$(hide) touch $@



.PHONY: apkcerts-list