diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-25 10:41:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 10:41:55 -0700 |
| commit | 0ae6d2e8261be77c739527142c59a9d895b02fe1 (patch) | |
| tree | 80d10bccb0eece5f06900219c3f23f0abcd83957 /media | |
| parent | aed922ffffcf872c5d37ed349c4da961eb84f841 (diff) | |
| parent | 74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64 (diff) | |
| download | frameworks_base-0ae6d2e8261be77c739527142c59a9d895b02fe1.zip frameworks_base-0ae6d2e8261be77c739527142c59a9d895b02fe1.tar.gz frameworks_base-0ae6d2e8261be77c739527142c59a9d895b02fe1.tar.bz2 | |
am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'
* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
Fix the simulator build.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/fixedfft.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/fixedfft.cpp b/media/libmedia/fixedfft.cpp index 28eb05a..9cf05ba 100644 --- a/media/libmedia/fixedfft.cpp +++ b/media/libmedia/fixedfft.cpp @@ -26,7 +26,9 @@ #include <stdio.h> #include <stdint.h> +#ifdef __ARM_ARCH__ #include <machine/cpu-features.h> +#endif #define LOG_FFT_SIZE 10 #define MAX_FFT_SIZE (1 << LOG_FFT_SIZE) |