commit | a66efb5d9a21e2666099dffb234b774d796cefbd | [log] [tgz] |
---|---|---|
author | Chih-Hung Hsieh <chh@google.com> | Thu Oct 16 20:49:30 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 16 20:49:31 2014 +0000 |
tree | 0f4e8d7156f678f34a0e28cb6cdb3ac35887792e | |
parent | ef1b83013e7814622a9d11579878d342e84580b7 [diff] | |
parent | 9f6aca34abc4842152e49fd553e357adc2f3f357 [diff] |
Merge "Add -no-integrated-as at local level."
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