diff options
| author | Colin Cross <ccross@android.com> | 2014-03-06 21:02:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 21:02:36 +0000 |
| commit | 9690230a3c22977be24006d24ea35dd3efadc362 (patch) | |
| tree | db141e8e485eb284eb7cbe371f85aed8dc1dd1c3 | |
| parent | f27f9e10f50a015ec2d76a2f3579a5d11932965e (diff) | |
| parent | 0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650 (diff) | |
| download | system_core-9690230a3c22977be24006d24ea35dd3efadc362.zip system_core-9690230a3c22977be24006d24ea35dd3efadc362.tar.gz system_core-9690230a3c22977be24006d24ea35dd3efadc362.tar.bz2 | |
am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"
* commit '0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650':
Fix the build for NEON in 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" |