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

Commit 6ab5cc63 authored by David Turner's avatar David Turner Committed by android-build-merger
Browse files

Merge \\"Remove qemu_tracing dependency.\\" am: ed5fd6fd 

am: 23b9da5f

Change-Id: I82654633e6f0d2dde528130caaa757b516a1b9ef
parents 6bcf0cf1 23b9da5f

libpixelflinger/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) \ 
		    external/safe-iop/include

LOCAL_SHARED_LIBRARIES := libcutils liblog libutils



# Really this should go away entirely or at least not depend on

# libhardware, but this at least gets us built.

LOCAL_SHARED_LIBRARIES += libhardware_legacy

LOCAL_CFLAGS += -DWITH_LIB_HARDWARE

include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))

libpixelflinger/codeflinger/ARMAssembler.cpp

+0 −14
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ 
#include <cutils/log.h>

#include <cutils/properties.h>



#if defined(WITH_LIB_HARDWARE)

#include <hardware_legacy/qemu_tracing.h>

#endif



#include <private/pixelflinger/ggl_context.h>



#include "ARMAssembler.h"
@@ -48,9 +44,6 @@ ARMAssembler::ARMAssembler(const sp<Assembly>& assembly) 
{

    mBase = mPC = (uint32_t *)assembly->base();

    mDuration = ggl_system_time();

#if defined(WITH_LIB_HARDWARE)

    mQemuTracing = true;

#endif

}



ARMAssembler::~ARMAssembler()
@@ -184,13 +177,6 @@ int ARMAssembler::generate(const char* name) 
    const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n";

    ALOGI(format, name, int(pc()-base()), base(), pc(), duration);



#if defined(WITH_LIB_HARDWARE)

    if (__builtin_expect(mQemuTracing, 0)) {

        int err = qemu_add_mapping(uintptr_t(base()), name);

        mQemuTracing = (err >= 0);

    }

#endif



    char value[PROPERTY_VALUE_MAX];

    property_get("debug.pf.disasm", value, "0");

    if (atoi(value) != 0) {

libpixelflinger/codeflinger/ARMAssembler.h

+0 −3
Original line number Diff line number Diff line
@@ -167,9 +167,6 @@ private: 
    uint32_t*       mPC;

    uint32_t*       mPrologPC;

    int64_t         mDuration;

#if defined(WITH_LIB_HARDWARE)

    bool            mQemuTracing;

#endif

    

    struct branch_target_t {

        inline branch_target_t() : label(0), pc(0) { }

libpixelflinger/codeflinger/MIPS64Assembler.cpp

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ 
#include <cutils/log.h>

#include <cutils/properties.h>



#if defined(WITH_LIB_HARDWARE)

#include <hardware_legacy/qemu_tracing.h>

#endif



#include <private/pixelflinger/ggl_context.h>



#include "MIPS64Assembler.h"

libpixelflinger/codeflinger/MIPSAssembler.cpp

+0 −11
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ 
#include <cutils/log.h>

#include <cutils/properties.h>



#if defined(WITH_LIB_HARDWARE)

#include <hardware_legacy/qemu_tracing.h>

#endif



#include <private/pixelflinger/ggl_context.h>



#include "MIPSAssembler.h"
@@ -1411,13 +1407,6 @@ int MIPSAssembler::generate(const char* name) 
    const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n";

    ALOGI(format, name, int(pc()-base()), base(), pc(), duration);



#if defined(WITH_LIB_HARDWARE)

    if (__builtin_expect(mQemuTracing, 0)) {

        int err = qemu_add_mapping(uintptr_t(base()), name);

        mQemuTracing = (err >= 0);

    }

#endif



    char value[PROPERTY_VALUE_MAX];

    value[0] = '\0';