From b459a8284e5b4b1bd279059ca3fe7574adcc8001 Mon Sep 17 00:00:00 2001 From: Android Tools Maintainers Date: Thu, 13 Dec 2018 09:11:09 +0000 Subject: [PATCH] use-android-dlmalloc Gbp-Pq: Name use-android-dlmalloc.patch --- runtime/gc/allocator/dlmalloc.cc | 2 +- runtime/gc/allocator/dlmalloc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.30.2