| commit | e519917f9a3fad675ec887715439a132f1982cdd | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 20 01:16:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:16:29 2015 +0000 |
| tree | 9f0208a6daf44705651b8f23e1418e12a8fe640e | |
| parent | f5fef23c56fc7f1f6dbfc61d385a8f8861d9777b [diff] | |
| parent | 396a4d27ab46b2da0817c14d744ac0afa648b741 [diff] |
am 396a4d27: am a06c9707: Merge "Add sanity checks to fix crash" into klp-dev * commit '396a4d27ab46b2da0817c14d744ac0afa648b741': Add sanity checks to fix crash
diff --git a/Android.mk b/Android.mk index 9e3a0a0..3a0e54b 100644 --- a/Android.mk +++ b/Android.mk
@@ -24,6 +24,9 @@ Tremolo/mdctARM.s LOCAL_CFLAGS += \ -D_ARM_ASSEM_ +# Assembly code in asm_arm.h does not compile with Clang. +LOCAL_CLANG_ASFLAGS += \ + -no-integrated-as else LOCAL_CFLAGS += \ -DONLY_C