commit 1e6cc9fc30f7852dfb06dfbaa897284e23ebd8c1
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jun 27 01:01:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jun 27 01:01:40 2020 +0000
tree ead754b213e95aea15d04a6aab43f7d062833c8f
parent b829269aa1628d24c55c8591fff6a00402ef6504
parent ddae589b95b0ca0e0130fd72a0dc49cc49b3e94d

Merge "Mark android_app_set modules PRESIGNED."

core/soong_android_app_set.mk

diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk
index 5ed9b2c..eb8e5e7 100644
--- a/core/soong_android_app_set.mk
+++ b/core/soong_android_app_set.mk
@@ -31,4 +31,17 @@
 $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
 PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
 
+# 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)