Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 017016d8 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 7c55c3f5: Make sure to use the hand-tweaked-assembly version of the...

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

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.
parents 366455da c54176ad
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -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 := \