commit ec1c20a7077a0afb476f8ca2b290e7a01c002b1d
author Sriram Raman <sriramkraman@google.com> Fri Jun 11 12:30:53 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 11 12:30:53 2010 -0700
tree 727ecad5376e572da3dc8fc6c76a59130115c29c
parent df249af6b6bd137b7a27623905f3e94a31104eef
parent 6ad4e499a6f9c0477ef430ba4ca73df533f6cadc

am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Merge commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc' into gingerbread-plus-aosp

* commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc':
  Switch the required host Java environment to 1.6.

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)) \
    , \