diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 13:27:20 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 13:33:25 -0700 |
| commit | 60c57dad4ec0653d9ce73f6f7147324beb1ce0a5 (patch) | |
| tree | 0f608d6ed0c2db6ad8855a5f5041689fd0c8894f /libcutils | |
| parent | b1dd4af7c41dc0d73f9431ec7adabc342e13434e (diff) | |
| download | core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.gz core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.bz2 core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.zip | |
Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level.
BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
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 469cdcfd9..6987e9cd6 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 \ |