commit bb0fbdbefd7079859e4df45f1b75ad6c48839a50
author Mark Salyzyn <salyzyn@google.com> Thu Mar 06 18:59:35 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 06 18:59:35 2014 +0000
tree c92771beecfcd367d1d5e701d6201822de1a1fde
parent 0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650
parent 7e2f83c0bcc3ad8a2840a48be14d302ed79d671c

Merge "logd: liblog: 64-bit issues"

libpixelflinger/Android.mk

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 @@
 	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
 

libpixelflinger/scanline.cpp

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"