| commit | 6b8feeedf65351fd78509bbb89b806c04f8939ca | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Oct 16 11:30:25 2014 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu Oct 16 11:37:09 2014 -0700 |
| tree | d0ab2f337d0690ba21c79965334732f37bb05ca5 | |
| parent | 6ade0417485d964f8a9462105e6507bfb7d19914 [diff] |
Add -no-integrated-as at local level. Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I5d95ef260c097961cb2bf2f15155572c2b24cb0e
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 @@ 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