diff options
| author | 2025-03-24 09:27:48 -0700 | |
|---|---|---|
| committer | 2025-03-24 09:27:48 -0700 | |
| commit | 577341036beabe1cf4dcc479b254b878b8963b8d (patch) | |
| tree | e78241ebcef4dc528238fefc6357d9d54fbfdd52 | |
| parent | 02f11b21ba435d280827d92f16e25ef4b1eded6b (diff) | |
| parent | bc20707a8759d710c999191b1bc1e2951c5af16f (diff) | |
Merge "Register APKCERTS_FILE on PACKAGES variable for prebuilt_apex" into main
| -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 dd79dd2ad8..7b7258dabf 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) |