commit aec36405609c2f8aaed3675551ce5d3004fd5b29
author Colin Cross <ccross@android.com> Thu Dec 14 11:20:27 2017 -0800
committer Colin Cross <ccross@android.com> Thu Dec 14 12:29:30 2017 -0800
tree 616e5b9d308bfca6ba62be149789a685acd08ac9
parent 973301af79c9f53467dc2baebc02aee02021469a

Add Soong modules to apkcerts

Bug: 70669383
Test: m apkcerts-list contains framework-res
Change-Id: I00c5c5d9e7311bbe4f16bf48407dd0efa242c7aa

core/soong_app_prebuilt.mk

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index 0b8fa4d..e94c019 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -43,6 +43,12 @@
 	$(call dexpreopt-one-file,$<,$@)
 endif
 
+PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
+ifdef LOCAL_CERTIFICATE
+  PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE)
+  PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE))
+endif
+
 ifndef LOCAL_IS_HOST_MODULE
 ifeq ($(LOCAL_SDK_VERSION),system_current)
 my_link_type := java:system