commit 699634b28df01885102ead1e06226bbacee7c58e
author Jaewoong Jung <jungjw@google.com> Wed Aug 12 04:23:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 12 04:23:32 2020 +0000
tree 0c969a8a7a926a219658444e8734994215dc17e3
parent dca1803d9512cc5b0fcf64c1d9f09243e07960b3
parent a6bcbd8a4a62c648cba211a5789a165b99f18f16

Mark android_app_set modules PRESIGNED. am: a6bcbd8a4a

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

Change-Id: If0bcfa77b226d5ba1e1a3883106f5984042e93a9

core/soong_android_app_set.mk

diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk
index e84371c..e0a8632 100644
--- a/core/soong_android_app_set.mk
+++ b/core/soong_android_app_set.mk
@@ -29,4 +29,17 @@
 $(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)