am 3d5a4240: Merge "Fix build."

* commit '3d5a42408ca24f86b8b81697b20012736cb48c2b':
  Fix build.
This commit is contained in:
Christopher Ferris 2014-05-21 18:50:10 +00:00 committed by Android Git Automerger
commit fc11ebc501

View File

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