Continue intrinsic development

Fix build issues with neon code
Add support for multiple intrinsics.

Change-Id: I3eb35ed47364b0df27ff14c99e4a5a2036fc4db0
diff --git a/Android.mk b/Android.mk
index e2eff95..c234a95 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,7 @@
 	driver/rsdFrameBufferObj.cpp \
 	driver/rsdGL.cpp \
 	driver/rsdIntrinsics.cpp \
+	driver/rsdIntrinsicConvolve3x3.cpp \
 	driver/rsdMesh.cpp \
 	driver/rsdMeshObj.cpp \
 	driver/rsdPath.cpp \
@@ -31,6 +32,12 @@
 	driver/rsdShaderCache.cpp \
 	driver/rsdVertexArray.cpp
 
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+    LOCAL_CFLAGS += -DARCH_ARM_HAVE_NEON
+    LOCAL_SRC_FILES+= \
+        driver/rsdIntrinsics_Convolve.S
+endif
+
 LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2
 LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libgui libsync