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

am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo

Browse Source 
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds
This commit is contained in:
Ying Wang
2010-07-29 10:27:45 -07:00
committed by Android Git Automerger
parent 609fef7173 55edb20e24
commit e1f37ba0cf
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/Makefile
View File

@@ -206,7 +206,12 @@ APKCERTS_FILE := $(intermediates)/$(name).txt
# but it should guarantee that the apkcerts file is rebuilt # but it should guarantee that the apkcerts file is rebuilt
# if any packages change which certs they're signed with. # if any packages change which certs they're signed with.
all_built_packages := $(foreach p,$(PACKAGES),$(ALL_MODULES.$(p).BUILT)) all_built_packages := $(foreach p,$(PACKAGES),$(ALL_MODULES.$(p).BUILT))
ifneq ($(TARGET_BUILD_APPS),)
# We don't need to really build all the modules for apps_only build.
$(APKCERTS_FILE):
else
$(APKCERTS_FILE): $(all_built_packages) $(APKCERTS_FILE): $(all_built_packages)
endif
@echo APK certs list: $@ @echo APK certs list: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@rm -f $@ @rm -f $@
@@ -220,6 +225,8 @@ $(APKCERTS_FILE): $(all_built_packages)
.PHONY: apkcerts-list .PHONY: apkcerts-list
apkcerts-list: $(APKCERTS_FILE) apkcerts-list: $(APKCERTS_FILE)
$(call dist-for-goals, apps_only, $(APKCERTS_FILE):apkcerts.txt)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# module info file # module info file
ifdef CREATE_MODULE_INFO_FILE ifdef CREATE_MODULE_INFO_FILE