diff options
| author | Colin Cross <ccross@android.com> | 2014-02-11 13:32:56 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-02-11 13:36:14 -0800 |
| commit | f88fb1fade2f36dfc302e9bf11e8d9e37bdbcd76 (patch) | |
| tree | 28294c6f357b7c0b5c23069ff4e2995dc68ef527 /libpixelflinger | |
| parent | 32ea4a895c4c914f0347dd1e943bca0f474a9050 (diff) | |
| download | system_core-f88fb1fade2f36dfc302e9bf11e8d9e37bdbcd76.zip system_core-f88fb1fade2f36dfc302e9bf11e8d9e37bdbcd76.tar.gz system_core-f88fb1fade2f36dfc302e9bf11e8d9e37bdbcd76.tar.bz2 | |
pixelflinger: support multilib builds
Use the LOCAL_*_arch variables to support building for 32-bit and
64-bit at the same time.
Change-Id: Ibef8044e8b6500a6aa111320eb35bcdaf51ad064
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/Android.mk | 66 |
1 files changed, 31 insertions, 35 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index fe50cc6..c24384c 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -7,13 +7,13 @@ include $(CLEAR_VARS) include $(CLEAR_VARS) PIXELFLINGER_SRC_FILES:= \ - codeflinger/ARMAssemblerInterface.cpp \ - codeflinger/ARMAssemblerProxy.cpp \ - codeflinger/CodeCache.cpp \ - codeflinger/GGLAssembler.cpp \ - codeflinger/load_store.cpp \ - codeflinger/blending.cpp \ - codeflinger/texturing.cpp \ + codeflinger/ARMAssemblerInterface.cpp \ + codeflinger/ARMAssemblerProxy.cpp \ + codeflinger/CodeCache.cpp \ + codeflinger/GGLAssembler.cpp \ + codeflinger/load_store.cpp \ + codeflinger/blending.cpp \ + codeflinger/texturing.cpp \ codeflinger/tinyutils/SharedBuffer.cpp \ codeflinger/tinyutils/VectorImpl.cpp \ fixed.cpp.arm \ @@ -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) |