diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 23:56:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 23:56:35 +0000 |
| commit | 6160044825b0686e59c11ddbcaf56c8086da4022 (patch) | |
| tree | 741024e007c68d0891851995010d09a6f9d10819 /media/libstagefright/codecs | |
| parent | 10908ec6033c29433a399e1c160a8516bc12d931 (diff) | |
| parent | 566a6fba127771c752fd40db84f1e7aafa520ea6 (diff) | |
| download | frameworks_av-6160044825b0686e59c11ddbcaf56c8086da4022.zip frameworks_av-6160044825b0686e59c11ddbcaf56c8086da4022.tar.gz frameworks_av-6160044825b0686e59c11ddbcaf56c8086da4022.tar.bz2 | |
am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."
* commit '566a6fba127771c752fd40db84f1e7aafa520ea6':
Add -no-integrated-as at local level.
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index 64fe8d1..024a292 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -86,6 +86,9 @@ LOCAL_SRC_FILES += \ endif +# ARMV5E/Filt_6k_7k_opt.s does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as + LOCAL_MODULE := libstagefright_amrwbenc LOCAL_ARM_MODE := arm |