diff options
| author | Andreas Huber <andih@google.com> | 2009-12-08 10:07:22 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2009-12-08 10:07:22 -0800 |
| commit | 7c55c3f5f5997ca572d70ad513099a5af20a23c1 (patch) | |
| tree | c77df59898ec9854776b7d8143c12f51a328bbdb /media/libstagefright/codecs | |
| parent | 6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5 (diff) | |
| download | frameworks_base-7c55c3f5f5997ca572d70ad513099a5af20a23c1.zip frameworks_base-7c55c3f5f5997ca572d70ad513099a5af20a23c1.tar.gz frameworks_base-7c55c3f5f5997ca572d70ad513099a5af20a23c1.tar.bz2 | |
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/mp3dec/Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/mp3dec/Android.mk b/media/libstagefright/codecs/mp3dec/Android.mk index d618b83..cb2788c 100644 --- a/media/libstagefright/codecs/mp3dec/Android.mk +++ b/media/libstagefright/codecs/mp3dec/Android.mk @@ -28,10 +28,6 @@ LOCAL_SRC_FILES := \ src/pvmp3_seek_synch.cpp \ src/pvmp3_stereo_proc.cpp \ src/pvmp3_reorder.cpp \ - src/pvmp3_polyphase_filter_window.cpp \ - src/pvmp3_mdct_18.cpp \ - src/pvmp3_dct_9.cpp \ - src/pvmp3_dct_16.cpp ifeq ($(TARGET_ARCH),arm) LOCAL_SRC_FILES += \ @@ -39,6 +35,12 @@ LOCAL_SRC_FILES += \ src/asm/pvmp3_mdct_18_gcc.s \ src/asm/pvmp3_dct_9_gcc.s \ src/asm/pvmp3_dct_16_gcc.s +else +LOCAL_SRC_FILES += \ + src/pvmp3_polyphase_filter_window.cpp \ + src/pvmp3_mdct_18.cpp \ + src/pvmp3_dct_9.cpp \ + src/pvmp3_dct_16.cpp endif LOCAL_C_INCLUDES := \ |