diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-03 02:47:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 02:47:50 +0000 |
| commit | 0ed7138903a85526a85d0cea8ff51b56d5aac236 (patch) | |
| tree | 48e8ce7555314cf7ce8d4338474f3fe30d8cad60 /services | |
| parent | aef46aa8eff1f975ae5253a334cf0c978427ca86 (diff) | |
| parent | eb05baccea81f125d042be33c36dcf1893d903d9 (diff) | |
| download | frameworks_av-0ed7138903a85526a85d0cea8ff51b56d5aac236.zip frameworks_av-0ed7138903a85526a85d0cea8ff51b56d5aac236.tar.gz frameworks_av-0ed7138903a85526a85d0cea8ff51b56d5aac236.tar.bz2 | |
am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."
* commit 'eb05baccea81f125d042be33c36dcf1893d903d9':
__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioResampler.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp index 1f7a613..46e3d6c 100644 --- a/services/audioflinger/AudioResampler.cpp +++ b/services/audioflinger/AudioResampler.cpp @@ -29,14 +29,11 @@ #include "AudioResamplerDyn.h" #ifdef __arm__ -#include <machine/cpu-features.h> + #define ASM_ARM_RESAMP1 // enable asm optimisation for ResamplerOrder1 #endif namespace android { -#ifdef __ARM_HAVE_HALFWORD_MULTIPLY // optimized asm option - #define ASM_ARM_RESAMP1 // enable asm optimisation for ResamplerOrder1 -#endif // __ARM_HAVE_HALFWORD_MULTIPLY // ---------------------------------------------------------------------------- class AudioResamplerOrder1 : public AudioResampler { |