Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4980725 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit '9690230a':
  Fix the build for NEON in libpixelflinger
parents d8ed565f 9690230a

libpixelflinger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

libpixelflinger/scanline.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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"