diff options
| author | 2016-01-22 11:00:27 -0800 | |
|---|---|---|
| committer | 2016-01-22 11:04:09 -0800 | |
| commit | 3220a6dabf4988f146afbdd2bd903020d32255e3 (patch) | |
| tree | 3dc4140524a467906d051ebce2ae059545abbb1e | |
| parent | 95005291d8ebdd1d2ac58ffc5181fef4fbbf2383 (diff) | |
Use dlmalloc from external/dlmalloc instead of bionic/.
Bug: http://b/17207577
Change-Id: I86d731e5236947c2cc21cbd17de29bd310a60a5b
| -rw-r--r-- | runtime/gc/allocator/dlmalloc.cc | 2 | ||||
| -rw-r--r-- | runtime/gc/allocator/dlmalloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc index e747f00c92..dc4e31253f 100644 --- a/runtime/gc/allocator/dlmalloc.cc +++ b/runtime/gc/allocator/dlmalloc.cc @@ -36,7 +36,7 @@ static void art_heap_usage_error(const char* function, void* p); #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) { diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h index 0558921a56..50e2622e89 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__ |