am 9690230a: am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"

* commit '9690230a3c22977be24006d24ea35dd3efadc362':
  Fix the build for NEON in libpixelflinger
This commit is contained in:
Colin Cross 2014-03-06 22:41:22 +00:00 committed by Android Git Automerger
commit e4980725dc
2 changed files with 5 additions and 1 deletions

View file

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

View file

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