commit ecfec9da142fad814a447da748756669422ba886
author Owen Lin <owenlin@google.com> Thu Oct 22 09:50:18 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 22 09:50:18 2009 -0700
tree f970f4cea57ff437740303b7c337d7ef2ab15ce2
parent bccc5b549b8cfa272d5e01a5e680d48ea66978ca
parent 053ff0e674087e6320fbb961f384b9fe6d2c6949

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.

core/prebuilt.mk

diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 1bb3acf..b2bb07c 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -26,6 +26,8 @@
   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 @@
 
 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