diff options
author | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 23:46:12 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-06 23:46:12 +0000 |
commit | ae38d425fdb3e3fea015c161d635d631172350c3 (patch) | |
tree | bfaae96bb79b589f4d0014fd4d177caacd90a94b | |
parent | dc28fa7eb4a51ea77c095b0cb9fd757755525492 (diff) | |
parent | 7cff5732dd9876ee9aabf08147e7efe3503637ff (diff) | |
download | frameworks_av-ae38d425fdb3e3fea015c161d635d631172350c3.zip frameworks_av-ae38d425fdb3e3fea015c161d635d631172350c3.tar.gz frameworks_av-ae38d425fdb3e3fea015c161d635d631172350c3.tar.bz2 |
Merge "Add -no-integrated-as at local level."
-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 |