diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-16 21:47:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-16 21:47:21 +0000 |
| commit | 589a89f5a2a9aa08bdd9b78727f608f2f178f107 (patch) | |
| tree | d0ab2f337d0690ba21c79965334732f37bb05ca5 /media | |
| parent | 6ade0417485d964f8a9462105e6507bfb7d19914 (diff) | |
| parent | 6b8feeedf65351fd78509bbb89b806c04f8939ca (diff) | |
| download | frameworks_av-589a89f5a2a9aa08bdd9b78727f608f2f178f107.zip frameworks_av-589a89f5a2a9aa08bdd9b78727f608f2f178f107.tar.gz frameworks_av-589a89f5a2a9aa08bdd9b78727f608f2f178f107.tar.bz2 | |
Merge "Add -no-integrated-as at local level."
Diffstat (limited to 'media')
| -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 |