From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Tue, 19 Mar 2019 01:31:47 +0000 (+0000)
Subject: use-android-dlmalloc
X-Git-Tag: archive/raspbian/10.0.0+r36-3+rpi1~13^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6be13528755f4854d6411d3701276ba6e8b80de8;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 0c84224..323009d 100644
--- a/runtime/gc/allocator/dlmalloc.cc
+++ b/runtime/gc/allocator/dlmalloc.cc
@@ -36,7 +36,7 @@ static void art_heap_usage_error(const char* function, void* p);
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wempty-body"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#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 c07da5d..38de59b 100644
--- a/runtime/gc/allocator/dlmalloc.h
+++ b/runtime/gc/allocator/dlmalloc.h
@@ -32,7 +32,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wredundant-decls"
-#include "../../external/dlmalloc/malloc.h"
+#include "debian/dlmalloc/malloc.h"
 #pragma GCC diagnostic pop
 
 #ifdef ART_TARGET_ANDROID