1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
Description: Make libart use dlmalloc from
https://android.googlesource.com/platform/external/dlmalloc
Forwarded: not-needed
--- a/runtime/gc/allocator/art-dlmalloc.cc
+++ b/runtime/gc/allocator/art-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 "dlmalloc.c" // NOLINT
+#include "debian/dlmalloc/malloc.c"
// Note: dlmalloc.c uses a DEBUG define to drive debug code. This interferes with the DEBUG severity
// of libbase, so undefine it now.
#undef DEBUG
--- a/runtime/gc/allocator/art-dlmalloc.h
+++ b/runtime/gc/allocator/art-dlmalloc.h
@@ -33,7 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wredundant-decls"
#pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
-#include "dlmalloc.h"
+#include "debian/dlmalloc/malloc.h"
#pragma GCC diagnostic pop
// Callback for dlmalloc_inspect_all or mspace_inspect_all that will madvise(2) unused
|
