Merge "Fix swapped certificate and private key in soong apps" am: 9b93a8892a

am: 29e9b0f220

Change-Id: I9268bb95f0cbfc1b1054b9f51834d7f86e7581a8
This commit is contained in:
Colin Cross 2017-12-16 00:16:18 +00:00 committed by android-build-merger
commit 0293f40441
1 changed files with 2 additions and 2 deletions

View File

@ -63,8 +63,8 @@ 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))
PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE)
PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE))
endif
ifndef LOCAL_IS_HOST_MODULE