use-android-dlmalloc

Gbp-Pq: Name use-android-dlmalloc.patch

diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc
index 0c84224fcb51d85e1c41417284542ae13324c128..323009d8d8b3338db95b2e5d6735e1bd9cefdb17 100644 (file)
--- 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 "../../../external/dlmalloc/malloc.c"
+#include "debian/dlmalloc/malloc.c"
 // Note: malloc.c uses a DEBUG define to drive debug code. This interferes with the DEBUG severity
 //       of libbase, so undefine it now.
 #undef DEBUG

diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h
index c07da5da4dbf41aac4409091ba664762b6c720a1..38de59bbc9171609042ca736aa31874e8ddf3e2b 100644 (file)
--- 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 "../../external/dlmalloc/malloc.h"
+#include "debian/dlmalloc/malloc.h"
 #pragma GCC diagnostic pop
 
 #ifdef ART_TARGET_ANDROID