Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.

Browse Source 
Merge commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp

* commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1':
  Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
This commit is contained in:
Andreas Huber
2009-12-09 15:47:35 -08:00
committed by Android Git Automerger
parent b16cf676bd 7c55c3f5f5
commit 30807a4500
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/libstagefright/codecs/mp3dec/Android.mk
View File

@@ -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 := \