am 845e5c77: am fc11ebc5: am 3d5a4240: Merge "Fix build."

* commit '845e5c77b551b7b3079f9e6adf1f780f96729c33':
  Fix build.
This commit is contained in:
Christopher Ferris 2014-05-21 19:49:46 +00:00 committed by Android Git Automerger
commit 63900a7110

View File

@ -505,7 +505,7 @@ ifeq ($(MALLOC_IMPL),jemalloc)
else
libc_common_cflags += -DUSE_DLMALLOC
libc_malloc_src := bionic/dlmalloc.cpp
libc_malloc_src := bionic/dlmalloc.c
endif
# To customize dlmalloc's alignment, set BOARD_MALLOC_ALIGNMENT in