aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-08-21 09:36:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-21 09:36:09 -0700
commitfa5a26885cd75e4b2054ade38955d9d48fe99913 (patch)
tree06cc09a74b20f97448a15aa1f590f18a7f6a555f
parentfc1a13bfdd9f7acd36bd4ae8f87cd57aa298f5ac (diff)
parent2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43 (diff)
downloadsystem_core-fa5a26885cd75e4b2054ade38955d9d48fe99913.tar.gz
system_core-fa5a26885cd75e4b2054ade38955d9d48fe99913.tar.bz2
system_core-fa5a26885cd75e4b2054ade38955d9d48fe99913.zip
am 2c9ea21d: am 7ab237f1: Including dl heap stubs for the dalvikvm host build
Merge commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43' * commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43': Including dl heap stubs for the dalvikvm host build
-rw-r--r--libcutils/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 778b5bd8..e8c77754 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -84,7 +84,7 @@ endif
# 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)