commit 4fe6ce5f48687cf24c91ac9865dbad497ed6c074
author Josh Gao <jmgao@google.com> Mon Jan 25 18:42:55 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 25 18:42:55 2016 +0000
tree 1f1778e06397f3db8a3bb84b4250a5bd6cc07112
parent 1acf046cadff4c4d082b3cc76dc833cf39385928
parent 3220a6dabf4988f146afbdd2bd903020d32255e3

Merge "Use dlmalloc from external/dlmalloc instead of bionic/."

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__