Merge "Ignore expansion-to-defined warning from dlmalloc include" am: a54a660892

am: bb3a285bb5

Change-Id: I6e5ff69fcf71124b2aace69af4fca924e7e172a2
This commit is contained in:
Yi Kong 2018-12-11 18:57:49 -08:00 committed by android-build-merger
commit 3d85081369

View file

@ -61,7 +61,10 @@ 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)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wexpansion-to-defined"
#include "../../../../external/dlmalloc/malloc.c"
#pragma GCC diagnostic pop
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",