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

Commit a82d6dc3 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for b638126e to klp-modular-dev 

Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
parents 3fe40514 b638126e

charger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ LOCAL_STATIC_LIBRARIES := libminui libpixelflinger_static libpng 
ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)

LOCAL_STATIC_LIBRARIES += libsuspend

endif

LOCAL_STATIC_LIBRARIES += libz libstdc++ libcutils liblog libm libc

LOCAL_STATIC_LIBRARIES += libz libstdc++ libcutils liblog libm libc libutils



include $(BUILD_EXECUTABLE)

libpixelflinger/Android.mk

+2 −2
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 \
@@ -67,6 +65,8 @@ endif 
LOCAL_MODULE:= libpixelflinger

LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)

LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)

LOCAL_C_INCLUDES += external/safe-iop/include

LOCAL_SHARED_LIBRARIES := libcutils liblog libutils



ifneq ($(BUILD_TINY_ANDROID),true)

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

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