am 7a66f7af: am 913a17fd: Merge "libagl: support multilib build"

* commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8':
  libagl: support multilib build
This commit is contained in:
Colin Cross 2014-02-18 21:39:56 +00:00 committed by Android Git Automerger
commit 0380d5279b

View File

@ -29,17 +29,13 @@ LOCAL_CFLAGS += -fvisibility=hidden
LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
ifeq ($(TARGET_ARCH),arm) LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S
LOCAL_SRC_FILES += fixed_asm.S iterators.S LOCAL_CFLAGS_arm += -fstrict-aliasing
LOCAL_CFLAGS += -fstrict-aliasing
endif
ifeq ($(TARGET_ARCH),mips) LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S
LOCAL_SRC_FILES += arch-$(TARGET_ARCH)/fixed_asm.S LOCAL_CFLAGS_mips += -fstrict-aliasing
LOCAL_CFLAGS += -fstrict-aliasing # The graphics code can generate division by zero
# The graphics code can generate division by zero LOCAL_CFLAGS_mips += -mno-check-zero-division
LOCAL_CFLAGS += -mno-check-zero-division
endif
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private