diff options
| author | Kévin PETIT <kevin.petit@arm.com> | 2014-03-06 15:43:58 +0000 |
|---|---|---|
| committer | Kévin PETIT <kevin.petit@arm.com> | 2014-03-06 15:53:27 +0000 |
| commit | d82b2a3eb4f4d2385ec508515a95ff9f339ab74f (patch) | |
| tree | cb7a83e88cc19d2d3661a07112d1a10c3bfe6234 /libpixelflinger | |
| parent | 51ebffd8a5536af09b60950bf7cf6f020c962f8a (diff) | |
| download | system_core-d82b2a3eb4f4d2385ec508515a95ff9f339ab74f.zip system_core-d82b2a3eb4f4d2385ec508515a95ff9f339ab74f.tar.gz system_core-d82b2a3eb4f4d2385ec508515a95ff9f339ab74f.tar.bz2 | |
Fix the build for NEON in libpixelflinger
ARCH_ARM_HAVE_NEON is only ever defined to true, so test for that.
For the NEON function to be used, the file has to include
machine/cpu-features.h so that __ARM_HAVE_NEON is defined.
Change-Id: I0db196b39c493092415859e009531fcff6fc1e8b
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/Android.mk | 2 | ||||
| -rw-r--r-- | libpixelflinger/scanline.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index c24384c..484cf50 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -34,7 +34,7 @@ PIXELFLINGER_SRC_FILES_arm := \ col32cb16blend.S \ t32cb16blend.S \ -ifeq ($(ARCH_ARM_HAVE_NEON),armv7-a) +ifeq ($(ARCH_ARM_HAVE_NEON),true) PIXELFLINGER_SRC_FILES_arm += col32cb16blend_neon.S endif diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp index cb2b811..f84a28a 100644 --- a/libpixelflinger/scanline.cpp +++ b/libpixelflinger/scanline.cpp @@ -26,6 +26,10 @@ #include <cutils/memory.h> #include <cutils/log.h> +#ifdef __arm__ +#include <machine/cpu-features.h> +#endif + #include "buffer.h" #include "scanline.h" |