commit 141649b66453380a4a912f72ec765f2c1877f3e0
author Chih-Hung Hsieh <chh@google.com> Thu Oct 16 21:00:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 16 21:00:29 2014 +0000
tree 0f4e8d7156f678f34a0e28cb6cdb3ac35887792e
parent 6227b1ce18f7a45203a72102b75f891eddc8d7d1
parent a66efb5d9a21e2666099dffb234b774d796cefbd

am a66efb5d: Merge "Add -no-integrated-as at local level."

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

Android.mk

diff --git a/Android.mk b/Android.mk
index b5905d1..a53d907 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,9 @@
     jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \
     jquant2.c jutils.c jmemmgr.c armv6_idct.S
 
+# jsimd_arm_neon.S does not compile with clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+
 ifeq (,$(TARGET_BUILD_APPS))
 # building against master
 # use ashmem as libjpeg decoder's backing store