Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if buildi...

diff --git a/media/libstagefright/codecs/mp3dec/Android.mk b/media/libstagefright/codecs/mp3dec/Android.mk
index d618b83..cb2788c 100644 (file)
--- 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 := \