commit b6bee6f17187a9eb3645e9519cca4a126d9aca21
author David 'Digit' Turner <digit@google.com> Wed Jun 16 17:02:44 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 16 17:02:44 2010 -0700
tree 28a8892c1198b3418bfdcbc750eb14c96e521224
parent 4873beb5b018d74a3b38403f34628ed6c3435888
parent 3e4677856f0e16a732cecc15cafa7efde1f21241

am 3e467785: Remove irritating warnings about \'va_list\' mangling when building C++ sources.

Merge commit '3e4677856f0e16a732cecc15cafa7efde1f21241' into gingerbread-plus-aosp

* commit '3e4677856f0e16a732cecc15cafa7efde1f21241':
  Remove irritating warnings about 'va_list' mangling when building C++ sources.

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 \