commit 3c09e0aad73ef37f111985dde87a4c362e7a9853
author Chih-Hung Hsieh <chh@google.com> Tue Oct 07 21:11:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 07 21:11:30 2014 +0000
tree 2b161908b64cf0236fa70d62cc68ad0235ffbc4c
parent 4bdd80a41ef3553b7f230f1694dc96a212996fdd
parent 765672e45ab877d8ce6eecd0ca1b412d0305dda9

am 765672e4: am ed98dbef: Merge "Add -no-integrated-as at local level."

* commit '765672e45ab877d8ce6eecd0ca1b412d0305dda9':
  Add -no-integrated-as at local level.

v8/renderscript/rs_support/Android.mk

diff --git a/v8/renderscript/rs_support/Android.mk b/v8/renderscript/rs_support/Android.mk
index c43b767..c071b68 100644
--- a/v8/renderscript/rs_support/Android.mk
+++ b/v8/renderscript/rs_support/Android.mk
@@ -133,6 +133,8 @@
 ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
 LOCAL_CFLAGS_arm := -DARCH_ARM_HAVE_VFP -DARCH_ARM_USE_INTRINSICS
 LOCAL_ASFLAGS_arm := -mfpu=neon
+# frameworks/rs/cpu_ref/rsCpuIntrinsics_neon_3DLUT.S does not compile.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
 LOCAL_SRC_FILES_arm := \
         cpu_ref/rsCpuIntrinsics_neon_3DLUT.S \
 	cpu_ref/rsCpuIntrinsics_neon_ColorMatrix.S \