diff options
| author | 2025-03-24 09:52:12 -0700 | |
|---|---|---|
| committer | 2025-03-24 09:52:12 -0700 | |
| commit | 8ab87941b1b9a3fc990cb1986e6245cf0af10a70 (patch) | |
| tree | 8afa36bc8b724225487eff6b175c99a14e3bc238 | |
| parent | 4578201004757ac7b4f1dbf92f2a9845cd5e6492 (diff) | |
| parent | 577341036beabe1cf4dcc479b254b878b8963b8d (diff) | |
Merge "Register APKCERTS_FILE on PACKAGES variable for prebuilt_apex" into main am: 577341036b
Original change: https://android-review.googlesource.com/c/platform/build/+/3552581
Change-Id: Ia873dfa6e90ab3278f9f4aacba877434a37ded23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/prebuilt_internal.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index d922b92c40..1448572d46 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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)) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index d5261f4cfc..5dfc6c1951 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -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) |