commit eed926c889382073c74de43a0d15e37462623cf3
author Jing Yu <jingyu@google.com> Wed Jun 16 20:44:14 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 16 20:44:14 2010 -0700
tree b355e950259d141c38289895c3e1f5b0c1f9eb89
parent b6bee6f17187a9eb3645e9519cca4a126d9aca21
parent ada132a80ba7edde00ac71727a205d55578e3f47

am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3

Merge commit 'ada132a80ba7edde00ac71727a205d55578e3f47' into gingerbread-plus-aosp

* commit 'ada132a80ba7edde00ac71727a205d55578e3f47':
  Switch toolchain from gcc-4.4.0 to gcc-4.4.3

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

target/product/generic_x86.mk

diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk
index 9713900..345a79a 100644
--- a/target/product/generic_x86.mk
+++ b/target/product/generic_x86.mk
@@ -3,7 +3,7 @@
 # you should derive from generic_with_google.mk
 
 PRODUCT_PACKAGES := \
-    AlarmClock \
+    DeskClock \
     AlarmProvider \
     Calendar \
     Camera \