commit 2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43
author Jesse Wilson <jessewilson@google.com> Wed Aug 18 22:58:42 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 18 22:58:42 2010 -0700
tree c00c60c5e60c6d725fced3c5cd3219a434053de5
parent 703c85c69d3822067623a6dd7bfde4b734c7f84f
parent 7ab237f1efe578fc0462154bc239ad3b6cde2bda

am 7ab237f1: Including dl heap stubs for the dalvikvm host build

Merge commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda' into gingerbread-plus-aosp

* commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda':
  Including dl heap stubs for the dalvikvm host build

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 778b5bd..e8c7775 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -84,7 +84,7 @@
 # Static library for host
 # ========================================================
 LOCAL_MODULE := libcutils
-LOCAL_SRC_FILES := $(commonSources) $(commonHostSources)
+LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
 LOCAL_LDLIBS := -lpthread
 LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS += $(hostSmpFlag)