summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao2016-01-22 13:04:35 -0600
committerJosh Gao2016-01-22 13:04:35 -0600
commit70bde21ae4897b9215e240134c6fc18c2b871d02 (patch)
tree72412b1b3f2c2387f3afa0856e03795a7bc68146 /libpixelflinger
parenta649a7df15617e1e54cc89c2f682a5e6472bf304 (diff)
downloadplatform-system-core-70bde21ae4897b9215e240134c6fc18c2b871d02.tar.gz
platform-system-core-70bde21ae4897b9215e240134c6fc18c2b871d02.tar.xz
platform-system-core-70bde21ae4897b9215e240134c6fc18c2b871d02.zip
Use dlmalloc from external/dlmalloc instead of bionic/.
Bug: http://b/17207577 Change-Id: Ib9b4cd417091b765402ad217ae0b5a10e3ffbc23
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/codeflinger/CodeCache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp
index d770302f2..4b498c144 100644
--- a/libpixelflinger/codeflinger/CodeCache.cpp
+++ b/libpixelflinger/codeflinger/CodeCache.cpp
@@ -63,7 +63,7 @@ static void heap_error(const char* msg, const char* function, void* p);
63#define USAGE_ERROR_ACTION(m,p) \ 63#define USAGE_ERROR_ACTION(m,p) \
64 heap_error("ARGUMENT IS INVALID HEAP ADDRESS", __FUNCTION__, p) 64 heap_error("ARGUMENT IS INVALID HEAP ADDRESS", __FUNCTION__, p)
65 65
66#include "../../../../bionic/libc/upstream-dlmalloc/malloc.c" 66#include "../../../../external/dlmalloc/malloc.c"
67 67
68static void heap_error(const char* msg, const char* function, void* p) { 68static void heap_error(const char* msg, const char* function, void* p) {
69 ALOG(LOG_FATAL, LOG_TAG, "@@@ ABORTING: CODE FLINGER: %s IN %s addr=%p", 69 ALOG(LOG_FATAL, LOG_TAG, "@@@ ABORTING: CODE FLINGER: %s IN %s addr=%p",