summaryrefslogtreecommitdiffstats
path: root/opengl/libagl/Android.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2015-01-13 06:27:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-13 06:27:45 +0000
commita198e1c14d23efd0d3acbe05fab31bf92748f329 (patch)
treef499d298ce1bf8e55743dcf1fb2edeb1f94f7cc7 /opengl/libagl/Android.mk
parent9c22ac77e41b8bbddbb64959acabce3f3a07345d (diff)
parent6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a (diff)
downloadframeworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.zip
frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.tar.gz
frameworks_native-a198e1c14d23efd0d3acbe05fab31bf92748f329.tar.bz2
am 6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"
* commit '6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a': [MIPS] Build libGLES for mips64, mips32r6
Diffstat (limited to 'opengl/libagl/Android.mk')
-rw-r--r--opengl/libagl/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk
index 64320cf..4b08749 100644
--- a/opengl/libagl/Android.mk
+++ b/opengl/libagl/Android.mk
@@ -31,7 +31,9 @@ LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger
LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S
LOCAL_CFLAGS_arm += -fstrict-aliasing
+ifndef ARCH_MIPS_REV6
LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S
+endif
LOCAL_CFLAGS_mips += -fstrict-aliasing
# The graphics code can generate division by zero
LOCAL_CFLAGS_mips += -mno-check-zero-division