Merge "Add -no-integrated-as at local level."

aosp-mirror · Oct 16, 2014 · a66efb5 · a66efb5
2 parents ef1b830 + 9f6aca3
commit a66efb5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Android.mk b/Android.mk
@@ -13,6 +13,9 @@ LOCAL_SRC_FILES := \
     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