am 053ff0e6: am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '053ff0e674087e6320fbb961f384b9fe6d2c6949' * commit '053ff0e674087e6320fbb961f384b9fe6d2c6949': Add OVERRIDE_PACKAGES support for prebuild modules.
This commit is contained in:
commit
ecfec9da14
|
@ -26,6 +26,8 @@ else
|
|||
prebuilt_module_is_a_library :=
|
||||
endif
|
||||
|
||||
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
|
||||
|
||||
# Ensure that prebuilt .apks have been aligned.
|
||||
ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
|
||||
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN)
|
||||
|
@ -51,7 +53,6 @@ endif
|
|||
|
||||
PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8
|
||||
PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
|
||||
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
|
||||
PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
|
||||
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue