commit 1a21eff401bf34e869c421c76a7dfec9d5761172
author Josh Gao <jmgao@google.com> Mon Jan 25 18:53:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 25 18:53:01 2016 +0000
tree c219b14ed55196137e3f3fb2113cc163811f99b8
parent 0b5f0831426a0ebaf90d5601998240cf3eada050
parent 66400ee57f4ebeda78ee60eaa4ee48b0c82c67ca

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

* commit '7f3dd26610c018c05d93480d8af2c4a813507efc':
  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",