diff options
Diffstat (limited to 'libpixelflinger/Android.mk')
| -rw-r--r-- | libpixelflinger/Android.mk | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 8a427b3..f02da7f 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -34,6 +34,7 @@ PIXELFLINGER_SRC_FILES_arm := \ ifeq ($(ARCH_ARM_HAVE_NEON),true) PIXELFLINGER_SRC_FILES_arm += col32cb16blend_neon.S +PIXELFLINGER_CFLAGS_arm += -D__ARM_HAVE_NEON endif PIXELFLINGER_SRC_FILES_arm64 := \ @@ -42,11 +43,13 @@ PIXELFLINGER_SRC_FILES_arm64 := \ arch-arm64/col32cb16blend.S \ arch-arm64/t32cb16blend.S \ +ifndef ARCH_MIPS_REV6 PIXELFLINGER_SRC_FILES_mips := \ codeflinger/MIPSAssembler.cpp \ codeflinger/mips_disassem.c \ arch-mips/t32cb16blend.S \ +endif # # Shared library # @@ -57,29 +60,19 @@ 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_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) \ + external/safe-iop/include LOCAL_SHARED_LIBRARIES := libcutils liblog libutils -LOCAL_C_INCLUDES += external/safe-iop/include -ifneq ($(BUILD_TINY_ANDROID),true) # Really this should go away entirely or at least not depend on # libhardware, but this at least gets us built. LOCAL_SHARED_LIBRARIES += libhardware_legacy LOCAL_CFLAGS += -DWITH_LIB_HARDWARE -endif +# t32cb16blend.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as +# arch-arm64/col32cb16blend.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as include $(BUILD_SHARED_LIBRARY) -# -# Static library version -# - -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) - - include $(call all-makefiles-under,$(LOCAL_PATH)) |