Separate CPU driver impl from reference driver.
Change-Id: Ifb484edda665959b81d7b1f890d108bfa20a535d
diff --git a/Android.mk b/Android.mk
index e169e4e..ffde29f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,21 +21,12 @@
driver/rsdFrameBuffer.cpp \
driver/rsdFrameBufferObj.cpp \
driver/rsdGL.cpp \
- driver/rsdIntrinsics.cpp \
- driver/rsdIntrinsicBlend.cpp \
- driver/rsdIntrinsicBlur.cpp \
- driver/rsdIntrinsicConvolve3x3.cpp \
- driver/rsdIntrinsicConvolve5x5.cpp \
- driver/rsdIntrinsicLUT.cpp \
- driver/rsdIntrinsicColorMatrix.cpp \
- driver/rsdIntrinsicYuvToRGB.cpp \
driver/rsdMesh.cpp \
driver/rsdMeshObj.cpp \
driver/rsdPath.cpp \
driver/rsdProgram.cpp \
driver/rsdProgramRaster.cpp \
driver/rsdProgramStore.cpp \
- driver/rsdRuntimeMath.cpp \
driver/rsdRuntimeStubs.cpp \
driver/rsdSampler.cpp \
driver/rsdScriptGroup.cpp \
@@ -43,13 +34,8 @@
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 += libRS
+LOCAL_SHARED_LIBRARIES += libRS libRSCpuRef
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2
LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libui libgui libsync
@@ -258,3 +244,6 @@
LOCAL_LDLIBS := -lpthread
include $(BUILD_HOST_STATIC_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
+