From 64d5a8070630e816e62fc2d3fdcbe820f50ec924 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Fri, 16 Oct 2009 02:43:05 -0700 Subject: [PATCH] Add OVERRIDE_PACKAGES support for prebuild modules. So that some prebuild module can override existing packages. Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27 --- core/prebuilt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/prebuilt.mk b/core/prebuilt.mk index 1bb3acfb0e..b2bb07c14e 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -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