diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 23:51:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 23:51:52 +0000 |
| commit | 566a6fba127771c752fd40db84f1e7aafa520ea6 (patch) | |
| tree | f3bb73d12497bb0419279333ec5cb21375e710e0 /media/libstagefright | |
| parent | 57c27c55006f0137a8ad5a87ec62eb89084dcdc6 (diff) | |
| parent | ae38d425fdb3e3fea015c161d635d631172350c3 (diff) | |
| download | frameworks_av-566a6fba127771c752fd40db84f1e7aafa520ea6.zip frameworks_av-566a6fba127771c752fd40db84f1e7aafa520ea6.tar.gz frameworks_av-566a6fba127771c752fd40db84f1e7aafa520ea6.tar.bz2 | |
am ae38d425: Merge "Add -no-integrated-as at local level."
* commit 'ae38d425fdb3e3fea015c161d635d631172350c3':
Add -no-integrated-as at local level.
Diffstat (limited to 'media/libstagefright')
| -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 c5b8e0c..84fcd75 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 |