p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules. 

Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
  Add OVERRIDE_PACKAGES support for prebuild modules.
This commit is contained in:
Owen Lin 2009-10-22 06:44:28 -07:00 committed by Android Git Automerger
parent c6c462434c 64d5a80706
commit 355670b985
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/prebuilt.mk
View File

@ -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