commit df249af6b6bd137b7a27623905f3e94a31104eef
author Ying Wang <wangying@google.com> Fri Jun 11 09:08:57 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 11 09:08:57 2010 -0700
tree 01a70cd6c1555e644cd5a48e6a4bfd2475a53b7d
parent 4977caa70035992921f9d3f8eaa8c6f28292171e
parent 74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1

am 74a9fd08: am a07d37b7: Cherry-pick bug fixes from master.

Merge commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1' into gingerbread-plus-aosp

* commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1':
  Cherry-pick bug fixes from master.

core/multi_prebuilt.mk

diff --git a/core/multi_prebuilt.mk b/core/multi_prebuilt.mk
index 738a88d..00f9128 100644
--- a/core/multi_prebuilt.mk
+++ b/core/multi_prebuilt.mk
@@ -56,6 +56,7 @@
     $(eval LOCAL_MODULE := $(basename $(notdir $(t)))) \
     $(eval LOCAL_SRC_FILES := $(t)) \
    ) \
+  $(eval ALL_PREBUILT += $(LOCAL_MODULE)) \
   $(if $(6), \
     $(eval LOCAL_BUILT_MODULE_STEM := $(6)) \
    , \