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

Commit 2eef6029 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@126645

parent 5ae090ed

liblog/logd_write.c

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ int __android_log_write(int prio, const char *tag, const char *msg) 
    if (!strcmp(tag, "HTC_RIL") ||

        !strcmp(tag, "RILJ") ||

        !strcmp(tag, "RILC") ||

        !strcmp(tag, "RILD") ||

        !strcmp(tag, "RIL") ||

        !strcmp(tag, "AT") ||

        !strcmp(tag, "GSM") ||

libpixelflinger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer 
endif



LOCAL_SHARED_LIBRARIES := \

	libhardware	\

	libhardware_legacy	\

	libcutils



ifneq ($(TARGET_ARCH),arm)

libpixelflinger/codeflinger/ARMAssembler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <cutils/properties.h>



#if defined(WITH_LIB_HARDWARE)

#include <hardware/qemu_tracing.h>

#include <hardware_legacy/qemu_tracing.h>

#endif



#include <private/pixelflinger/ggl_context.h>