| commit | ce0b6cee074d3a0ab0d9e8829892be2bbbf35d25 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Oct 09 22:10:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 22:10:47 2014 +0000 |
| tree | 8d70ed14773f27a40b58a7eead544b2669b9c9fc | |
| parent | bb0dc153d1fae6e9fce075cc6a2019f3a478374b [diff] | |
| parent | a4d929e3adc82981f7378933e9343a82d99fd867 [diff] |
am a4d929e3: Merge "Add -no-integrated-as at local level." * commit 'a4d929e3adc82981f7378933e9343a82d99fd867': Add -no-integrated-as at local level.
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