Merge "Adding overrides support to android_app bps"

am: 7e06b26b5e

Change-Id: Iaa81d38900d3eb629e86de188c18332704017c9d
This commit is contained in:
Jason Monk
2018-08-10 12:17:56 -07:00
committed by android-build-merger

View File

@@ -75,6 +75,8 @@ ifdef LOCAL_CERTIFICATE
PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE)) PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE))
endif endif
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),system_current) ifeq ($(LOCAL_SDK_VERSION),system_current)
my_link_type := java:system my_link_type := java:system