commit 7f3dd26610c018c05d93480d8af2c4a813507efc
author Josh Gao <jmgao@google.com> Mon Jan 25 18:50:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 25 18:50:42 2016 +0000
tree ebdc7654e609f6d0e175d997bab4403a95d751e6
parent 9262e5fdcd77e296bd71dbc1c9448a347a851789
parent 506d233e7ac8ca4efa80768153d842c296477f99

Merge "Use dlmalloc from external/dlmalloc instead of bionic/."
am: 506d233e7a

* commit '506d233e7ac8ca4efa80768153d842c296477f99':
  Use dlmalloc from external/dlmalloc instead of bionic/.

libpixelflinger/codeflinger/CodeCache.cpp

diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp
index d770302..4b498c1 100644
--- a/libpixelflinger/codeflinger/CodeCache.cpp
+++ b/libpixelflinger/codeflinger/CodeCache.cpp
@@ -63,7 +63,7 @@
 #define USAGE_ERROR_ACTION(m,p) \
     heap_error("ARGUMENT IS INVALID HEAP ADDRESS", __FUNCTION__, p)
 
-#include "../../../../bionic/libc/upstream-dlmalloc/malloc.c"
+#include "../../../../external/dlmalloc/malloc.c"
 
 static void heap_error(const char* msg, const char* function, void* p) {
     ALOG(LOG_FATAL, LOG_TAG, "@@@ ABORTING: CODE FLINGER: %s IN %s addr=%p",