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 | |
| parent | b1dd4af7c41dc0d73f9431ec7adabc342e13434e (diff) | |
| download | system_core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.zip system_core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.gz system_core-60c57dad4ec0653d9ce73f6f7147324beb1ce0a5.tar.bz2 | |
Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level.
BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
| -rw-r--r-- | libcutils/Android.mk | 3 | ||||
| -rw-r--r-- | libpixelflinger/Android.mk | 8 | ||||
| -rw-r--r-- | libpixelflinger/tests/arch-arm64/assembler/Android.mk | 3 | ||||
| -rw-r--r-- | libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk | 2 | ||||
| -rw-r--r-- | libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk | 2 |
5 files changed, 18 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 \ diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 6a3a58f..da9829d 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -69,6 +69,10 @@ ifneq ($(BUILD_TINY_ANDROID),true) LOCAL_SHARED_LIBRARIES += libhardware_legacy LOCAL_CFLAGS += -DWITH_LIB_HARDWARE endif +# t32cb16blend.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as +# arch-arm64/col32cb16blend.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as include $(BUILD_SHARED_LIBRARY) # @@ -82,6 +86,10 @@ LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm) LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64) LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips) LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) +# t32cb16blend.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as +# arch-arm64/col32cb16blend.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as include $(BUILD_STATIC_LIBRARY) diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.mk b/libpixelflinger/tests/arch-arm64/assembler/Android.mk index eca36ef..961f323 100644 --- a/libpixelflinger/tests/arch-arm64/assembler/Android.mk +++ b/libpixelflinger/tests/arch-arm64/assembler/Android.mk @@ -5,6 +5,9 @@ LOCAL_SRC_FILES:= \ arm64_assembler_test.cpp\ asm_test_jacket.S +# asm_test_jacket.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as + LOCAL_SHARED_LIBRARIES := \ libcutils \ libpixelflinger diff --git a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk index 3368eb0..5d69203 100644 --- a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk +++ b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk @@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \ col32cb16blend_test.c \ ../../../arch-arm64/col32cb16blend.S +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as + LOCAL_SHARED_LIBRARIES := LOCAL_C_INCLUDES := diff --git a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk index 8e5ec5e..2c1379b 100644 --- a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk +++ b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk @@ -5,6 +5,8 @@ LOCAL_SRC_FILES:= \ t32cb16blend_test.c \ ../../../arch-arm64/t32cb16blend.S +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as + LOCAL_SHARED_LIBRARIES := LOCAL_C_INCLUDES := |