From 2f9c7c719f4914e1a3b9b17b0a96990855d761cb Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 6 Apr 2011 12:47:39 -0700 Subject: Put apkcerts.txt in the dist dir for all builds. Even with "make MyApp dist" you can get the apkcerts.txt in your dist dir with this change. The file is needed to verify the signature of apps. Change-Id: I068b3e21b3d55c0a07c87387684c77eee28b67f3 --- core/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/Makefile b/core/Makefile index 21dc2e8585..f375cedf17 100644 --- a/core/Makefile +++ b/core/Makefile @@ -199,11 +199,9 @@ name := $(name)-apkcerts-$(FILE_NAME_TAG) intermediates := \ $(call intermediates-dir-for,PACKAGING,apkcerts) APKCERTS_FILE := $(intermediates)/$(name).txt -# Depending on the built packages isn't exactly right, -# but it should guarantee that the apkcerts file is rebuilt -# if any packages change which certs they're signed with. -all_built_packages := $(foreach p,$(PACKAGES),$(ALL_MODULES.$(p).BUILT)) -$(APKCERTS_FILE): $(all_built_packages) +# We don't need to really build all the modules. +# TODO: rebuild APKCERTS_FILE if any app change its cert. +$(APKCERTS_FILE): @echo APK certs list: $@ @mkdir -p $(dir $@) @rm -f $@ @@ -214,6 +212,9 @@ $(APKCERTS_FILE): $(all_built_packages) .PHONY: apkcerts-list apkcerts-list: $(APKCERTS_FILE) +# put the apckcerts.txt in the dist dir +$(call dist-for-goals, dist, $(APKCERTS_FILE):apkcerts.txt) + # ----------------------------------------------------------------- # module info file ifdef CREATE_MODULE_INFO_FILE -- cgit v1.2.3