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

Commit f094fd03 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am dc97eec0: Merge "pixelflinger: support multilib builds" 

* commit 'dc97eec0':
  pixelflinger: support multilib builds
parents 620a8800 dc97eec0

libpixelflinger/Android.mk

+31 −35
Original line number Diff line number Diff line
@@ -26,39 +26,28 @@ PIXELFLINGER_SRC_FILES:= \ 
	raster.cpp \

	buffer.cpp



ifeq ($(TARGET_ARCH),arm)

ifeq ($(TARGET_ARCH_VERSION),armv7-a)

PIXELFLINGER_SRC_FILES += col32cb16blend_neon.S

PIXELFLINGER_SRC_FILES += col32cb16blend.S

else

PIXELFLINGER_SRC_FILES += t32cb16blend.S

PIXELFLINGER_SRC_FILES += col32cb16blend.S

endif

endif

PIXELFLINGER_CFLAGS := -fstrict-aliasing -fomit-frame-pointer



ifeq ($(TARGET_ARCH),arm)

PIXELFLINGER_SRC_FILES += codeflinger/ARMAssembler.cpp

PIXELFLINGER_SRC_FILES += codeflinger/disassem.c

# special optimization flags for pixelflinger

PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer

endif

PIXELFLINGER_SRC_FILES_arm := \

	codeflinger/ARMAssembler.cpp \

	codeflinger/disassem.c \

	col32cb16blend.S \

	t32cb16blend.S \



ifeq ($(TARGET_ARCH),mips)

PIXELFLINGER_SRC_FILES += codeflinger/MIPSAssembler.cpp

PIXELFLINGER_SRC_FILES += codeflinger/mips_disassem.c

PIXELFLINGER_SRC_FILES += arch-mips/t32cb16blend.S

PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer

ifeq ($(ARCH_ARM_HAVE_NEON),armv7-a)

PIXELFLINGER_SRC_FILES_arm += col32cb16blend_neon.S

endif



LOCAL_SHARED_LIBRARIES := libcutils liblog

PIXELFLINGER_SRC_FILES_arm64 := \

	codeflinger/Arm64Assembler.cpp \

	codeflinger/Arm64Disassembler.cpp \

	arch-arm64/col32cb16blend.S \

	arch-arm64/t32cb16blend.S \



ifeq ($(TARGET_ARCH),arm64)

PIXELFLINGER_SRC_FILES += arch-arm64/t32cb16blend.S

PIXELFLINGER_SRC_FILES += arch-arm64/col32cb16blend.S

PIXELFLINGER_SRC_FILES += codeflinger/Arm64Assembler.cpp

PIXELFLINGER_SRC_FILES += codeflinger/Arm64Disassembler.cpp

PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer

endif

PIXELFLINGER_SRC_FILES_mips := \

	codeflinger/MIPSAssembler.cpp \

	codeflinger/mips_disassem.c \

	arch-mips/t32cb16blend.S \



#

# Shared library
@@ -66,7 +55,11 @@ endif 


LOCAL_MODULE:= libpixelflinger

LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)

LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)

LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)

LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)

LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)

LOCAL_SHARED_LIBRARIES := libcutils liblog



ifneq ($(BUILD_TINY_ANDROID),true)

# Really this should go away entirely or at least not depend on
@@ -83,6 +76,9 @@ include $(BUILD_SHARED_LIBRARY) 
include $(CLEAR_VARS)

LOCAL_MODULE:= libpixelflinger_static

LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)

LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)

LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)

LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)

LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)

include $(BUILD_STATIC_LIBRARY)