Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b3a94c authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "Use dlmalloc from external/dlmalloc instead of bionic/." am: 506d233e 

am: 7f3dd266

* commit '7f3dd266':
  Use dlmalloc from external/dlmalloc instead of bionic/.
parents 1293fed9 7f3dd266

libpixelflinger/codeflinger/CodeCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void heap_error(const char* msg, const char* function, void* p); 
#define USAGE_ERROR_ACTION(m,p) \

    heap_error("ARGUMENT IS INVALID HEAP ADDRESS", __FUNCTION__, p)



#include "../../../../bionic/libc/upstream-dlmalloc/malloc.c"

#include "../../../../external/dlmalloc/malloc.c"



static void heap_error(const char* msg, const char* function, void* p) {

    ALOG(LOG_FATAL, LOG_TAG, "@@@ ABORTING: CODE FLINGER: %s IN %s addr=%p",