diff options
| author | Colin Cross <ccross@android.com> | 2014-02-18 21:39:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 21:39:56 +0000 |
| commit | 0380d5279b6d6a401703900bfd4c1b9b77c7c063 (patch) | |
| tree | 729c08920e3c68187c7703b5c6f5cf09a61f4a45 /opengl | |
| parent | 505350b150d448c2e5fca35ab4a0f829abdbdbb7 (diff) | |
| parent | 7a66f7afd1b6a975ab3b99b4765781a0d66958c8 (diff) | |
| download | frameworks_native-0380d5279b6d6a401703900bfd4c1b9b77c7c063.zip frameworks_native-0380d5279b6d6a401703900bfd4c1b9b77c7c063.tar.gz frameworks_native-0380d5279b6d6a401703900bfd4c1b9b77c7c063.tar.bz2 | |
am 7a66f7af: am 913a17fd: Merge "libagl: support multilib build"
* commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8':
libagl: support multilib build
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 95a8ef2..32bc5d9 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -29,17 +29,13 @@ LOCAL_CFLAGS += -fvisibility=hidden LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui LOCAL_LDLIBS := -lpthread -ldl -ifeq ($(TARGET_ARCH),arm) - LOCAL_SRC_FILES += fixed_asm.S iterators.S - LOCAL_CFLAGS += -fstrict-aliasing -endif - -ifeq ($(TARGET_ARCH),mips) - LOCAL_SRC_FILES += arch-$(TARGET_ARCH)/fixed_asm.S - LOCAL_CFLAGS += -fstrict-aliasing - # The graphics code can generate division by zero - LOCAL_CFLAGS += -mno-check-zero-division -endif +LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S +LOCAL_CFLAGS_arm += -fstrict-aliasing + +LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S +LOCAL_CFLAGS_mips += -fstrict-aliasing +# The graphics code can generate division by zero +LOCAL_CFLAGS_mips += -mno-check-zero-division # we need to access the private Bionic header <bionic_tls.h> LOCAL_C_INCLUDES += bionic/libc/private |