commit 12f143e33cfc5ccead1ab3209944f648b1a8d349
author Chih-Hung Hsieh <chh@google.com> Fri Oct 03 09:33:11 2014 -0700
committer Chih-hung Hsieh <chh@google.com> Tue Oct 07 19:11:12 2014 +0000
tree 1f153147a543f1873d04e2d65452f1756ebaed1d
parent 16005cd7803de98b0cc5a133426df0d932c38eb8

Add -no-integrated-as at local level.

Later we will enable integrated-as as default at the global level.

BUG: 17820427

Change-Id: I6d7c28c7188deab5d507cb6836adac460e0affe7

cpu_ref/Android.mk

diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index ebfe6a8..b0d1f05 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -52,6 +52,9 @@
     rsCpuIntrinsics_advsimd_YuvToRGB.S
 #    rsCpuIntrinsics_advsimd_Blend.S \
 
+# Clang does not compile rsCpuIntrinsics_advsimd_3DLUT.S.
+LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
+
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
     LOCAL_CFLAGS_arm += -DARCH_ARM_HAVE_NEON
 endif
@@ -69,6 +72,8 @@
     vp9_loopfilter_neon.S \
     vp9_mb_lpf_neon.S
     LOCAL_ASFLAGS_arm := -mfpu=neon
+    # Clang does not compile rsCpuIntrinsics_neon_3DLUT.S.
+    LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
 endif
 
 ifeq ($(ARCH_X86_HAVE_SSSE3),true)