| commit | c19b3f18000ea707c77f1399fc398071bda8c89b | [log] [tgz] |
|---|---|---|
| author | Chih-hung Hsieh <chh@google.com> | Fri Aug 21 22:24:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 22:24:29 2015 +0000 |
| tree | 71fd68919062640516e68f4a20f45310e62ec351 | |
| parent | b024fb8e391cdf667f06a58e76f9c0a04f07e2ea [diff] | |
| parent | 248cca4309ce245aea94b4467691a5c2afebf933 [diff] |
am 248cca43: Merge "Enable clang integrated assembler except the arm target." * commit '248cca4309ce245aea94b4467691a5c2afebf933': Enable clang integrated assembler except the arm target.
diff --git a/Android.mk b/Android.mk index 3a0e54b..5d77c71 100644 --- a/Android.mk +++ b/Android.mk
@@ -25,7 +25,7 @@ LOCAL_CFLAGS += \ -D_ARM_ASSEM_ # Assembly code in asm_arm.h does not compile with Clang. -LOCAL_CLANG_ASFLAGS += \ +LOCAL_CLANG_ASFLAGS_arm += \ -no-integrated-as else LOCAL_CFLAGS += \