Merge "Fix swapped certificate and private key in soong apps"

This commit is contained in:
Colin Cross 2017-12-16 00:04:07 +00:00 committed by Gerrit Code Review
commit 9b93a8892a

View file

@ -63,8 +63,8 @@ endif
PACKAGES := $(PACKAGES) $(LOCAL_MODULE) PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
ifdef LOCAL_CERTIFICATE ifdef LOCAL_CERTIFICATE
PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE) PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE)
PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE)) PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE))
endif endif
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE