diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 22:37:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 22:37:06 +0000 |
| commit | 2aaccfe59097e4f6b2edcfe3c9f59d1d9f52f424 (patch) | |
| tree | 5ce11fdeed667acb54c9c989b0b5e44743dd490e /libcutils | |
| parent | 6ee5d62ac00fa00d7b86072a7f19d58582a05d18 (diff) | |
| parent | ad0ff1d99cd00ce53f667b27e53f44e802315a36 (diff) | |
| download | system_core-2aaccfe59097e4f6b2edcfe3c9f59d1d9f52f424.zip system_core-2aaccfe59097e4f6b2edcfe3c9f59d1d9f52f424.tar.gz system_core-2aaccfe59097e4f6b2edcfe3c9f59d1d9f52f424.tar.bz2 | |
am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."
* commit 'ad0ff1d99cd00ce53f667b27e53f44e802315a36':
Add -no-integrated-as at local level.
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 469cdcf..6987e9c 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -121,6 +121,9 @@ LOCAL_SRC_FILES := $(commonSources) \ LOCAL_SRC_FILES_arm += \ arch-arm/memset32.S \ +# arch-arm/memset32.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as + LOCAL_SRC_FILES_arm64 += \ arch-arm64/android_memset.S \ |