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

Commit 832a0d1c authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

resolved conflicts for cf676a86 to lmp-mr1-ub-dev 

Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
parents 170bde83 cf676a86

libpixelflinger/Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ PIXELFLINGER_SRC_FILES:= \ 
	codeflinger/load_store.cpp \

	codeflinger/blending.cpp \

	codeflinger/texturing.cpp \

	codeflinger/tinyutils/SharedBuffer.cpp \

	codeflinger/tinyutils/VectorImpl.cpp \

	fixed.cpp.arm \

	picker.cpp.arm \

	pixelflinger.cpp.arm \
@@ -63,8 +61,9 @@ LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64) 
LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)

LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS)

LOCAL_SHARED_LIBRARIES := libcutils liblog

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.

libpixelflinger/codeflinger/ARMAssembler.h

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <stdint.h>

#include <sys/types.h>



#include "tinyutils/Vector.h"

#include "tinyutils/KeyedVector.h"

#include "tinyutils/smartpointer.h"

#include "utils/Vector.h"

#include "utils/KeyedVector.h"



#include "ARMAssemblerInterface.h"

#include "CodeCache.h"

libpixelflinger/codeflinger/Arm64Assembler.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#include <stdint.h>

#include <sys/types.h>



#include "tinyutils/Vector.h"

#include "tinyutils/KeyedVector.h"

#include "tinyutils/smartpointer.h"

#include "utils/Vector.h"

#include "utils/KeyedVector.h"



#include "tinyutils/smartpointer.h"

#include "codeflinger/ARMAssemblerInterface.h"

libpixelflinger/codeflinger/CodeCache.h

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

#include <sys/types.h>



#include "tinyutils/KeyedVector.h"

#include "utils/KeyedVector.h"

#include "tinyutils/smartpointer.h"



namespace android {

libpixelflinger/codeflinger/MIPSAssembler.h

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <stdint.h>

#include <sys/types.h>



#include "tinyutils/KeyedVector.h"

#include "tinyutils/Vector.h"

#include "tinyutils/smartpointer.h"

#include "utils/KeyedVector.h"

#include "utils/Vector.h"



#include "ARMAssemblerInterface.h"

#include "CodeCache.h"