diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-16 20:49:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-16 20:49:31 +0000 |
| commit | a66efb5d9a21e2666099dffb234b774d796cefbd (patch) | |
| tree | 0f4e8d7156f678f34a0e28cb6cdb3ac35887792e | |
| parent | ef1b83013e7814622a9d11579878d342e84580b7 (diff) | |
| parent | 9f6aca34abc4842152e49fd553e357adc2f3f357 (diff) | |
| download | jpeg-a66efb5d9a21e2666099dffb234b774d796cefbd.tar.gz | |
Merge "Add -no-integrated-as at local level."android-l-preview_r2l-preview
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |