From 74889a1681c43a73f3ebebcef6fd978ba6db89be Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 21 Mar 2019 15:46:25 -0700 Subject: [PATCH] Support PRESIGNED in soong_app_prebuilt.mk app_import support in Soong will require support for PRESIGNED. Test: not yet Change-Id: I436e41358b6a1ee2895ecaa9769e96cbf0714a2f --- core/soong_app_prebuilt.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index a9169eb817..9e75ccb190 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -129,7 +129,15 @@ my_prebuilt_jni_libs := my_2nd_arch_prefix := PACKAGES := $(PACKAGES) $(LOCAL_MODULE) -ifdef LOCAL_CERTIFICATE +ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) + # The magic string "PRESIGNED" means this package is already checked + # signed with its release key. + # + # By setting .CERTIFICATE but not .PRIVATE_KEY, this package will be + # mentioned in apkcerts.txt (with certificate set to "PRESIGNED") + # but the dexpreopt process will not try to re-sign the app. + PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED +else ifneq ($(LOCAL_CERTIFICATE),) PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE) PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE)) endif