commit | f1babd8ca813ee1b003a1389ff85e813b1298622 | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Fri Mar 20 21:15:41 2015 -0700 |
committer | Qiwen Zhao <zhao@google.com> | Fri Mar 20 21:15:41 2015 -0700 |
tree | 8d70ed14773f27a40b58a7eead544b2669b9c9fc | |
parent | 7441207fc100925e0b2cb6f5d271acfe2a92fd4a [diff] | |
parent | be3a70a348dc084adef33afdbbe78423ef29d5e0 [diff] |
reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
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