summaryrefslogtreecommitdiffstats
path: root/libc/Android.mk
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2012-08-17 17:28:15 -0700
committerIan Rogers <irogers@google.com>2012-08-20 14:12:20 -0700
commit999089181ef60bb67e1a49f2cf6f4ec608a7caf8 (patch)
tree68b426388adc78040949e65282fd623d08b7644d /libc/Android.mk
parent9417a80e48d3bba4bea814178aaa79b905ebab8c (diff)
downloadbionic-999089181ef60bb67e1a49f2cf6f4ec608a7caf8.zip
bionic-999089181ef60bb67e1a49f2cf6f4ec608a7caf8.tar.gz
bionic-999089181ef60bb67e1a49f2cf6f4ec608a7caf8.tar.bz2
Upgrade to dlmalloc 2.8.5.
Move dlmalloc code to upstream-dlmalloc to make pulling upstream changes easier. Declare pvalloc and malloc_usable_size routines present in malloc.h but with missing implementations. Remove other functions from malloc.h that have no implementation nor use in Android. Change-Id: Ia6472ec6cbebc9ad1ef99f4669de9d33fcc2efb4
Diffstat (limited to 'libc/Android.mk')
-rw-r--r--libc/Android.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/libc/Android.mk b/libc/Android.mk
index 364f4ca..8085ac5 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -500,13 +500,10 @@ endif # mips
libc_common_cflags := \
-DWITH_ERRLIST \
-DANDROID_CHANGES \
- -DUSE_LOCKS \
- -DREALLOC_ZERO_BYTES_FREES \
-D_LIBC=1 \
-DFLOATING_POINT \
-DINET6 \
-I$(LOCAL_PATH)/private \
- -DUSE_DL_PREFIX \
-DPOSIX_MISTAKE \
-DLOG_ON_HEAP_ERROR \
-std=gnu99