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

Commit 8ab87941 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Register APKCERTS_FILE on PACKAGES variable for prebuilt_apex" into main am: 57734103 

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



Change-Id: Ia873dfa6e90ab3278f9f4aacba877434a37ded23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45782010 57734103

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ $(APKCERTS_FILE): 
	  $(if $(filter true,$(BUILDING_SYSTEM_EXT_IMAGE)),\

            $(call _apkcerts_write_line,BuildManifestSystemExt,$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,system_ext,$@)))

	# In case value of PACKAGES is empty.

	$(hide) touch $@

	$(hide) touch $@ && sort -u -o $@ $@



$(call declare-0p-target,$(APKCERTS_FILE))

core/prebuilt_internal.mk

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ endif 


LOCAL_CHECKED_MODULE := $(my_prebuilt_src_file)



ifneq (,$(LOCAL_APKCERTS_FILE))

  PACKAGES := $(PACKAGES) $(LOCAL_MODULE)

  PACKAGES.$(LOCAL_MODULE).APKCERTS_FILE := $(LOCAL_APKCERTS_FILE)

endif



ifneq (APPS,$(LOCAL_MODULE_CLASS))

ifdef LOCAL_COMPRESSED_MODULE

$(error $(LOCAL_MODULE) : LOCAL_COMPRESSED_MODULE can only be defined for module class APPS)