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

Commit e1f37ba0 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

Merge commit '55edb20e' into gingerbread

* commit '55edb20e':
  Dist apkcerts.txt for unbundled builds
parents 609fef71 55edb20e

core/Makefile

+7 −0
Original line number Original line Diff line number Diff line
@@ -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