diff options
| author | Chih-hung Hsieh <chh@google.com> | 2015-08-21 22:25:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 22:25:29 +0000 |
| commit | 962865a8a52d4d631007903cb2b941757a392700 (patch) | |
| tree | 71fd68919062640516e68f4a20f45310e62ec351 | |
| parent | 62ae8eeecd99363f707320b7e424760be52cc221 (diff) | |
| parent | 248cca4309ce245aea94b4467691a5c2afebf933 (diff) | |
| download | tremolo-962865a8a52d4d631007903cb2b941757a392700.tar.gz | |
am 248cca43: Merge "Enable clang integrated assembler except the arm target."
* commit '248cca4309ce245aea94b4467691a5c2afebf933':
Enable clang integrated assembler except the arm target.
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -25,7 +25,7 @@ LOCAL_SRC_FILES += \ 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 += \ |