From a6bcbd8a4a62c648cba211a5789a165b99f18f16 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Thu, 25 Jun 2020 16:06:21 -0700 Subject: [PATCH] Mark android_app_set modules PRESIGNED. Test: m apkcerts-list Bug: 159921591 Bug: 162464887 Merged-In: Ie83a05be0d71280644843eddffdbea6bcb429c74 Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74 --- core/soong_android_app_set.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk index e84371ca6..e0a863256 100644 --- a/core/soong_android_app_set.mk +++ b/core/soong_android_app_set.mk @@ -29,4 +29,17 @@ LOCAL_POST_INSTALL_CMD := unzip -qo -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \ $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD) PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) -SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE) +# android_app_set modules are always presigned +PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED +PACKAGES := $(PACKAGES) $(LOCAL_MODULE) + +ifneq ($(LOCAL_MODULE_STEM),) + PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM) +else + PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE) +endif + +# Set a actual_partition_tag (calculated in base_rules.mk) for the package. +PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag) + +SOONG_ALREADY_CONV += $(LOCAL_MODULE)