commit 74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64
author Eric Laurent <elaurent@google.com> Wed Aug 25 10:39:21 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 25 10:39:21 2010 -0700
tree 33c9e3c4c47b5faa5fe618db1776c9bf6a7d3783
parent 44b31fdd86053945e1eeb3b91783577aebd95b55
parent 67b506065e9fe3c56e3d1b47eedfa01170d574f9

am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.

media/libmedia/fixedfft.cpp

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)