diff options
| author | Chih-hung Hsieh <chh@google.com> | 2015-08-21 22:35:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 22:35:26 +0000 |
| commit | d8ce7c4af87c0d9e41f82a475c937a58756179c4 (patch) | |
| tree | 4728101d699e237579802f0a87b1a3dbd9015e5e | |
| parent | 9efef45e8fbd08af5437e9d53b517fd76bfc0f1a (diff) | |
| parent | 962865a8a52d4d631007903cb2b941757a392700 (diff) | |
| download | tremolo-d8ce7c4af87c0d9e41f82a475c937a58756179c4.tar.gz | |
am 962865a8: am 248cca43: Merge "Enable clang integrated assembler except the arm target."
* commit '962865a8a52d4d631007903cb2b941757a392700':
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 += \ |