commit 83f304cb26008d3f4da154cec19c3a12fa2e6c74
author Jason Sams <jsams@google.com> Wed Mar 05 16:38:24 2014 -0800
committer Jason Sams <jsams@google.com> Thu Mar 06 13:36:33 2014 -0800
tree af124838cd75b5c0b3866941e85bc0cf37070e0b
parent 60498fe9679ea25a260a503d6dfd27cbc0a0c079

Fix build issues with external patch.

Change-Id: Ib5ea4338df179eb27e4ce9958ef42df1e3ac3eb1

cpu_ref/Android.mk

diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index 0199eee..c4e0ebf 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -51,7 +51,7 @@
     rsCpuIntrinsics_neon_ColorMatrix.S \
     rsCpuIntrinsics_neon_Blend.S \
     rsCpuIntrinsics_neon_Blur.S \
-    rsCpuIntrinsics_neon_YuvToRGB.S
+    rsCpuIntrinsics_neon_YuvToRGB.S \
     convolve/convolve_copy_neon.s \
     convolve/convolve_avg_neon.s \
     convolve/convolve8_neon.s \

cpu_ref/rsCpuCore.cpp

diff --git a/cpu_ref/rsCpuCore.cpp b/cpu_ref/rsCpuCore.cpp
index 406b5c2..7dfb3e2 100644
--- a/cpu_ref/rsCpuCore.cpp
+++ b/cpu_ref/rsCpuCore.cpp
@@ -533,9 +533,11 @@
     case RS_SCRIPT_INTRINSIC_ID_3DLUT:
         i = rsdIntrinsic_3DLUT(this, s, e);
         break;
+#ifndef RS_COMPATIBILITY_LIB
     case RS_SCRIPT_INTRINSIC_ID_INTER_PRED:
         i = rsdIntrinsic_InterPred(this, s, e);
         break;
+#endif
     case RS_SCRIPT_INTRINSIC_ID_CONVOLVE_3x3:
         i = rsdIntrinsic_Convolve3x3(this, s, e);
         break;