From: Android Tools Maintainers Date: Thu, 7 Jan 2021 12:08:42 +0000 (+0000) Subject: use-android-dlmalloc X-Git-Tag: archive/raspbian/10.0.0+r36-3+rpi1~12^2~14 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50d5f26179d6be818fe45a14301e8c61c33d7ce4;p=android-platform-art.git 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 79d4fbf..e5895d8 100644 --- a/runtime/gc/allocator/dlmalloc.cc +++ b/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/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 b12691a..9ed0474 100644 --- a/runtime/gc/allocator/dlmalloc.h +++ b/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/dlmalloc/malloc.h" #pragma GCC diagnostic pop // Callback for dlmalloc_inspect_all or mspace_inspect_all that will madvise(2) unused