diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-25 10:37:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-25 10:37:27 -0700 |
| commit | 67b506065e9fe3c56e3d1b47eedfa01170d574f9 (patch) | |
| tree | 97db4c399c3cf7daf442c4f44b086db6ac72d4d7 | |
| parent | 7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758 (diff) | |
| parent | cd295c11abca8efad31e68e39e0de83bc1faba7e (diff) | |
| download | frameworks_base-67b506065e9fe3c56e3d1b47eedfa01170d574f9.zip frameworks_base-67b506065e9fe3c56e3d1b47eedfa01170d574f9.tar.gz frameworks_base-67b506065e9fe3c56e3d1b47eedfa01170d574f9.tar.bz2 | |
Merge "Fix the simulator build." into gingerbread
| -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) |