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

Commit 011cae80 authored by Ian Rogers's avatar Ian Rogers Committed by Android Git Automerger
Browse files

am 1fe8e62c: am 64604840: am 6de26787: am 0991797f: am 82959f5e: Merge "Remove... 

am 1fe8e62c: am 64604840: am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."

* commit '1fe8e62c':
  Remove unnecessary compiler pragma.
parents 53c8e8ac 1fe8e62c

libpixelflinger/codeflinger/CodeCache.cpp

+3 −8
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 
#include <unistd.h>

#include <sys/mman.h>



#include <cutils/log.h>

#include <cutils/ashmem.h>

#include <cutils/atomic.h>

#define LOG_TAG "CodeCache"

#include <cutils/log.h>



#include "codeflinger/CodeCache.h"



#define LOG_TAG "CodeCache"

#include "codeflinger/CodeCache.h"



namespace android {
@@ -63,12 +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)





#pragma GCC diagnostic ignored "-Wstrict-aliasing"

#pragma GCC diagnostic ignored "-Wempty-body"

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

#pragma GCC diagnostic warning "-Wstrict-aliasing"

#pragma GCC diagnostic warning "-Wempty-body"



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