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

Commit 1f2b814d authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Limit apkcerts.txt to installed apps if RELEASE_APKCERTS_INSTALL_ONLY"... 

Merge "Limit apkcerts.txt to installed apps if RELEASE_APKCERTS_INSTALL_ONLY" into main am: fdca9c65 am: 350a4c26

Original change: https://android-review.googlesource.com/c/platform/build/+/3529333



Change-Id: I40eb17f2c1425927a942a43b04dc8bed65b87bc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63d1fde3 350a4c26

core/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -775,7 +775,13 @@ name := $(name)-apkcerts 
intermediates := \

	$(call intermediates-dir-for,PACKAGING,apkcerts)

APKCERTS_FILE := $(intermediates)/$(name).txt

all_apkcerts_files := $(sort $(foreach p,$(PACKAGES),$(PACKAGES.$(p).APKCERTS_FILE)))

ifeq ($(RELEASE_APKCERTS_INSTALL_ONLY), true)

  all_apkcerts_packages := $(filter $(call product-installed-modules,$(INTERNAL_PRODUCT)),$(PACKAGES))

else

  all_apkcerts_packages := $(PACKAGES)

endif

all_apkcerts_files := $(sort $(foreach p,$(all_apkcerts_packages),$(PACKAGES.$(p).APKCERTS_FILE)))



$(APKCERTS_FILE): $(all_apkcerts_files)

# We don't need to really build all the modules.

# TODO: rebuild APKCERTS_FILE if any app change its cert.
@@ -783,7 +789,7 @@ $(APKCERTS_FILE): 
	@echo APK certs list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(foreach p,$(sort $(PACKAGES)),\

	$(foreach p,$(sort $(all_apkcerts_packages)),\

	  $(if $(PACKAGES.$(p).APKCERTS_FILE),\

	    $(call _apkcerts_merge,$(PACKAGES.$(p).APKCERTS_FILE), $@),\

	    $(if $(PACKAGES.$(p).EXTERNAL_KEY),\