diff options
| author | Ying Wang <wangying@google.com> | 2011-04-06 12:47:39 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-04-06 12:47:39 -0700 |
| commit | 8446e0f6f447cd3bb0baac889d267bcd5a28550e (patch) | |
| tree | e8627b9f9d2fd1cb2a1b93c44a09f52dc6f06a7c | |
| parent | ea1d9c88c240661b482b9223e9a33016a7deaf12 (diff) | |
| download | build-donut.tar.gz | |
Put apkcerts.txt in the dist dir for all builds.donut
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: I39c33c3405644ccda3e67e0adb7dd0589568c95c
| -rw-r--r-- | core/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile index 2c4d133239..8639cba016 100644 --- a/core/Makefile +++ b/core/Makefile @@ -197,11 +197,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 $@ @@ -212,6 +210,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 |