Merge "Add Soong modules to apkcerts" am: c212517c9b

am: f202d3f0c2

Change-Id: If7747c7cb3907a531e128cbb476ff0b88dc5c7f7
This commit is contained in:
Colin Cross 2017-12-14 22:30:52 +00:00 committed by android-build-merger
commit e29acfd7f9
1 changed files with 6 additions and 0 deletions

View File

@ -43,6 +43,12 @@ $(built_odex): $(LOCAL_SOONG_DEX_JAR)
$(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