commit fef2756bd8a9ad08c5013840d8d3f87bf68aa286
author Josh Gao <jmgao@google.com> Fri Jan 22 11:04:35 2016 -0800
committer Josh Gao <jmgao@google.com> Fri Jan 22 11:04:35 2016 -0800
tree 72412b1b3f2c2387f3afa0856e03795a7bc68146
parent 9566ebf1aa846021ee1255bd286cc3484cce81a8

Use dlmalloc from external/dlmalloc instead of bionic/.

Bug: http://b/17207577
Change-Id: Ib9b4cd417091b765402ad217ae0b5a10e3ffbc23

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",