diff options
| author | Colin Cross <ccross@android.com> | 2014-02-18 21:29:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-18 21:29:50 +0000 |
| commit | 913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8 (patch) | |
| tree | 63cb65a85d0bb0c33bd8c13255dd65be854e2779 /opengl | |
| parent | d5fe844b41778bf87101fc0a0e4e37e779678c50 (diff) | |
| parent | ff75a8000c5b70b9dd895f9f7a8fb7412c2aa423 (diff) | |
| download | frameworks_native-913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8.zip frameworks_native-913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8.tar.gz frameworks_native-913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8.tar.bz2 | |
Merge "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 |