From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Wed, 11 Jan 2023 08:19:44 +0000 (+0000)
Subject: Make libart use dlmalloc from
X-Git-Tag: archive/raspbian/29.0.6-22+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=26ad2a9b1d82247f61e30fba54eb3456b7cf4d23;p=android-platform-tools.git

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 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