summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-10-16 21:51:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-16 21:51:51 +0000
commit8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2 (patch)
treefb71fbc629d2c339a25d5fc4f39e6d9de2310155 /media
parentac4d8b31d4c7785ccaed28977e05e158d554ce38 (diff)
parent589a89f5a2a9aa08bdd9b78727f608f2f178f107 (diff)
downloadframeworks_av-8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2.zip
frameworks_av-8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2.tar.gz
frameworks_av-8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2.tar.bz2
am 589a89f5: Merge "Add -no-integrated-as at local level."
* commit '589a89f5a2a9aa08bdd9b78727f608f2f178f107': Add -no-integrated-as at local level.
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/on2/h264dec/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/Android.mk b/media/libstagefright/codecs/on2/h264dec/Android.mk
index bf03ad9..e63b6b1 100644
--- a/media/libstagefright/codecs/on2/h264dec/Android.mk
+++ b/media/libstagefright/codecs/on2/h264dec/Android.mk
@@ -94,6 +94,8 @@ ifeq ($(TARGET_ARCH),arm)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/./omxdl/arm_neon/api \
$(LOCAL_PATH)/./omxdl/arm_neon/vc/api \
$(LOCAL_PATH)/./omxdl/arm_neon/vc/m4p10/api
+ # h264bsdWriteMacroblock.S does not compile with Clang.
+ LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
endif
endif