diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 16:34:46 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 16:34:46 -0700 |
| commit | 7cff5732dd9876ee9aabf08147e7efe3503637ff (patch) | |
| tree | bfaae96bb79b589f4d0014fd4d177caacd90a94b /media/libstagefright/codecs/amrwbenc | |
| parent | dc28fa7eb4a51ea77c095b0cb9fd757755525492 (diff) | |
| download | frameworks_av-7cff5732dd9876ee9aabf08147e7efe3503637ff.zip frameworks_av-7cff5732dd9876ee9aabf08147e7efe3503637ff.tar.gz frameworks_av-7cff5732dd9876ee9aabf08147e7efe3503637ff.tar.bz2 | |
Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level.
BUG: 17820427
Change-Id: I8e67a152f82afdd1d6b81793ee7dd721ab2b59df
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc')
| -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 |