commit e6c35c7bad4317e8a669a5bedf85ee24ee850094
author Miao Wang <miaowang@google.com> Tue Apr 26 17:04:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 26 17:04:40 2016 +0000
tree dc0a5813b8eebd5133b8a8e96d1f793855046cd7
parent 6ca6bfb26c508fc21e44005ae1cf4b76f34b3e6b
parent 4ba89c2f42a86a9e0cfa659728fd5265d542d74a

Merge "Refactor ARM Blur prefill logic." am: 69c005b am: 73314a1 am: 862ab64
am: 4ba89c2

* commit '4ba89c2f42a86a9e0cfa659728fd5265d542d74a':
  Refactor ARM Blur prefill logic.

Change-Id: Ia404e8b9b593adebbf308bfbf5b585991ac13839

cpu_ref/Android.mk

diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index 5a7194a..a5fc95f 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -71,8 +71,11 @@
 endif
 
 ifeq ($(ARCH_X86_HAVE_SSSE3),true)
-    LOCAL_CFLAGS += -DARCH_X86_HAVE_SSSE3
-    LOCAL_SRC_FILES+= \
+    LOCAL_CFLAGS_x86 += -DARCH_X86_HAVE_SSSE3
+    LOCAL_SRC_FILES_x86 += \
+    rsCpuIntrinsics_x86.cpp
+    LOCAL_CFLAGS_x86_64 += -DARCH_X86_HAVE_SSSE3
+    LOCAL_SRC_FILES_x86_64 += \
     rsCpuIntrinsics_x86.cpp
 endif