summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libpixelflinger/Android.mk2
-rw-r--r--libpixelflinger/scanline.cpp4
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"