diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-03-01 15:35:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 15:35:25 -0800 |
| commit | 79967af7ba8fb2ddd3a106afc0361f3ad836c174 (patch) | |
| tree | 2698225f0ca4362d3bb74b799bdd1de6e569e8fe /media/libstagefright/codecs/aacenc/Android.mk | |
| parent | 6c1f1cb5bd2b22f8b21b78ea020a0b6370f5b9ff (diff) | |
| parent | d1aeb29912c93863a05b8023bc30cd139c97c5f5 (diff) | |
| download | frameworks_av-79967af7ba8fb2ddd3a106afc0361f3ad836c174.zip frameworks_av-79967af7ba8fb2ddd3a106afc0361f3ad836c174.tar.gz frameworks_av-79967af7ba8fb2ddd3a106afc0361f3ad836c174.tar.bz2 | |
am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '9de7793b425be89889412f3a86466d7b19055c3c':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Diffstat (limited to 'media/libstagefright/codecs/aacenc/Android.mk')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk index 34a2796..509193c 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -79,7 +79,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E endif ifeq ($(VOTT), v7) -LOCAL_CFLAGS += -DARMV5E -DARMV7Neon -DARM_INASM -DARMV5_INASM +LOCAL_CFLAGS += -DARMV5E -DARMV7Neon -DARM_INASM -DARMV5_INASM -DARMV6_INASM LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV7 endif |