commit e46a061d08f9667783d39a60106003497c2ad41e
author Ed Heyl <edheyl@google.com> Fri Jun 11 15:29:06 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 11 15:29:06 2010 -0700
tree 01a70cd6c1555e644cd5a48e6a4bfd2475a53b7d
parent ec1c20a7077a0afb476f8ca2b290e7a01c002b1d
parent d7e7e4825293f5b623e07f854d7ed2e3470be586

am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

Merge commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586' into gingerbread-plus-aosp

* commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

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