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

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

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

Merge commit '33c11ac3'

* commit '33c11ac3':
  Dist apkcerts.txt for unbundled builds
parents c350a668 33c11ac3

core/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -215,7 +215,12 @@ APKCERTS_FILE := $(intermediates)/$(name).txt 
# 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))

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)

endif

	@echo APK certs list: $@

	@mkdir -p $(dir $@)

	@rm -f $@
@@ -229,6 +234,8 @@ $(APKCERTS_FILE): $(all_built_packages) 
.PHONY: apkcerts-list

apkcerts-list: $(APKCERTS_FILE)



$(call dist-for-goals, apps_only, $(APKCERTS_FILE):apkcerts.txt)



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

# module info file

ifdef CREATE_MODULE_INFO_FILE