Make libart use dlmalloc from

https://android.googlesource.com/platform/external/dlmalloc
Forwarded: not-needed

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

diff --git a/art/runtime/gc/allocator/dlmalloc.cc b/art/runtime/gc/allocator/dlmalloc.cc
index 79d4fbfb5a456a2e1df89da1ede807c1329139b0..a3a47f8ab370f88b0307c080fef98e01dd1635bc 100644 (file)
--- a/art/runtime/gc/allocator/dlmalloc.cc
+++ b/art/runtime/gc/allocator/dlmalloc.cc
@@ -39,7 +39,7 @@ static void art_heap_usage_error(const char* function, void* p);
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
 #pragma GCC diagnostic ignored "-Wexpansion-to-defined"
-#include "../../../external/dlmalloc/malloc.c"
+#include "../../../../debian/include/art/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/art/runtime/gc/allocator/dlmalloc.h b/art/runtime/gc/allocator/dlmalloc.h
index b12691ad0ea97335390039c1870b7e63532193ac..b28292d288c0d68f07bb0931f79e71efaa63e527 100644 (file)
--- a/art/runtime/gc/allocator/dlmalloc.h
+++ b/art/runtime/gc/allocator/dlmalloc.h
@@ -33,7 +33,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
-#include "../../external/dlmalloc/malloc.h"
+#include "../../../../debian/include/art/dlmalloc/malloc.h"
 #pragma GCC diagnostic pop
 
 // Callback for dlmalloc_inspect_all or mspace_inspect_all that will madvise(2) unused