ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "pixelflinger: support multilib builds"

Browse source
This commit is contained in:
Colin Cross 2014-02-12 00:24:09 +00:00 • committed by Gerrit Code Review
commit dc97eec052
1 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
libpixelflinger/Android.mk
View file

@ -7,13 +7,13 @@ include $(CLEAR_VARS)
include $(CLEAR_VARS) include $(CLEAR_VARS)
PIXELFLINGER_SRC_FILES:= \ PIXELFLINGER_SRC_FILES:= \
codeflinger/ARMAssemblerInterface.cpp \ codeflinger/ARMAssemblerInterface.cpp \
codeflinger/ARMAssemblerProxy.cpp \ codeflinger/ARMAssemblerProxy.cpp \
codeflinger/CodeCache.cpp \ codeflinger/CodeCache.cpp \
codeflinger/GGLAssembler.cpp \ codeflinger/GGLAssembler.cpp \
codeflinger/load_store.cpp \ codeflinger/load_store.cpp \
codeflinger/blending.cpp \ codeflinger/blending.cpp \
codeflinger/texturing.cpp \ codeflinger/texturing.cpp \
codeflinger/tinyutils/SharedBuffer.cpp \ codeflinger/tinyutils/SharedBuffer.cpp \
codeflinger/tinyutils/VectorImpl.cpp \ codeflinger/tinyutils/VectorImpl.cpp \
fixed.cpp.arm \ fixed.cpp.arm \
@ -26,39 +26,28 @@ PIXELFLINGER_SRC_FILES:= \
raster.cpp \ raster.cpp \
buffer.cpp buffer.cpp
ifeq ($(TARGET_ARCH),arm) PIXELFLINGER_CFLAGS := -fstrict-aliasing -fomit-frame-pointer
ifeq ($(TARGET_ARCH_VERSION),armv7-a)
PIXELFLINGER_SRC_FILES += col32cb16blend_neon.S PIXELFLINGER_SRC_FILES_arm := \
PIXELFLINGER_SRC_FILES += col32cb16blend.S codeflinger/ARMAssembler.cpp \
else codeflinger/disassem.c \
PIXELFLINGER_SRC_FILES += t32cb16blend.S col32cb16blend.S \
PIXELFLINGER_SRC_FILES += col32cb16blend.S t32cb16blend.S \
endif
ifeq ($(ARCH_ARM_HAVE_NEON),armv7-a)
PIXELFLINGER_SRC_FILES_arm += col32cb16blend_neon.S
endif endif
ifeq ($(TARGET_ARCH),arm) PIXELFLINGER_SRC_FILES_arm64 := \
PIXELFLINGER_SRC_FILES += codeflinger/ARMAssembler.cpp codeflinger/Arm64Assembler.cpp \
PIXELFLINGER_SRC_FILES += codeflinger/disassem.c codeflinger/Arm64Disassembler.cpp \
# special optimization flags for pixelflinger arch-arm64/col32cb16blend.S \
PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer arch-arm64/t32cb16blend.S \
endif
ifeq ($(TARGET_ARCH),mips) PIXELFLINGER_SRC_FILES_mips := \
PIXELFLINGER_SRC_FILES += codeflinger/MIPSAssembler.cpp codeflinger/MIPSAssembler.cpp \
PIXELFLINGER_SRC_FILES += codeflinger/mips_disassem.c codeflinger/mips_disassem.c \
PIXELFLINGER_SRC_FILES += arch-mips/t32cb16blend.S arch-mips/t32cb16blend.S \
PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer
endif
LOCAL_SHARED_LIBRARIES := libcutils liblog
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
# #
# Shared library # Shared library
@ -66,7 +55,11 @@ endif
LOCAL_MODULE:= libpixelflinger LOCAL_MODULE:= libpixelflinger
LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES) 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_CFLAGS := $(PIXELFLINGER_CFLAGS)
LOCAL_SHARED_LIBRARIES := libcutils liblog
ifneq ($(BUILD_TINY_ANDROID),true) ifneq ($(BUILD_TINY_ANDROID),true)
# Really this should go away entirely or at least not depend on # Really this should go away entirely or at least not depend on
@ -83,6 +76,9 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE:= libpixelflinger_static LOCAL_MODULE:= libpixelflinger_static
LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES) 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_CFLAGS := $(PIXELFLINGER_CFLAGS)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)