commit bccc5b549b8cfa272d5e01a5e680d48ea66978ca
author Brandon Ballinger <brandonb@google.com> Thu Oct 22 09:50:15 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 22 09:50:15 2009 -0700
tree 79c6db97af1f728116a8dadcb1c891254c932b01
parent 9f06c3e6512fdca13080df53bf5a8c0e3e5b1094
parent 21e91f357a45069eaa55542dc9f46d1293d1c21c

am 21e91f35: am c6c46243: am 36f349ac: Merge change Ied29246e into eclair

Merge commit '21e91f357a45069eaa55542dc9f46d1293d1c21c'

* commit '21e91f357a45069eaa55542dc9f46d1293d1c21c':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.

core/prebuilt.mk

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