Merge "Fix the simulator build." into gingerbread

2010-08-25 10:37:27 -07:00
parent 7e2f87fafa cd295c11ab
commit 67b506065e
1 changed files with 2 additions and 0 deletions
--- 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)