From 34dc6107af5a310d9977ba28e0a170b77c4663f8 Mon Sep 17 00:00:00 2001 From: Android Tools Maintainers Date: Tue, 2 Aug 2022 16:23:27 +0100 Subject: [PATCH] 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 --- art/runtime/gc/allocator/dlmalloc.cc | 2 +- art/runtime/gc/allocator/dlmalloc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/art/runtime/gc/allocator/dlmalloc.cc b/art/runtime/gc/allocator/dlmalloc.cc index 79d4fbfb..a3a47f8a 100644 --- 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 b12691ad..b28292d2 100644 --- 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 -- 2.30.2