commit 3220a6dabf4988f146afbdd2bd903020d32255e3
author Josh Gao <jmgao@google.com> Fri Jan 22 11:00:27 2016 -0800
committer Josh Gao <jmgao@google.com> Fri Jan 22 11:04:09 2016 -0800
tree 3dc4140524a467906d051ebce2ae059545abbb1e
parent 95005291d8ebdd1d2ac58ffc5181fef4fbbf2383

Use dlmalloc from external/dlmalloc instead of bionic/.

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

runtime/gc/allocator/dlmalloc.cc

diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc
index e747f00..dc4e312 100644
--- a/runtime/gc/allocator/dlmalloc.cc
+++ b/runtime/gc/allocator/dlmalloc.cc
@@ -36,7 +36,7 @@
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wempty-body"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#include "../../../bionic/libc/upstream-dlmalloc/malloc.c"
+#include "../../../external/dlmalloc/malloc.c"
 #pragma GCC diagnostic pop
 
 static void* art_heap_morecore(void* m, intptr_t increment) {

runtime/gc/allocator/dlmalloc.h

diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h
index 0558921..50e2622 100644
--- a/runtime/gc/allocator/dlmalloc.h
+++ b/runtime/gc/allocator/dlmalloc.h
@@ -32,7 +32,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wredundant-decls"
-#include "../../bionic/libc/upstream-dlmalloc/malloc.h"
+#include "../../external/dlmalloc/malloc.h"
 #pragma GCC diagnostic pop
 
 #ifdef __ANDROID__