diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-16 21:54:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 21:54:21 +0000 |
| commit | 364caa16fff1eea79d6191910921360d633f7ace (patch) | |
| tree | 63ab1e71a1c4a94d08fa857baa7cab8a5425c8e3 /media/libstagefright/codecs | |
| parent | 468ad9e1b720515a8c2d4a7fc0776921b5907861 (diff) | |
| parent | 8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2 (diff) | |
| download | frameworks_av-364caa16fff1eea79d6191910921360d633f7ace.zip frameworks_av-364caa16fff1eea79d6191910921360d633f7ace.tar.gz frameworks_av-364caa16fff1eea79d6191910921360d633f7ace.tar.bz2 | |
am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."
* commit '8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2':
Add -no-integrated-as at local level.
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/on2/h264dec/Android.mk | 2 |
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 |